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
Improved the alignment code and changed POOL_APPEND to POOL_PREPEND.
[rsync/rsync.git]
/
tls.c
diff --git
a/tls.c
b/tls.c
index
6e1c88c
..
c01bdc8
100644
(file)
--- a/
tls.c
+++ b/
tls.c
@@
-2,11
+2,12
@@
* 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
7
Wayne Davison
+ * Copyright (C) 2003-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-34,7
+35,7
@@
* change. */
#include "rsync.h"
* change. */
#include "rsync.h"
-#include
"popt.h"
+#include
<popt.h>
#include "lib/sysxattrs.h"
#define PROGRAM "tls"
#include "lib/sysxattrs.h"
#define PROGRAM "tls"
@@
-44,7
+45,10
@@
int dry_run = 0;
int am_root = 0;
int read_only = 1;
int list_only = 0;
int am_root = 0;
int read_only = 1;
int list_only = 0;
+int link_times = 0;
+int link_owner = 0;
int preserve_perms = 0;
int preserve_perms = 0;
+int preserve_executability = 0;
#ifdef SUPPORT_XATTRS
#ifdef SUPPORT_XATTRS
@@
-88,7
+92,12
@@
static int stat_xattr(const char *fname, STRUCT_STAT *fst)
exit(1);
}
exit(1);
}
- fst->st_mode = from_wire_mode(mode);
+#if _S_IFLNK != 0120000
+ if ((mode & (_S_IFMT)) == 0120000)
+ mode = (mode & ~(_S_IFMT)) | _S_IFLNK;
+#endif
+ fst->st_mode = mode;
+
fst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
fst->st_uid = uid;
fst->st_gid = gid;
fst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
fst->st_uid = uid;
fst->st_gid = gid;
@@
-127,12
+136,14
@@
static void list_file(const char *fname)
/* On some BSD platforms the mode bits of a symlink are
* undefined. Also it tends not to be possible to reset a
/* On some BSD platforms the mode bits of a symlink are
* undefined. Also it tends not to be possible to reset a
- * symlink's mtime, so we
have to ignore
it too. */
+ * symlink's mtime, so we
default to ignoring
it too. */
if (S_ISLNK(buf.st_mode)) {
int len;
buf.st_mode &= ~0777;
if (S_ISLNK(buf.st_mode)) {
int len;
buf.st_mode &= ~0777;
- buf.st_mtime = (time_t)0;
- buf.st_uid = buf.st_gid = 0;
+ if (!link_times)
+ buf.st_mtime = (time_t)0;
+ if (!link_owner)
+ 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);
strlcpy(linkbuf, " -> ", sizeof linkbuf);
/* const-cast required for silly UNICOS headers */
len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
@@
-168,8
+179,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("%12
.0f", (double)buf.st_size
);
+ } else
+ printf("%12
s", 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);
printf(" %6ld.%-6ld %6ld %s %s%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
datebuf, fname, linkbuf);
@@
-177,6
+188,8
@@
static void list_file(const char *fname)
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+ {"link-times", 'l', POPT_ARG_NONE, &link_times, 0, 0, 0 },
+ {"link-owner", 'L', POPT_ARG_NONE, &link_owner, 0, 0, 0 },
#ifdef SUPPORT_XATTRS
{"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 },
#endif
#ifdef SUPPORT_XATTRS
{"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 },
#endif
@@
-190,6
+203,8
@@
static void tls_usage(int ret)
fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
fprintf(F,"Trivial file listing program for portably checking rsync\n");
fprintf(F,"\nOptions:\n");
fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
fprintf(F,"Trivial file listing program for portably checking rsync\n");
fprintf(F,"\nOptions:\n");
+ fprintf(F," -l, --link-times display the time on a symlink\n");
+ fprintf(F," -L, --link-owner display the owner+group on a symlink\n");
#ifdef SUPPORT_XATTRS
fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n");
#endif
#ifdef SUPPORT_XATTRS
fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n");
#endif