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
Renamed mkrounding.c to rounding.c.
[rsync/rsync.git]
/
tls.c
diff --git
a/tls.c
b/tls.c
index
ca1114c
..
97b713b
100644
(file)
--- a/
tls.c
+++ b/
tls.c
@@
-5,8
+5,9
@@
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 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
@@
-46,6
+47,8
@@
int read_only = 1;
int list_only = 0;
int preserve_perms = 0;
int list_only = 0;
int preserve_perms = 0;
+#ifdef SUPPORT_XATTRS
+
#ifdef HAVE_LINUX_XATTRS
#define XSTAT_ATTR "user.rsync.%stat"
#else
#ifdef HAVE_LINUX_XATTRS
#define XSTAT_ATTR "user.rsync.%stat"
#else
@@
-86,7
+89,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;
@@
-94,6
+102,8
@@
static int stat_xattr(const char *fname, STRUCT_STAT *fst)
return 0;
}
return 0;
}
+#endif
+
static void failed(char const *what, char const *where)
{
fprintf(stderr, PROGRAM ": %s %s: %s\n",
static void failed(char const *what, char const *where)
{
fprintf(stderr, PROGRAM ": %s %s: %s\n",
@@
-111,8
+121,10
@@
static void list_file(const char *fname)
if (do_lstat(fname, &buf) < 0)
failed("stat", fname);
if (do_lstat(fname, &buf) < 0)
failed("stat", fname);
+#ifdef SUPPORT_XATTRS
if (am_root < 0)
stat_xattr(fname, &buf);
if (am_root < 0)
stat_xattr(fname, &buf);
+#endif
/* The size of anything but a regular file is probably not
* worth thinking about. */
/* The size of anything but a regular file is probably not
* worth thinking about. */
@@
-171,7
+183,9
@@
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 */
+#ifdef SUPPORT_XATTRS
{"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 },
{"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 },
+#endif
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{0,0,0,0,0,0,0}
};
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{0,0,0,0,0,0,0}
};
@@
-182,7
+196,9
@@
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");
+#ifdef SUPPORT_XATTRS
fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n");
fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n");
+#endif
fprintf(F," -h, --help show this help\n");
exit(ret);
}
fprintf(F," -h, --help show this help\n");
exit(ret);
}