- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / sftp-common.c

diff --git a/sftp-common.c b/sftp-common.c
index 3310eabab57778792d0a43cc6c012dc7f5a88146..a042875c69de2e011174a541c457ec6f67bc8fbb 100644 (file)
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sftp-common.c,v 1.23 2010/01/15 09:24:23 markus Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -24,17 +25,29 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-common.c,v 1.2 2001/02/06 23:50:10 markus Exp $");
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+
+#include <grp.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <stdarg.h>
+#ifdef HAVE_UTIL_H
+#include <util.h>
+#endif
+
+#include "xmalloc.h"
 #include "buffer.h"
-#include "bufaux.h"
-#include "getput.h"
 #include "log.h"
-#include "xmalloc.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
 
+/* Clear contents of attributes structure */
 void
 attrib_clear(Attrib *a)
 {
@@ -47,8 +60,9 @@ attrib_clear(Attrib *a)
        a->mtime = 0;
 }
 
+/* Convert from struct stat to filexfer attribs */
 void
-stat_to_attrib(struct stat *st, Attrib *a)
+stat_to_attrib(const struct stat *st, Attrib *a)
 {
        attrib_clear(a);
        a->flags = 0;
@@ -64,10 +78,32 @@ stat_to_attrib(struct stat *st, Attrib *a)
        a->mtime = st->st_mtime;
 }
 
+/* Convert from filexfer attribs to struct stat */
+void
+attrib_to_stat(const Attrib *a, struct stat *st)
+{
+       memset(st, 0, sizeof(*st));
+
+       if (a->flags & SSH2_FILEXFER_ATTR_SIZE)
+               st->st_size = a->size;
+       if (a->flags & SSH2_FILEXFER_ATTR_UIDGID) {
+               st->st_uid = a->uid;
+               st->st_gid = a->gid;
+       }
+       if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)
+               st->st_mode = a->perm;
+       if (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME) {
+               st->st_atime = a->atime;
+               st->st_mtime = a->mtime;
+       }
+}
+
+/* Decode attributes in buffer */
 Attrib *
 decode_attrib(Buffer *b)
 {
        static Attrib a;
+
        attrib_clear(&a);
        a.flags = buffer_get_int(b);
        if (a.flags & SSH2_FILEXFER_ATTR_SIZE)
@@ -86,6 +122,7 @@ decode_attrib(Buffer *b)
        if (a.flags & SSH2_FILEXFER_ATTR_EXTENDED) {
                char *type, *data;
                int i, count;
+
                count = buffer_get_int(b);
                for (i = 0; i < count; i++) {
                        type = buffer_get_string(b, NULL);
@@ -98,8 +135,9 @@ decode_attrib(Buffer *b)
        return &a;
 }
 
+/* Encode attributes to buffer */
 void
-encode_attrib(Buffer *b, Attrib *a)
+encode_attrib(Buffer *b, const Attrib *a)
 {
        buffer_put_int(b, a->flags);
        if (a->flags & SSH2_FILEXFER_ATTR_SIZE)
@@ -116,6 +154,7 @@ encode_attrib(Buffer *b, Attrib *a)
        }
 }
 
+/* Convert from SSH2_FX_ status to text error message */
 const char *
 fx2txt(int status)
 {
@@ -140,7 +179,54 @@ fx2txt(int status)
                return("Operation unsupported");
        default:
                return("Unknown status");
-       };
+       }
        /* NOTREACHED */
 }
 
+/*
+ * drwxr-xr-x    5 markus   markus       1024 Jan 13 18:39 .ssh
+ */
+char *
+ls_file(const char *name, const struct stat *st, int remote, int si_units)
+{
+       int ulen, glen, sz = 0;
+       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) {
+               user = user_from_uid(st->st_uid, 0);
+       } else {
+               snprintf(ubuf, sizeof ubuf, "%u", (u_int)st->st_uid);
+               user = ubuf;
+       }
+       if (!remote) {
+               group = group_from_gid(st->st_gid, 0);
+       } else {
+               snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid);
+               group = gbuf;
+       }
+       if (ltime != NULL) {
+               if (time(NULL) - st->st_mtime < (365*24*60*60)/2)
+                       sz = strftime(tbuf, sizeof tbuf, "%b %e %H:%M", ltime);
+               else
+                       sz = strftime(tbuf, sizeof tbuf, "%b %e  %Y", ltime);
+       }
+       if (sz == 0)
+               tbuf[0] = '\0';
+       ulen = MAX(strlen(user), 8);
+       glen = MAX(strlen(group), 8);
+       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);
+}