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
Fixed the hard-linking of symlinks test (we need to use a symlink
[rsync/rsync.git]
/
tls.c
diff --git
a/tls.c
b/tls.c
index
78feae3
..
4d1ab91
100644
(file)
--- a/
tls.c
+++ b/
tls.c
@@
-1,6
+1,8
@@
-/* -*- c-file-style: "linux" -*-
+/*
+ * Trivial ls for comparing two directories after running an rsync.
*
*
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005 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
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version
@@
-11,17
+13,12
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*/
*/
-/**
- * @file tls.c
- *
- * Trivial @c 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.
* 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.
@@
-34,9
+31,7
@@
*
* A key requirement for this program is that the output be "very
* reproducible." So we mask away information that can accidentally
*
* 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 "rsync.h"
@@
-48,18
+43,14
@@
int read_only = 1;
int list_only = 0;
int preserve_perms = 0;
int list_only = 0;
int preserve_perms = 0;
-
-static void failed (char const *what,
- char const *where)
+static void failed(char const *what, char const *where)
{
{
- fprintf
(stderr, PROGRAM ": %s %s: %s\n",
-
what, where, strerror
(errno));
- exit
(1);
+ 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;
char permbuf[PERMSTRING_SIZE];
{
STRUCT_STAT buf;
char permbuf[PERMSTRING_SIZE];
@@
-67,8
+58,8
@@
static void list_file (const char *fname)
char datebuf[50];
char linkbuf[4096];
char datebuf[50];
char linkbuf[4096];
- if (do_lstat(fname, &buf)
== -1
)
- failed
("stat", fname);
+ if (do_lstat(fname, &buf)
< 0
)
+ failed("stat", fname);
/* 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. */
@@
-83,7
+74,7
@@
static void list_file (const char *fname)
buf.st_mode &= ~0777;
buf.st_mtime = (time_t)0;
buf.st_uid = buf.st_gid = 0;
buf.st_mode &= ~0777;
buf.st_mtime = (time_t)0;
buf.st_uid = buf.st_gid = 0;
- str
cpy(linkbuf, " -> "
);
+ str
lcpy(linkbuf, " -> ", sizeof linkbuf
);
/* const-cast required for silly UNICOS headers */
len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
if (len == -1)
/* const-cast required for silly UNICOS headers */
len = readlink((char *) fname, linkbuf+4, sizeof(linkbuf) - 4);
if (len == -1)
@@
-100,21
+91,21
@@
static void list_file (const char *fname)
if (buf.st_mtime) {
mt = gmtime(&buf.st_mtime);
if (buf.st_mtime) {
mt = gmtime(&buf.st_mtime);
- s
printf(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, " ");
- }
+ s
nprintf(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? */
printf("%s ", permbuf);
/* TODO: Perhaps escape special characters in fname? */
printf("%s ", permbuf);
- if (
IS_DEVICE
(buf.st_mode)) {
+ if (
S_ISCHR(buf.st_mode) || S_ISBLK
(buf.st_mode)) {
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));
@@
-125,18
+116,17
@@
static void list_file (const char *fname)
datebuf, fname, linkbuf);
}
datebuf, fname, linkbuf);
}
-
int
main(int argc, char *argv[])
{
if (argc < 2) {
int
main(int argc, char *argv[])
{
if (argc < 2) {
- fprintf
(stderr, "usage: " PROGRAM " DIR ...\n"
-
"Trivial file listing program for portably checking rsync\n");
+ fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
+ "Trivial file listing program for portably checking rsync\n");
return 1;
}
for (argv++; *argv; argv++) {
return 1;
}
for (argv++; *argv; argv++) {
- list_file
(*argv);
+ list_file(*argv);
}
return 0;
}
return 0;