diff options
Diffstat (limited to 'misc/fep/patches/patch-ac')
| -rw-r--r-- | misc/fep/patches/patch-ac | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/misc/fep/patches/patch-ac b/misc/fep/patches/patch-ac index fe64c4fc125..0eefafbfd58 100644 --- a/misc/fep/patches/patch-ac +++ b/misc/fep/patches/patch-ac @@ -1,9 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2005/12/10 22:10:47 christos Exp $ ---- fep_com.c.orig Wed May 29 07:31:09 1991 -+++ fep_com.c -@@ -6,7 +6,17 @@ static char rcsid[]= - #endif lint +--- fep_com.c.orig 1991-05-29 01:31:09.000000000 -0400 ++++ fep_com.c 2005-12-10 16:59:27.000000000 -0500 +@@ -3,11 +3,23 @@ + #ifndef lint + static char rcsid[]= + "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ac,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)"; +-#endif lint ++#endif /* lint */ #include <stdio.h> +#include <sys/ioctl.h> @@ -18,9 +22,12 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ #include <sgtty.h> +#endif #include <ctype.h> ++#include <inttypes.h> ++#include <stdlib.h> #include <sys/param.h> #include <sys/file.h> -@@ -31,7 +41,7 @@ executeBuiltInFunction (comline, more) + #include <sys/stat.h> +@@ -31,7 +43,7 @@ char *comline, **more; { register FunctionTableEnt *ftp; @@ -29,7 +36,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ char *search_string(); int argc; -@@ -93,7 +103,7 @@ is_same_command (a, b) +@@ -93,7 +105,7 @@ while (*a && *b && *a == *b) ++a, ++b; @@ -38,7 +45,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ return 1; else return 0; -@@ -295,7 +305,7 @@ unalias (comline) +@@ -295,7 +307,7 @@ set (comline) char *comline; { @@ -47,7 +54,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ char *cp, *index(); char *argv[MAXARGS]; int argc; -@@ -352,8 +362,13 @@ unset(comline) +@@ -352,8 +364,13 @@ extern int Transparency; extern int Through; @@ -63,7 +70,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ extern int master, slave; extern char slave_tty[]; -@@ -368,7 +383,11 @@ toggle_through() +@@ -368,7 +385,11 @@ { int r; int slave_fd; @@ -75,7 +82,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (Through == OFF) { -@@ -378,15 +397,26 @@ toggle_through() +@@ -378,15 +399,26 @@ return; } @@ -102,7 +109,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (r < 0) { perror (slave_tty); (void) close (slave_fd); -@@ -394,7 +424,11 @@ toggle_through() +@@ -394,7 +426,11 @@ (void) close (slave_fd); } else @@ -114,7 +121,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (r < 0) { printf ("Can't change pty mode.\n"); -@@ -410,7 +444,11 @@ toggle_through() +@@ -410,7 +446,11 @@ fix_transparency() { int r; @@ -126,7 +133,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (Through) return; -@@ -418,11 +456,17 @@ fix_transparency() +@@ -418,11 +458,17 @@ if (slave < 0) return; @@ -144,7 +151,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (r < 0) { perror (slave_tty); return; -@@ -432,9 +476,19 @@ fix_transparency() +@@ -432,9 +478,19 @@ * If find slave tty mode is cbreak or raw, fix tty mode of stdout to * same mode as slave and set Transparency ON. */ @@ -165,7 +172,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (r < 0) { perror ("stdout"); return; -@@ -445,7 +499,11 @@ fix_transparency() +@@ -445,7 +501,11 @@ } else { if (Transparency == ON) { @@ -178,7 +185,20 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ if (r < 0) { perror ("stdout"); return; -@@ -738,9 +796,9 @@ char *line; +@@ -623,10 +683,10 @@ + { + MORE *mp; + +- mp = (MORE *) malloc (sizeof (MORE)); ++ mp = malloc (sizeof (MORE)); + + if (mp == 0) +- return ((MORE*)0); ++ return (NULL); + else { + mp->cur_line = 0; + mp->max_line = maxline; +@@ -738,9 +798,9 @@ fep_pwd (line) char *line; { @@ -190,7 +210,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ printf ("%s\n", cwd); } -@@ -755,7 +813,7 @@ fep_echo (comline) +@@ -755,7 +815,7 @@ argc = mkargv (comline, argv, MAXARGS); argp = &argv[1]; @@ -199,7 +219,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $ putnewline = 0; ++argp; } -@@ -791,7 +849,7 @@ fep_command (comline) +@@ -791,7 +851,7 @@ int argc; int i; char **argp; |