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
handle broken readdir() on Solaris 2.6 (it returns the name offset by
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
463d428
..
16a7a31
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-107,12
+107,13
@@
static int delete_file(char *fname)
}
for (di=readdir(d); di; di=readdir(d)) {
}
for (di=readdir(d); di; di=readdir(d)) {
- if (strcmp(di->d_name,".")==0 ||
- strcmp(di->d_name,"..")==0)
+ char *dname = d_name(di);
+ if (strcmp(dname,".")==0 ||
+ strcmp(dname,"..")==0)
continue;
continue;
- strncpy(buf, fname, (MAXPATHLEN-strlen(d
i->d_
name))-2);
+ strncpy(buf, fname, (MAXPATHLEN-strlen(dname))-2);
strcat(buf, "/");
strcat(buf, "/");
- strcat(buf, d
i->d_
name);
+ strcat(buf, dname);
buf[MAXPATHLEN-1] = 0;
if (verbose > 0)
fprintf(FINFO,"deleting %s\n", buf);
buf[MAXPATHLEN-1] = 0;
if (verbose > 0)
fprintf(FINFO,"deleting %s\n", buf);