diff options
Diffstat (limited to 'x11/xview-lib/patches/patch-cj')
| -rw-r--r-- | x11/xview-lib/patches/patch-cj | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/x11/xview-lib/patches/patch-cj b/x11/xview-lib/patches/patch-cj index f783c13e464..bf64e2bbceb 100644 --- a/x11/xview-lib/patches/patch-cj +++ b/x11/xview-lib/patches/patch-cj @@ -1,4 +1,4 @@ -$NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ +$NetBSD: patch-cj,v 1.4 2017/12/12 20:42:41 hauke Exp $ --- lib/libxview/ttysw/tty_init.c.orig 1993-06-29 05:17:19.000000000 +0000 +++ lib/libxview/ttysw/tty_init.c @@ -10,10 +10,12 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> -@@ -82,7 +83,11 @@ static char sccsid[] = "@(#)tty_init +@@ -80,9 +81,11 @@ static char sccsid[] = "@(#)tty_init + #endif + - extern char *strncpy(); - extern char *strcpy(); +-extern char *strncpy(); +-extern char *strcpy(); +#if (defined(BSD) && (BSD >= 199306)) +extern off_t lseek(); +#else @@ -22,7 +24,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ char *textsw_checkpoint_undo(); /* static */ void ttysw_parseargs(); -@@ -106,6 +111,7 @@ Xv_private char *xv_font_monospace(); +@@ -106,6 +109,7 @@ Xv_private char *xv_font_monospace(); extern int ttysel_use_seln_service; @@ -30,7 +32,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ struct ttysw_createoptions { int becomeconsole; /* be the console */ -@@ -432,10 +438,8 @@ ttysw_fork_it(ttysw0, argv, wfd) +@@ -432,10 +436,8 @@ ttysw_fork_it(ttysw0, argv, wfd) char appname[20]; char *p; unsigned ttysw_error_sleep = 1; @@ -42,7 +44,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ extern char *ptsname(); #define BSD_TTY_COMPAT /* yank this if csh ever gets ported properly */ -@@ -461,27 +465,6 @@ ttysw_fork_it(ttysw0, argv, wfd) +@@ -461,27 +463,6 @@ ttysw_fork_it(ttysw0, argv, wfd) } /* Set up the child characteristics */ @@ -70,7 +72,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ vec.sa_handler = SIG_DFL; sigemptyset(&vec.sa_mask); vec.sa_flags = SA_RESTART; -@@ -497,13 +480,19 @@ ttysw_fork_it(ttysw0, argv, wfd) +@@ -497,13 +478,19 @@ ttysw_fork_it(ttysw0, argv, wfd) vec.sa_flags = SA_RESTART; sigaction(SIGTTOU, &vec, &ovec); @@ -91,7 +93,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ /* * Initialize file descriptors. Connections to servers are marked as -@@ -518,6 +507,9 @@ ttysw_fork_it(ttysw0, argv, wfd) +@@ -518,6 +505,9 @@ ttysw_fork_it(ttysw0, argv, wfd) (void) dup2(ttysw->ttysw_tty, 2); (void) close(ttysw->ttysw_tty); @@ -101,7 +103,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) { /* Process arg list */ int argc; -@@ -955,7 +947,11 @@ updateutmp(username, ttyslotuse, ttyfd) +@@ -955,7 +945,11 @@ updateutmp(username, ttyslotuse, ttyfd) struct utmpx utmp; #endif struct passwd *passwdent; @@ -113,7 +115,7 @@ $NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $ int f; char *ttyn; extern char *ttyname(); -@@ -1007,13 +1003,22 @@ updateutmp(username, ttyslotuse, ttyfd) +@@ -1007,13 +1001,22 @@ updateutmp(username, ttyslotuse, ttyfd) XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n")); return (0); } |