diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-01-01 20:33:57 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-01-01 20:33:57 +1100 |
commit | 9b439c1adc1bdd8248f456005686f8924ca4e03d (patch) | |
tree | 86f4e925ce1940ebb01cb61d185e2020c69d7926 /scp.c | |
parent | 912428c91aa9118f807d1e9108da7bc06601095d (diff) |
- dtucker@cvs.openbsd.org 2008/01/01 09:06:39
[scp.c]
If scp -p encounters a pre-epoch timestamp, use the epoch which is
as close as we can get given that it's used unsigned. Add a little
debugging while there. bz #828, ok djm@
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.161 2007/10/24 03:44:02 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.162 2008/01/01 09:06:39 dtucker Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -669,8 +669,14 @@ syserr: run_err("%s: %s", name, strerror(errno)); * versions expecting microseconds. */ (void) snprintf(buf, sizeof buf, "T%lu 0 %lu 0\n", - (u_long) stb.st_mtime, - (u_long) stb.st_atime); + (u_long) (stb.st_mtime < 0 ? 0 : stb.st_mtime), + (u_long) (stb.st_atime < 0 ? 0 : stb.st_atime)); + if (verbose_mode) { + fprintf(stderr, "File mtime %ld atime %ld\n", + (long)stb.st_mtime, (long)stb.st_atime); + fprintf(stderr, "Sending file timestamps: %s", + buf); + } (void) atomicio(vwrite, remout, buf, strlen(buf)); if (response() < 0) goto next; |