X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9a234269ed444e9bab0ad4da806a6d2bbd554b3f..016ce7156881c1ea292ff115e5a0cc26e05b2ced:/tls.c diff --git a/tls.c b/tls.c index ca1114c3..aa43b912 100644 --- 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 - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2009 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 @@ -34,7 +35,7 @@ * change. */ #include "rsync.h" -#include "popt.h" +#include #include "lib/sysxattrs.h" #define PROGRAM "tls" @@ -42,9 +43,25 @@ /* 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 nsec_times = 0; int preserve_perms = 0; +int preserve_executability = 0; +char number_separator; + +#ifdef HAVE_UTIMENSAT +#ifdef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC +#define ST_MTIME_NSEC st_mtim.tv_nsec +#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) +#define ST_MTIME_NSEC st_mtimensec +#endif +#endif + +#ifdef SUPPORT_XATTRS #ifdef HAVE_LINUX_XATTRS #define XSTAT_ATTR "user.rsync.%stat" @@ -86,7 +103,12 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) 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; @@ -94,6 +116,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) return 0; } +#endif + static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", @@ -111,8 +135,10 @@ static void list_file(const char *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. */ @@ -121,17 +147,19 @@ 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 - * 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; - 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); + len = do_readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4); if (len == -1) - failed("readlink", fname); + failed("do_readlink", fname); else /* it's not nul-terminated */ linkbuf[4+len] = 0; @@ -142,9 +170,10 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); if (buf.st_mtime) { + int len; mt = gmtime(&buf.st_mtime); - snprintf(datebuf, sizeof datebuf, + len = snprintf(datebuf, sizeof datebuf, "%04d-%02d-%02d %02d:%02d:%02d", (int)mt->tm_year + 1900, (int)mt->tm_mon + 1, @@ -152,8 +181,17 @@ static void list_file(const char *fname) (int)mt->tm_hour, (int)mt->tm_min, (int)mt->tm_sec); - } else - strlcpy(datebuf, " ", sizeof datebuf); +#ifdef ST_MTIME_NSEC + if (nsec_times) { + snprintf(datebuf + len, sizeof datebuf - len, + ".%09d", (int)buf.ST_MTIME_NSEC); + } +#endif + } else { + int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1); + memset(datebuf, ' ', len); + datebuf[len] = '\0'; + } /* TODO: Perhaps escape special characters in fname? */ @@ -162,8 +200,8 @@ static void list_file(const char *fname) 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("%15s", 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); @@ -171,7 +209,14 @@ static void list_file(const char *fname) 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 ST_MTIME_NSEC + {"nsec", 's', POPT_ARG_NONE, &nsec_times, 0, 0, 0 }, +#endif {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, {0,0,0,0,0,0,0} }; @@ -182,7 +227,11 @@ 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," -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 fprintf(F," -h, --help show this help\n"); exit(ret); } @@ -192,6 +241,7 @@ main(int argc, char *argv[]) { poptContext pc; const char **extra_args; + char buf[32]; int opt; pc = poptGetContext(PROGRAM, argc, (const char **)argv, @@ -213,6 +263,12 @@ main(int argc, char *argv[]) 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);