diff options
| author | Martynas Venckus <martynas@cvs.openbsd.org> | 2008-10-16 23:15:54 +0000 |
|---|---|---|
| committer | Martynas Venckus <martynas@cvs.openbsd.org> | 2008-10-16 23:15:54 +0000 |
| commit | fe835a6c9c9a9258f094308cb1dbe43e2bd5c2fd (patch) | |
| tree | 48b967b98969dcc3deab354204125c8c25322279 /usr.bin/ftp | |
| parent | ab3e274196a1e98ea7275ad0b0ed2a41dfb753af (diff) | |
- resume http transfers [-C], if local file does not exist
- resume ftp transfers [-C, reget, mget], if local file does not
exist
ok theo
Diffstat (limited to 'usr.bin/ftp')
| -rw-r--r-- | usr.bin/ftp/cmds.c | 16 | ||||
| -rw-r--r-- | usr.bin/ftp/fetch.c | 9 |
2 files changed, 11 insertions, 14 deletions
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c index 75059c8fb0c..9804866ba9c 100644 --- a/usr.bin/ftp/cmds.c +++ b/usr.bin/ftp/cmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmds.c,v 1.66 2008/09/18 14:45:36 todd Exp $ */ +/* $OpenBSD: cmds.c,v 1.67 2008/10/16 23:15:53 martynas Exp $ */ /* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */ /* @@ -60,7 +60,7 @@ */ #if !defined(lint) && !defined(SMALL) -static const char rcsid[] = "$OpenBSD: cmds.c,v 1.66 2008/09/18 14:45:36 todd Exp $"; +static const char rcsid[] = "$OpenBSD: cmds.c,v 1.67 2008/10/16 23:15:53 martynas Exp $"; #endif /* not lint and not SMALL */ /* @@ -524,7 +524,7 @@ void reget(int argc, char *argv[]) { - (void)getit(argc, argv, 1, "r+w"); + (void)getit(argc, argv, 1, "a+w"); } #endif /* !SMALL */ @@ -532,7 +532,7 @@ void get(int argc, char *argv[]) { - (void)getit(argc, argv, 0, restart_point ? "r+w" : "w" ); + (void)getit(argc, argv, 0, restart_point ? "a+w" : "w" ); } /* @@ -596,11 +596,7 @@ usage: ret = stat(argv[2], &stbuf); if (restartit == 1) { - if (ret < 0) { - warn("local: %s", argv[2]); - goto freegetit; - } - restart_point = stbuf.st_size; + restart_point = (ret < 0) ? 0 : stbuf.st_size; } else { if (ret == 0) { time_t mtime; @@ -784,7 +780,7 @@ out: #endif /* !SMALL */ xargv[1] = cp; (void)getit(xargc, xargv, restartit, - (restartit == 1 || restart_point) ? "r+w" : "w"); + (restartit == 1 || restart_point) ? "a+w" : "w"); if (!mflag && fromatty) { if (confirm(argv[0], NULL)) mflag = 1; diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index 7ce978f8381..9adf95e806c 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.82 2008/10/16 21:23:49 deraadt Exp $ */ +/* $OpenBSD: fetch.c,v 1.83 2008/10/16 23:15:53 martynas Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -31,7 +31,7 @@ */ #if !defined(lint) && !defined(SMALL) -static const char rcsid[] = "$OpenBSD: fetch.c,v 1.82 2008/10/16 21:23:49 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: fetch.c,v 1.83 2008/10/16 23:15:53 martynas Exp $"; #endif /* not lint and not SMALL */ /* @@ -261,7 +261,7 @@ url_get(const char *origline, const char *proxyenv, const char *outfile) else filesize = st.st_size; - /* Open the output file */ + /* Open the output file. */ if (strcmp(savefile, "-") != 0) { #ifndef SMALL if (resume) @@ -666,7 +666,8 @@ again: if (strcmp(savefile, "-") != 0) { #ifndef SMALL if (resume) - out = open(savefile, O_APPEND | O_WRONLY); + out = open(savefile, O_CREAT | O_WRONLY | O_APPEND, + 0666); else #endif /* !SMALL */ out = open(savefile, O_CREAT | O_WRONLY | O_TRUNC, |