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
Always use lutimes() if it is available.
[rsync/rsync.git]
/
tls.c
diff --git
a/tls.c
b/tls.c
index
c11bdb4
..
1c5953d
100644
(file)
--- a/
tls.c
+++ b/
tls.c
@@
-2,7
+2,7
@@
* Trivial ls for comparing two directories after running an rsync.
*
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
* Trivial ls for comparing two directories after running an rsync.
*
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-200
8
Wayne Davison
+ * Copyright (C) 2003-200
9
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-43,12
+43,14
@@
/* These are to make syscall.o shut up. */
int dry_run = 0;
int am_root = 0;
/* These are to make syscall.o shut up. */
int dry_run = 0;
int am_root = 0;
+int am_sender = 1;
int read_only = 1;
int list_only = 0;
int link_times = 0;
int link_owner = 0;
int preserve_perms = 0;
int preserve_executability = 0;
int read_only = 1;
int list_only = 0;
int link_times = 0;
int link_owner = 0;
int preserve_perms = 0;
int preserve_executability = 0;
+char number_separator;
#ifdef SUPPORT_XATTRS
#ifdef SUPPORT_XATTRS
@@
-146,9
+148,9
@@
static void list_file(const char *fname)
buf.st_uid = buf.st_gid = 0;
strlcpy(linkbuf, " -> ", sizeof linkbuf);
/* const-cast required for silly UNICOS headers */
buf.st_uid = buf.st_gid = 0;
strlcpy(linkbuf, " -> ", sizeof linkbuf);
/* const-cast required for silly UNICOS headers */
- len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
+ len =
do_
readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
if (len == -1)
if (len == -1)
- failed("readlink", fname);
+ failed("
do_
readlink", fname);
else
/* it's not nul-terminated */
linkbuf[4+len] = 0;
else
/* it's not nul-terminated */
linkbuf[4+len] = 0;
@@
-179,8
+181,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
+219,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
+241,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);