Module Name: src
Committed By: christos
Date: Sun Jan 15 03:58:28 UTC 2012
Modified Files:
src/usr.bin/ftp: cmds.c
Log Message:
make -R work the same in ftp:// like it does for http:// (i.e. work if
there is no local file).
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/ftp/cmds.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/cmds.c
diff -u src/usr.bin/ftp/cmds.c:1.132 src/usr.bin/ftp/cmds.c:1.133
--- src/usr.bin/ftp/cmds.c:1.132 Fri Sep 16 11:39:26 2011
+++ src/usr.bin/ftp/cmds.c Sat Jan 14 22:58:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.132 2011/09/16 15:39:26 joerg Exp $ */
+/* $NetBSD: cmds.c,v 1.133 2012/01/15 03:58:28 christos Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmds.c,v 1.132 2011/09/16 15:39:26 joerg Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.133 2012/01/15 03:58:28 christos Exp $");
#endif
#endif /* not lint */
@@ -111,6 +111,7 @@ __RCSID("$NetBSD: cmds.c,v 1.132 2011/09
#include <ctype.h>
#include <err.h>
+#include <errno.h>
#include <glob.h>
#include <limits.h>
#include <netdb.h>
@@ -556,7 +557,7 @@ void
reget(int argc, char *argv[])
{
- (void)getit(argc, argv, 1, "r+");
+ (void)getit(argc, argv, 1, restart_point ? "r+" : "w" );
}
void
@@ -612,10 +613,14 @@ getit(int argc, char *argv[], int restar
ret = stat(locfile, &stbuf);
if (restartit == 1) {
if (ret < 0) {
- warn("Can't stat `%s'", locfile);
- goto freegetit;
+ if (errno != ENOENT) {
+ warn("Can't stat `%s'", locfile);
+ goto freegetit;
+ }
+ restart_point = 0;
}
- restart_point = stbuf.st_size;
+ else
+ restart_point = stbuf.st_size;
} else {
if (ret == 0) {
time_t mtime;
