=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- src/usr.bin/ftp/main.c 2007/11/28 16:21:25 1.68 +++ src/usr.bin/ftp/main.c 2008/06/25 21:15:19 1.69 @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.68 2007/11/28 16:21:25 jmc Exp $ */ +/* $OpenBSD: main.c,v 1.69 2008/06/25 21:15:19 martynas Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -66,7 +66,7 @@ #endif /* not lint */ #if !defined(lint) && !defined(SMALL) -static const char rcsid[] = "$OpenBSD: main.c,v 1.68 2007/11/28 16:21:25 jmc Exp $"; +static const char rcsid[] = "$OpenBSD: main.c,v 1.69 2008/06/25 21:15:19 martynas Exp $"; #endif /* not lint and not SMALL */ /* @@ -103,7 +103,7 @@ httpport = "http"; #ifndef SMALL httpsport = "https"; -#endif +#endif /* !SMALL */ gateport = getenv("FTPSERVERPORT"); if (gateport == NULL || *gateport == '\0') gateport = "ftpgate"; @@ -122,7 +122,7 @@ hist = NULL; cookiefile = NULL; resume = 0; -#endif +#endif /* !SMALL */ mark = HASHBYTES; marg_sl = sl_init(); #ifdef INET6 @@ -171,7 +171,7 @@ #ifndef SMALL if (!dumb_terminal) editing = 1; /* editing mode on if tty is usable */ -#endif +#endif /* !SMALL */ } ttyout = stdout; @@ -180,7 +180,7 @@ #ifndef SMALL cookiefile = getenv("http_cookies"); -#endif +#endif /* !SMALL */ while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:tvV")) != -1) { switch (ch) { @@ -202,13 +202,13 @@ case 'C': #ifndef SMALL resume = 1; -#endif +#endif /* !SMALL */ break; case 'c': #ifndef SMALL cookiefile = optarg; -#endif +#endif /* !SMALL */ break; case 'd': @@ -223,7 +223,7 @@ case 'e': #ifndef SMALL editing = 0; -#endif +#endif /* !SMALL */ break; case 'g': @@ -296,7 +296,7 @@ #ifndef SMALL cookie_load(); -#endif +#endif /* !SMALL */ cpend = 0; /* no pending replies */ proxy = 0; /* proxy not active */ @@ -424,7 +424,7 @@ int num; #ifndef SMALL HistEvent hev; -#endif +#endif /* !SMALL */ if (!top #ifndef SMALL @@ -577,7 +577,7 @@ #ifdef SMALL #define INC_CHKCURSOR(x) (x)++ -#else /* !SMALL */ +#else /* SMALL */ #define INC_CHKCURSOR(x) { (x)++ ; \ if (x == cursor_pos) { \ cursor_argc = margc; \ @@ -585,7 +585,7 @@ cursor_pos = NULL; \ } } -#endif /* !SMALL */ +#endif /* SMALL */ /* * Parse string into argbuf; @@ -773,12 +773,12 @@ #ifndef SMALL " %s [-C] [-c cookie] [-o output] " "https://host[:port]/file\n" -#endif +#endif /* !SMALL */ " %s [-C] [-o output] host:[/path/]file[/]\n", #ifndef SMALL __progname, __progname, __progname, __progname, __progname); -#else +#else /* !SMALL */ __progname, __progname, __progname, __progname); -#endif +#endif /* !SMALL */ exit(1); }