summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-18 16:11:07 +1000
committerDamien Miller <djm@mindrot.org>2013-07-18 16:11:07 +1000
commit8158441d01ab84f33a7e70e27f87c02cbf67e709 (patch)
tree8a7751035b1acec1e02bff4af5b362962bf4aead /scp.c
parentbbeb1dac550bad8e6aff9bd27113c6bd5ebb7413 (diff)
downloadopenssh-git-8158441d01ab84f33a7e70e27f87c02cbf67e709.tar.gz
- djm@cvs.openbsd.org 2013/06/21 05:43:10
[scp.c] make this -Wsign-compare clean after time_t conversion
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scp.c b/scp.c
index ca7948f6..958faf3f 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.176 2013/06/17 04:48:42 guenther Exp $ */
+/* $OpenBSD: scp.c,v 1.177 2013/06/21 05:43:10 djm Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -976,7 +976,7 @@ sink(int argc, char **argv)
ull = strtoull(cp, &cp, 10);
if (!cp || *cp++ != ' ')
SCREWUP("mtime.sec not delimited");
- if ((time_t)ull < 0 || (time_t)ull != ull)
+ if ((time_t)ull < 0 || ull > LLONG_MAX)
setimes = 0; /* out of range */
mtime.tv_sec = ull;
mtime.tv_usec = strtol(cp, &cp, 10);
@@ -988,7 +988,7 @@ sink(int argc, char **argv)
ull = strtoull(cp, &cp, 10);
if (!cp || *cp++ != ' ')
SCREWUP("atime.sec not delimited");
- if ((time_t)ull < 0 || (time_t)ull != ull)
+ if ((time_t)ull < 0 || ull > LLONG_MAX)
setimes = 0; /* out of range */
atime.tv_sec = ull;
atime.tv_usec = strtol(cp, &cp, 10);