Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f636c38
)
Renamed keep_dirs, "xfer_dirs".
author
Wayne Davison
<wayned@samba.org>
Mon, 24 Jan 2005 00:17:36 +0000
(
00:17
+0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 24 Jan 2005 00:17:36 +0000
(
00:17
+0000)
flist.c
patch
|
blob
|
blame
|
history
diff --git
a/flist.c
b/flist.c
index
013c104
..
21eef26
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-43,7
+43,7
@@
extern int numeric_ids;
extern int cvs_exclude;
extern int recurse;
extern int cvs_exclude;
extern int recurse;
-extern int
keep
_dirs;
+extern int
xfer
_dirs;
extern char curr_dir[MAXPATHLEN];
extern int filesfrom_fd;
extern char curr_dir[MAXPATHLEN];
extern int filesfrom_fd;
@@
-89,7
+89,7
@@
void init_flist(void)
static int show_filelist_p(void)
{
static int show_filelist_p(void)
{
- return verbose &&
keep
_dirs && !am_server;
+ return verbose &&
xfer
_dirs && !am_server;
}
static void start_filelist_progress(char *kind)
}
static void start_filelist_progress(char *kind)
@@
-804,7
+804,7
@@
struct file_struct *make_file(char *fname, struct file_list *flist,
if (exclude_level == NO_EXCLUDES)
goto skip_excludes;
if (exclude_level == NO_EXCLUDES)
goto skip_excludes;
- if (S_ISDIR(st.st_mode) && !
keep
_dirs) {
+ if (S_ISDIR(st.st_mode) && !
xfer
_dirs) {
rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
@@
-1130,7
+1130,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
}
if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
}
}
if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
- if (!recurse &&
keep
_dirs)
+ if (!recurse &&
xfer
_dirs)
recurse = 1; /* allow one level */
} else if (recurse > 0)
recurse = 0;
recurse = 1; /* allow one level */
} else if (recurse > 0)
recurse = 0;
@@
-1144,7
+1144,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
continue;
}
continue;
}
- if (S_ISDIR(st.st_mode) && !
keep
_dirs) {
+ if (S_ISDIR(st.st_mode) && !
xfer
_dirs) {
rprintf(FINFO, "skipping directory %s\n", fname);
continue;
}
rprintf(FINFO, "skipping directory %s\n", fname);
continue;
}
@@
-1177,16
+1177,16
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
*p = '/';
if (fn != p || (*lp && *lp != '/')) {
int save_copy_links = copy_links;
*p = '/';
if (fn != p || (*lp && *lp != '/')) {
int save_copy_links = copy_links;
- int save_
keep_dirs = keep
_dirs;
+ int save_
xfer_dirs = xfer
_dirs;
copy_links = copy_unsafe_links;
copy_links = copy_unsafe_links;
-
keep
_dirs = 1;
+
xfer
_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
*slash = 0;
send_file_name(f, flist, fname, 0, 0);
*slash = '/';
}
copy_links = save_copy_links;
while ((slash = strchr(slash+1, '/')) != 0) {
*slash = 0;
send_file_name(f, flist, fname, 0, 0);
*slash = '/';
}
copy_links = save_copy_links;
-
keep_dirs = save_keep
_dirs;
+
xfer_dirs = save_xfer
_dirs;
*p = 0;
strlcpy(lastpath, fname, sizeof lastpath);
*p = '/';
*p = 0;
strlcpy(lastpath, fname, sizeof lastpath);
*p = '/';