diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-07-02 22:01:10 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-07-02 22:01:10 +0000 |
| commit | e7e3f67e9f45b641e0d5ddf3d19c9e2fe703cf91 (patch) | |
| tree | 8b9698d18f68bd97f2c1ba3e438230d1673694ab | |
| parent | An entire 1.5KB .o file was linked, but not actually used. (diff) | |
| download | wireguard-openbsd-e7e3f67e9f45b641e0d5ddf3d19c9e2fe703cf91.tar.xz wireguard-openbsd-e7e3f67e9f45b641e0d5ddf3d19c9e2fe703cf91.zip | |
#ifndef SMALL a few more things to save space on the ramdisks
| -rw-r--r-- | usr.bin/ftp/ftp.c | 4 | ||||
| -rw-r--r-- | usr.bin/ftp/ftp_var.h | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index 59232f43fff..2cc0f6692b2 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp.c,v 1.79 2009/06/06 23:14:44 martynas Exp $ */ +/* $OpenBSD: ftp.c,v 1.80 2010/07/02 22:01:10 deraadt Exp $ */ /* $NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $ */ /* @@ -1907,6 +1907,7 @@ abort: (void)signal(SIGINT, oldintr); } +#ifndef SMALL /* ARGSUSED */ void reset(int argc, char *argv[]) @@ -1926,6 +1927,7 @@ reset(int argc, char *argv[]) } } } +#endif char * gunique(const char *local) diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h index cfe0ff563c2..180153fc74c 100644 --- a/usr.bin/ftp/ftp_var.h +++ b/usr.bin/ftp/ftp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp_var.h,v 1.30 2010/04/30 19:29:01 jsg Exp $ */ +/* $OpenBSD: ftp_var.h,v 1.31 2010/07/02 22:01:10 deraadt Exp $ */ /* $NetBSD: ftp_var.h,v 1.18 1997/08/18 10:20:25 lukem Exp $ */ /* @@ -110,11 +110,12 @@ int verbose; /* print messages coming back from server */ int connected; /* 1 = connected to server, -1 = logged in */ int fromatty; /* input is from a terminal */ int interactive; /* interactively prompt on m* cmds */ -int confirmrest; /* confirm rest of current m* cmd */ #ifndef SMALL +int confirmrest; /* confirm rest of current m* cmd */ int debug; /* debugging level */ -#endif /* !SMALL */ int bell; /* ring bell on cmd completion */ +char *altarg; /* argv[1] with no shell-like preprocessing */ +#endif /* !SMALL */ int doglob; /* glob local file names */ int autologin; /* establish user account on connection */ int proxy; /* proxy server connection active */ @@ -133,7 +134,6 @@ int crflag; /* if 1, strip car. rets. on ascii gets */ char pasv[BUFSIZ]; /* passive port for proxy data connection */ int passivemode; /* passive mode enabled */ int activefallback; /* fall back to active mode if passive fails */ -char *altarg; /* argv[1] with no shell-like preprocessing */ char ntin[17]; /* input translation table */ char ntout[17]; /* output translation table */ char mapin[MAXPATHLEN]; /* input map template */ @@ -184,20 +184,20 @@ char *gateport; /* port number to use for gateftp connections */ jmp_buf toplevel; /* non-local goto stuff for cmd scanner */ +#ifndef SMALL char line[FTPBUFLEN]; /* input line buffer */ +char *argbase; /* current storage point in arg buffer */ char *stringbase; /* current scan point in line buffer */ char argbuf[FTPBUFLEN]; /* argument storage buffer */ -char *argbase; /* current storage point in arg buffer */ -#ifndef SMALL StringList *marg_sl; /* stringlist containing margv */ -#endif /* !SMALL */ int margc; /* count of arguments on input line */ +int options; /* used during socket creation */ +#endif /* !SMALL */ + #define margv (marg_sl->sl_str) /* args parsed from input line */ int cpend; /* flag: if != 0, then pending server reply */ int mflag; /* flag: if != 0, then active multi command */ -int options; /* used during socket creation */ - /* * Format of command table. */ |