Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly ignore source args on a --read-batch command.
[rsync/rsync.git]
/
tls.c
diff --git
a/tls.c
b/tls.c
index
c11bdb4
..
501a932
100644
(file)
--- a/
tls.c
+++ b/
tls.c
@@
-49,6
+49,7
@@
int link_times = 0;
int link_owner = 0;
int preserve_perms = 0;
int preserve_executability = 0;
int link_owner = 0;
int preserve_perms = 0;
int preserve_executability = 0;
+char number_separator;
#ifdef SUPPORT_XATTRS
#ifdef SUPPORT_XATTRS
@@
-179,8
+180,8
@@
static void list_file(const char *fname)
printf("%5ld,%6ld",
(long)major(buf.st_rdev),
(long)minor(buf.st_rdev));
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("%1
2.0f", (double)buf.st_size
);
+ } else
+ printf("%1
5s", do_big_num(buf.st_size, 1, NULL)
);
printf(" %6ld.%-6ld %6ld %s %s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
datebuf, fname, linkbuf);
printf(" %6ld.%-6ld %6ld %s %s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
datebuf, fname, linkbuf);
@@
-217,6
+218,7
@@
main(int argc, char *argv[])
{
poptContext pc;
const char **extra_args;
{
poptContext pc;
const char **extra_args;
+ char buf[32];
int opt;
pc = poptGetContext(PROGRAM, argc, (const char **)argv,
int opt;
pc = poptGetContext(PROGRAM, argc, (const char **)argv,
@@
-238,6
+240,12
@@
main(int argc, char *argv[])
if (!extra_args || *extra_args == NULL)
tls_usage(1);
if (!extra_args || *extra_args == NULL)
tls_usage(1);
+ snprintf(buf, sizeof buf, "%f", 3.14);
+ if (strchr(buf, '.') != NULL)
+ number_separator = ',';
+ else
+ number_separator = '.';
+
for (; *extra_args; extra_args++)
list_file(*extra_args);
poptFreeContext(pc);
for (; *extra_args; extra_args++)
list_file(*extra_args);
poptFreeContext(pc);