- djm@cvs.openbsd.org 2010/01/13 01:40:16

     [sftp.c sftp-server.c sftp.1 sftp-common.c sftp-common.h]
     support '-h' (human-readable units) for sftp's ls command, just like
     ls(1); ok dtucker@

1 files changed, 14 insertions, 5 deletions

diff --git a/sftp-common.c b/sftp-common.c
index 7ebadcc53..7393fc6a9 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.20 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.21 2010/01/13 01:40:16 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <time.h>
 #include <stdarg.h>
+#include <util.h>
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -184,7 +185,7 @@ fx2txt(int status)
  * drwxr-xr-x    5 markus   markus       1024 Jan 13 18:39 .ssh
  */
 char *
-ls_file(const char *name, const struct stat *st, int remote)
+ls_file(const char *name, const struct stat *st, int remote, int si_units)
 {
         int ulen, glen, sz = 0;
         struct passwd *pw;
@@ -192,6 +193,7 @@ ls_file(const char *name, const struct stat *st, int remote)
         struct tm *ltime = localtime(&st->st_mtime);
         char *user, *group;
         char buf[1024], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1];
+        char sbuf[FMT_SCALED_STRSIZE];
 
         strmode(st->st_mode, mode);
         if (!remote && (pw = getpwuid(st->st_uid)) != NULL) {
@@ -216,8 +218,15 @@ ls_file(const char *name, const struct stat *st, int remote)
                 tbuf[0] = '\0';
         ulen = MAX(strlen(user), 8);
         glen = MAX(strlen(group), 8);
-        snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode,
-            (u_int)st->st_nlink, ulen, user, glen, group,
-            (unsigned long long)st->st_size, tbuf, name);
+        if (si_units) {
+                fmt_scaled((long long)st->st_size, sbuf);
+                snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8s %s %s", mode,
+                    (u_int)st->st_nlink, ulen, user, glen, group,
+                    sbuf, tbuf, name);
+        } else {
+                snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode,
+                    (u_int)st->st_nlink, ulen, user, glen, group,
+                    (unsigned long long)st->st_size, tbuf, name);
+        }
         return xstrdup(buf);
 }