diff options
| author | ache <ache@FreeBSD.org> | 1994-12-24 01:15:19 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1994-12-24 01:15:19 +0000 |
| commit | 9b98551f59193f2b6827c9a2c5a759c79e8f9ea1 (patch) | |
| tree | 1040552508de23d7e69676af66b08aa0c165c552 /usr.bin/ncftp/cmds.c | |
| parent | 125adadea78fa9b8c887c5cf6f49653c5984691b (diff) | |
| download | FreeBSD-src-9b98551f59193f2b6827c9a2c5a759c79e8f9ea1.zip FreeBSD-src-9b98551f59193f2b6827c9a2c5a759c79e8f9ea1.tar.gz | |
Merging.
v1.9.0 - December 22, 1994. The program won't exit from the interactive shell
if it's working from a tty. For example, it won't exit if you do an mget
on a pattern that won't match anything. Added padding around jmp_buf's
for SunOS. SunOS needs sigjmp_buf's, but plenty of OS's don't support
sigjmp_buf's yet. Fixed the tips to reflect the new archive site.
v1.8.9 - December 20, 1994. Can now set "passive" user variable, or use
passive command to toggle PASV/PORT ftp. Debug mode now prints remote
responses. Can now get around buggy FTP servers like boombox.micro.umn.edu,
that give back invalid port numbers to PASV.
v1.8.8 - December 19, 1994. Now falls back to port FTP if passive FTP fails.
Diffstat (limited to 'usr.bin/ncftp/cmds.c')
| -rw-r--r-- | usr.bin/ncftp/cmds.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/usr.bin/ncftp/cmds.c b/usr.bin/ncftp/cmds.c index d576803..564c799 100644 --- a/usr.bin/ncftp/cmds.c +++ b/usr.bin/ncftp/cmds.c @@ -36,14 +36,12 @@ #include "copyright.h" /* cmds.c globals */ -#ifdef PASSIVEMODE -int passivemode; /* no reverse FTP connections */ -#endif int curtype; /* file transfer type */ char *typeabbrs = "abiet"; str32 curtypename; /* name of file transfer type */ int verbose; /* verbosity level of output */ int mprompt; /* interactively prompt on m* cmds */ +int passivemode; /* no reverse FTP connections */ int debug; /* debugging level */ int options; /* used during socket creation */ int macnum; /* number of defined macros */ @@ -52,7 +50,9 @@ int creating = 0; struct macel macros[MAXMACROS]; char *macbuf; /* holds ALL macros */ int doingInitMacro = 0; /* TRUE if executing "init" macro. */ +static char pad1a[8] = "Pad 1a"; jmp_buf jabort; +static char pad1b[8] = "Pad 1b"; char *mname; /* name of current m* command */ int activemcmd; /* flag: if != 0, then active multi command */ int warnNoLSFlagsWithWildcards = 0; @@ -2059,9 +2059,6 @@ int show_version(int argc, char **argv) #ifdef NET_ERRNO_H DStrs[nDStrs++] = "NET_ERRNO_H"; #endif -#ifdef PASSIVEMODE - DStrs[nDStrs++] = "PASSIVEMODE"; -#endif /* DONE with #ifdefs for now! */ @@ -2215,14 +2212,12 @@ int unimpl(int argc, char **argv) return (NOERR); } /* unimpl */ -#ifdef PASSIVEMODE int setpassive(int argc, char **argv) { passivemode = !passivemode; printf( "Passive mode %s.\n", (passivemode ? "ON" : "OFF") ); return NOERR; } -#endif /* eof cmds.c */ |
