diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /sftp-common.c | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'sftp-common.c')
-rw-r--r-- | sftp-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-common.c b/sftp-common.c index 31d41385b..5313b134d 100644 --- a/sftp-common.c +++ b/sftp-common.c | |||
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: sftp-common.c,v 1.8 2002/10/16 14:31:48 itojun Exp $"); | 27 | RCSID("$OpenBSD: sftp-common.c,v 1.9 2003/05/24 09:30:40 djm Exp $"); |
28 | 28 | ||
29 | #include "buffer.h" | 29 | #include "buffer.h" |
30 | #include "bufaux.h" | 30 | #include "bufaux.h" |
@@ -206,8 +206,8 @@ ls_file(char *name, struct stat *st, int remote) | |||
206 | tbuf[0] = '\0'; | 206 | tbuf[0] = '\0'; |
207 | ulen = MAX(strlen(user), 8); | 207 | ulen = MAX(strlen(user), 8); |
208 | glen = MAX(strlen(group), 8); | 208 | glen = MAX(strlen(group), 8); |
209 | snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode, | 209 | snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode, |
210 | st->st_nlink, ulen, user, glen, group, | 210 | (u_int)st->st_nlink, ulen, user, glen, group, |
211 | (unsigned long long)st->st_size, tbuf, name); | 211 | (unsigned long long)st->st_size, tbuf, name); |
212 | return xstrdup(buf); | 212 | return xstrdup(buf); |
213 | } | 213 | } |