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/main.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/main.c')
| -rw-r--r-- | usr.bin/ncftp/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ncftp/main.c b/usr.bin/ncftp/main.c index 9fdfc06..1d1ed62 100644 --- a/usr.bin/ncftp/main.c +++ b/usr.bin/ncftp/main.c @@ -2,7 +2,7 @@ #define _main_c_ -#define FTP_VERSION "1.8.7 (December 11, 1994)" +#define FTP_VERSION "1.9.0 (December 22, 1994)" /* #define BETA 1 */ /* If defined, it prints a little warning message. */ @@ -46,7 +46,9 @@ int toatty; /* output is to a terminal */ int doing_script; /* is a file being <redirected to me? */ char *altarg; /* argv[1] with no shell-like preprocessing */ struct servent serv; /* service spec for tcp/ftp */ +static char pad2a[8] = "Pad 2a"; /* SunOS overwrites jmp_bufs... */ jmp_buf toplevel; /* non-local goto stuff for cmd scanner */ +static char pad2b[8] = "Pad 2b"; char *line; /* input line buffer */ char *stringbase; /* current scan point in line buffer */ char *argbuf; /* argument storage buffer */ @@ -391,7 +393,7 @@ For testing purposes only. Do not re-distribute or subject to novice users." (void) Signal(SIGPIPE, lostpeer); } for (;;) { - if (cmdscanner(top)) + if (cmdscanner(top) && !fromatty) exit(1); top = 1; } |
