static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
- double len;
+ int64 len;
if (!F_IS_ACTIVE(f)) {
/* this can happen if duplicate names were removed */
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
- permbuf, len, timestring(f->modtime),
+ rprintf(FINFO, "%s %11s %s %s -> %s\n",
+ permbuf, big_num(len, 0), timestring(f->modtime),
f_name(f, NULL), F_SYMLINK(f));
} else
#endif
{
- rprintf(FINFO, "%s %11.0f %s %s\n",
- permbuf, len, timestring(f->modtime),
+ rprintf(FINFO, "%s %11s %s %s\n",
+ permbuf, big_num(len, 0), timestring(f->modtime),
f_name(f, NULL));
}
}
n = client_addr(0);
break;
case 'l':
- strlcat(fmt, ".0f", sizeof fmt);
+ strlcat(fmt, "s", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
- (double)F_LENGTH(file));
+ big_num(F_LENGTH(file), 0));
n = buf2;
break;
case 'U':
b = stats.total_read -
initial_stats->total_read;
}
- strlcat(fmt, ".0f", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, (double)b);
+ strlcat(fmt, "s", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt, big_num(b, 0));
n = buf2;
break;
case 'c':
b = stats.total_read -
initial_stats->total_read;
}
- strlcat(fmt, ".0f", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, (double)b);
+ strlcat(fmt, "s", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt, big_num(b, 0));
n = buf2;
break;
case 'i':
printf("%5ld,%6ld",
(long)major(buf.st_rdev),
(long)minor(buf.st_rdev));
- } else /* NB: use double for size since it might not fit in a long. */
- printf("%12.0f", (double)buf.st_size);
+ } else
+ printf("%12s", big_num(buf.st_size, 0));
printf(" %6ld.%-6ld %6ld %s %s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
datebuf, fname, linkbuf);