X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ea1438dad8dafb5c4e55a00c5919fe619fb4f0ef..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/tls.c diff --git a/tls.c b/tls.c index 44e290e3..c52b25ab 100644 --- a/tls.c +++ b/tls.c @@ -1,28 +1,25 @@ -/* -*- c-file-style: "linux" -*- +/* + * Trivial ls for comparing two directories after running an rsync. + * + * Copyright (C) 2001, 2002 Martin Pool + * Copyright (C) 2003-2008 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * - * Copyright (C) 2001, 2002 by Martin Pool - * - * 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. - * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -/** - * \section tls - * - * tls -- Trivial recursive ls, for comparing two directories after - * running an rsync. - * - * The problem with using the system's own ls is that some features +/* The problem with using the system's own ls is that some features * have little quirks that make directories look different when for * our purposes they're the same -- for example, the BSD braindamage * about setting the mode on symlinks based on your current umask. @@ -35,41 +32,100 @@ * * A key requirement for this program is that the output be "very * reproducible." So we mask away information that can accidentally - * change. - **/ - - + * change. */ #include "rsync.h" +#include "popt.h" +#include "lib/sysxattrs.h" #define PROGRAM "tls" /* These are to make syscall.o shut up. */ int dry_run = 0; +int am_root = 0; int read_only = 1; int list_only = 0; +int preserve_perms = 0; +int preserve_executability = 0; + +#ifdef SUPPORT_XATTRS +#ifdef HAVE_LINUX_XATTRS +#define XSTAT_ATTR "user.rsync.%stat" +#else +#define XSTAT_ATTR "rsync.%stat" +#endif -static void failed (char const *what, - char const *where) +static int stat_xattr(const char *fname, STRUCT_STAT *fst) { - fprintf (stderr, PROGRAM ": %s %s: %s\n", - what, where, strerror (errno)); - exit (1); + int mode, rdev_major, rdev_minor, uid, gid, len; + char buf[256]; + + if (am_root >= 0 || IS_DEVICE(fst->st_mode) || IS_SPECIAL(fst->st_mode)) + return -1; + + len = sys_lgetxattr(fname, XSTAT_ATTR, buf, sizeof buf - 1); + if (len >= (int)sizeof buf) { + len = -1; + errno = ERANGE; + } + if (len < 0) { + if (errno == ENOTSUP || errno == ENOATTR) + return -1; + if (errno == EPERM && S_ISLNK(fst->st_mode)) { + fst->st_uid = 0; + fst->st_gid = 0; + return 0; + } + fprintf(stderr, "failed to read xattr %s for %s: %s\n", + XSTAT_ATTR, fname, strerror(errno)); + return -1; + } + buf[len] = '\0'; + + if (sscanf(buf, "%o %d,%d %d:%d", + &mode, &rdev_major, &rdev_minor, &uid, &gid) != 5) { + fprintf(stderr, "Corrupt %s xattr attached to %s: \"%s\"\n", + XSTAT_ATTR, fname, buf); + exit(1); + } + +#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; + + return 0; } +#endif +static void failed(char const *what, char const *where) +{ + fprintf(stderr, PROGRAM ": %s %s: %s\n", + what, where, strerror(errno)); + exit(1); +} -static void list_file (const char *fname) +static void list_file(const char *fname) { - struct stat buf; + STRUCT_STAT buf; char permbuf[PERMSTRING_SIZE]; struct tm *mt; char datebuf[50]; char linkbuf[4096]; - if (do_lstat(fname, &buf) == -1) - failed ("stat", fname); + if (do_lstat(fname, &buf) < 0) + failed("stat", fname); +#ifdef SUPPORT_XATTRS + if (am_root < 0) + stat_xattr(fname, &buf); +#endif /* The size of anything but a regular file is probably not * worth thinking about. */ @@ -84,10 +140,10 @@ static void list_file (const char *fname) buf.st_mode &= ~0777; buf.st_mtime = (time_t)0; buf.st_uid = buf.st_gid = 0; - strcpy(linkbuf, " -> "); + strlcpy(linkbuf, " -> ", sizeof linkbuf); /* const-cast required for silly UNICOS headers */ len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4); - if (len == -1) + if (len == -1) failed("readlink", fname); else /* it's not nul-terminated */ @@ -100,42 +156,83 @@ static void list_file (const char *fname) if (buf.st_mtime) { mt = gmtime(&buf.st_mtime); - - sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d", - mt->tm_year + 1900, - mt->tm_mon + 1, - mt->tm_mday, - mt->tm_hour, - mt->tm_min, - mt->tm_sec); - } else { - strcpy(datebuf, " "); - } - + + snprintf(datebuf, sizeof datebuf, + "%04d-%02d-%02d %02d:%02d:%02d", + (int)mt->tm_year + 1900, + (int)mt->tm_mon + 1, + (int)mt->tm_mday, + (int)mt->tm_hour, + (int)mt->tm_min, + (int)mt->tm_sec); + } else + strlcpy(datebuf, " ", sizeof datebuf); + /* TODO: Perhaps escape special characters in fname? */ - - - /* NB: need to pass size as a double because it might be be - * too large for a long. */ - printf("%s %12.0f %6d.%-6d %6d %s %s%s\n", - permbuf, (double) buf.st_size, - buf.st_uid, buf.st_gid, - buf.st_nlink, + + printf("%s ", permbuf); + if (S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode)) { + 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); + printf(" %6ld.%-6ld %6ld %s %s%s\n", + (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink, datebuf, fname, linkbuf); } +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 }, +#endif + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, + {0,0,0,0,0,0,0} +}; -int main (int argc, char *argv[]) +static void tls_usage(int ret) { - if (argc < 2) { - fprintf (stderr, "usage: " PROGRAM " DIR ...\n" - "Trivial file listing program for portably checking rsync\n"); - return 1; - } + FILE *F = ret ? stderr : stdout; + 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"); +#endif + fprintf(F," -h, --help show this help\n"); + exit(ret); +} - for (argv++; *argv; argv++) { - list_file (*argv); +int +main(int argc, char *argv[]) +{ + poptContext pc; + const char **extra_args; + int opt; + + pc = poptGetContext(PROGRAM, argc, (const char **)argv, + long_options, 0); + while ((opt = poptGetNextOpt(pc)) != -1) { + switch (opt) { + case 'h': + tls_usage(0); + default: + fprintf(stderr, + "%s: %s\n", + poptBadOption(pc, POPT_BADOPTION_NOALIAS), + poptStrerror(opt)); + tls_usage(1); + } } + extra_args = poptGetArgs(pc); + if (!extra_args || *extra_args == NULL) + tls_usage(1); + + for (; *extra_args; extra_args++) + list_file(*extra_args); + poptFreeContext(pc); + return 0; }