diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-21 20:59:31 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-21 20:59:31 +0000 |
commit | de8fc656a0c2333ca26ef58be6bca4df52f04997 (patch) | |
tree | 7db8ae9f234db473edbaab17321cce6c47df0466 /usr.bin/ftp/fetch.c | |
parent | c1f038b9831779bb245ab82b038f418d974b98c6 (diff) |
Add in recent NetBSD changes we didn't already have:
Always compile complete.c but ifdef out the bits if -DSMALL (christos)
reset interactive mode correctly in auto_fetch() mget mode (lukem)
Diffstat (limited to 'usr.bin/ftp/fetch.c')
-rw-r--r-- | usr.bin/ftp/fetch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index 81377527412..f0f5484acca 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,5 +1,5 @@ -/* $OpenBSD: fetch.c,v 1.4 1997/03/14 04:32:14 millert Exp $ */ -/* $NetBSD: fetch.c,v 1.3 1997/03/13 06:23:15 lukem Exp $ */ +/* $OpenBSD: fetch.c,v 1.5 1997/03/21 20:59:29 millert Exp $ */ +/* $NetBSD: fetch.c,v 1.4 1997/03/16 14:24:18 lukem Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: fetch.c,v 1.4 1997/03/14 04:32:14 millert Exp $"; +static char rcsid[] = "$OpenBSD: fetch.c,v 1.5 1997/03/21 20:59:29 millert Exp $"; #endif /* not lint */ /* @@ -448,7 +448,7 @@ auto_fetch(argc, argv) * Set up the connection if we don't have one. */ if (strcmp(host, lasthost) != 0) { - strcpy(lasthost, host); + (void)strcpy(lasthost, host); if (connected) disconnect(0, NULL); xargv[0] = __progname; @@ -528,7 +528,7 @@ auto_fetch(argc, argv) interactive = 0; xargv[0] = "mget"; mget(2, xargv); - interactive = 1; + interactive = ointeractive; } else get(2, xargv); |