diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-23 22:48:46 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-06-23 22:48:46 +0000 |
| commit | d1c4681a41ebee11901ef30b928d94f1ccbb82d6 (patch) | |
| tree | d1d137b6d550f3da96f368662f8e2f001ee620f7 /usr.bin/ftp/main.c | |
| parent | 01672c3384db5b63dc5148f295f0c0381ffa0387 (diff) | |
remove evil #ifdef __GNUC__ garbage to avoid longjmp clobbering and use volatile instead
Diffstat (limited to 'usr.bin/ftp/main.c')
| -rw-r--r-- | usr.bin/ftp/main.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 5361a56b58e..2bb149ce1f0 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.47 2000/06/21 19:22:54 itojun Exp $ */ +/* $OpenBSD: main.c,v 1.48 2001/06/23 22:48:45 millert Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -73,7 +73,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.47 2000/06/21 19:22:54 itojun Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.48 2001/06/23 22:48:45 millert Exp $"; #endif #endif /* not lint */ @@ -95,12 +95,10 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.47 2000/06/21 19:22:54 itojun Exp $" #include "ftp_var.h" -int main __P((int, char **)); - int main(argc, argv) - int argc; - char *argv[]; + volatile int argc; + char ** volatile argv; { int ch, top, rval; struct passwd *pw = NULL; @@ -282,11 +280,6 @@ main(argc, argv) setttywidth(0); (void)signal(SIGWINCH, setttywidth); -#ifdef __GNUC__ /* XXX: to shut up gcc warnings */ - (void)&argc; - (void)&argv; -#endif - if (argc > 0) { if (isurl(argv[0])) { anonftp = 1; /* Handle "automatic" transfers. */ |