- guenther@cvs.openbsd.org 2014/01/09 03:26:00

     [sftp-common.c]
     When formating the time for "ls -l"-style output, show dates in the future
     with the year, and rearrange a comparison to avoid a potentional signed
     arithmetic overflow that would give the wrong result.

     ok djm@

diff --git a/ChangeLog b/ChangeLog
index ab584d9930256235706cea3d46c10626c8a41634..df1d5ea6a93098b1b921e8351d4de77bfc287c59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
    - tedu@cvs.openbsd.org 2014/01/04 17:50:55
      [mac.c monitor_mm.c monitor_mm.h xmalloc.c]
      use standard types and formats for size_t like variables. ok dtucker
+   - guenther@cvs.openbsd.org 2014/01/09 03:26:00
+     [sftp-common.c]
+     When formating the time for "ls -l"-style output, show dates in the future
+     with the year, and rearrange a comparison to avoid a potentional signed
+     arithmetic overflow that would give the wrong result.
+     ok djm@
 
 20140108
  - (djm) [regress/.cvsignore] Ignore regress test droppings; ok dtucker@

diff --git a/sftp-common.c b/sftp-common.c
index 88bf51bc6cfa1dd0e93a7bb51aba9737b7944a34..70a929ccc0702fdb8ea6f4e67adb809e7af29345 100644 (file)
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.25 2013/11/08 11:15:19 dtucker Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.26 2014/01/09 03:26:00 guenther Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -195,6 +195,7 @@ ls_file(const char *name, const struct stat *st, int remote, int si_units)
        char *user, *group;
        char buf[1024], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1];
        char sbuf[FMT_SCALED_STRSIZE];
+       time_t now;
 
        strmode(st->st_mode, mode);
        if (!remote) {
@@ -210,7 +211,9 @@ ls_file(const char *name, const struct stat *st, int remote, int si_units)
                group = gbuf;
        }
        if (ltime != NULL) {
-               if (time(NULL) - st->st_mtime < (365*24*60*60)/2)
+               now = time(NULL);
+               if (now - (365*24*60*60)/2 < st->st_mtime &&
+                   now >= st->st_mtime)
                        sz = strftime(tbuf, sizeof tbuf, "%b %e %H:%M", ltime);
                else
                        sz = strftime(tbuf, sizeof tbuf, "%b %e  %Y", ltime);