summaryrefslogtreecommitdiff
path: root/bin/rcp
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2008-01-01 09:10:26 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2008-01-01 09:10:26 +0000
commit73779f1375c2730a593ab0e1adf983adba8241dd (patch)
tree2eff0560f519097754500c001008244952d21d2c /bin/rcp
parent6a7bc4c8330ae27b7ad32c4ae57c9075b8c9356f (diff)
If rcp -p encounters a pre-epoch timestamp, use the epoch which is
as close as we can get given that it's used unsigned. Matches recent change to scp.c, prompted by djm@
Diffstat (limited to 'bin/rcp')
-rw-r--r--bin/rcp/rcp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index afa93d441b2..ae382edb0c0 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcp.c,v 1.46 2007/03/20 18:50:11 jmc Exp $ */
+/* $OpenBSD: rcp.c,v 1.47 2008/01/01 09:10:25 dtucker Exp $ */
/* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else
-static const char rcsid[] = "$OpenBSD: rcp.c,v 1.46 2007/03/20 18:50:11 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: rcp.c,v 1.47 2008/01/01 09:10:25 dtucker Exp $";
#endif
#endif /* not lint */
@@ -446,9 +446,9 @@ syserr:
* Make it compatible with possible future
* versions expecting microseconds.
*/
- (void)snprintf(buf, sizeof(buf), "T%ld 0 %ld 0\n",
- (long)stb.st_mtimespec.tv_sec,
- (long)stb.st_atimespec.tv_sec);
+ (void)snprintf(buf, sizeof(buf), "T%lu 0 %lu 0\n",
+ (u_long) (stb.st_mtime < 0 ? 0 : stb.st_mtime),
+ (u_long) (stb.st_atime < 0 ? 0 : stb.st_atime));
(void)write(rem, buf, strlen(buf));
if (response() < 0)
goto next;