- djm@cvs.openbsd.org 2013/06/21 05:43:10

     [scp.c]
     make this -Wsign-compare clean after time_t conversion

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 10de1077..86da2761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
    - djm@cvs.openbsd.org 2013/06/21 05:42:32
      [dh.c]
      sprinkle in some error() to explain moduli(5) parse failures
+   - djm@cvs.openbsd.org 2013/06/21 05:43:10
+     [scp.c]
+     make this -Wsign-compare clean after time_t conversion
 
 20130702
  - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
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);