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
Make daemon-exclude errors more error-like.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
f90c286
..
7a6ab34
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-86,14
+86,6
@@
extern int filesfrom_convert;
extern iconv_t ic_send, ic_recv;
#endif
extern iconv_t ic_send, ic_recv;
#endif
-#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
-
#define PTR_SIZE (sizeof (struct file_struct *))
int io_error;
#define PTR_SIZE (sizeof (struct file_struct *))
int io_error;
@@
-1734,11
+1726,12
@@
static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
remainder = 0;
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
remainder = 0;
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
+ unsigned name_len;
char *dname = d_name(di);
if (dname[0] == '.' && (dname[1] == '\0'
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
char *dname = d_name(di);
if (dname[0] == '.' && (dname[1] == '\0'
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
-
unsigned
name_len = strlcpy(p, dname, remainder);
+ name_len = strlcpy(p, dname, remainder);
if (name_len >= remainder) {
char save = fbuf[len];
fbuf[len] = '\0';
if (name_len >= remainder) {
char save = fbuf[len];
fbuf[len] = '\0';