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
include sys/socket.h if possible (this should make rsync compile
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
ed001a2
..
2ec8318
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-30,6
+30,8
@@
extern off_t total_size;
extern int cvs_exclude;
extern int cvs_exclude;
+extern int recurse;
+
extern int one_file_system;
extern int make_backups;
extern int preserve_links;
extern int one_file_system;
extern int make_backups;
extern int preserve_links;
@@
-39,6
+41,7
@@
extern int preserve_devices;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_times;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_times;
+extern int relative_paths;
static char **local_exclude_list = NULL;
static char **local_exclude_list = NULL;
@@
-232,7
+235,7
@@
void receive_file_entry_v11(struct file_struct *file,
-static struct file_struct *make_file(
int recurse,
char *fname)
+static struct file_struct *make_file(char *fname)
{
static struct file_struct file;
struct stat st;
{
static struct file_struct file;
struct stat st;
@@
-304,12
+307,11
@@
static struct file_struct *make_file(int recurse,char *fname)
-static void send_file_name(int f,struct file_list *flist,
- int recurse,char *fname)
+static void send_file_name(int f,struct file_list *flist,char *fname)
{
struct file_struct *file;
{
struct file_struct *file;
- file = make_file(
recurse,
fname);
+ file = make_file(fname);
if (!file) return;
if (!file) return;
@@
-322,7
+324,7
@@
static void send_file_name(int f,struct file_list *flist,
out_of_memory("send_file_name");
}
out_of_memory("send_file_name");
}
- if (strcmp(file->name,"
.") && strcmp(file->name,"
/")) {
+ if (strcmp(file->name,"/")) {
flist->files[flist->count++] = *file;
send_file_entry(file,f);
}
flist->files[flist->count++] = *file;
send_file_entry(file,f);
}
@@
-368,7
+370,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
strcmp(di->d_name,"..")==0)
continue;
strcpy(p,di->d_name);
strcmp(di->d_name,"..")==0)
continue;
strcpy(p,di->d_name);
- send_file_name(f,flist,
1,
fname);
+ send_file_name(f,flist,fname);
}
closedir(d);
}
closedir(d);
@@
-376,7
+378,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
-struct file_list *send_file_list(int f,int
recurse,int
argc,char *argv[])
+struct file_list *send_file_list(int f,int argc,char *argv[])
{
int i,l;
struct stat st;
{
int i,l;
struct stat st;
@@
-384,7
+386,7
@@
struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
char dbuf[MAXPATHLEN];
struct file_list *flist;
char dbuf[MAXPATHLEN];
struct file_list *flist;
- if (verbose && recurse) {
+ if (verbose && recurse
&& !am_server
) {
fprintf(FINFO,"building file list ... ");
fflush(FINFO);
}
fprintf(FINFO,"building file list ... ");
fflush(FINFO);
}
@@
-420,12
+422,19
@@
struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
}
dir = NULL;
}
dir = NULL;
- p = strrchr(fname,'/');
- if (p) {
- *p = 0;
- dir = fname;
- fname = p+1;
+
+ if (!relative_paths) {
+ p = strrchr(fname,'/');
+ if (p) {
+ *p = 0;
+ if (p == fname)
+ dir = "/";
+ else
+ dir = fname;
+ fname = p+1;
+ }
}
}
+
if (!*fname)
fname = ".";
if (!*fname)
fname = ".";
@@
-441,7
+450,7
@@
struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
flist_dir = dir;
if (one_file_system)
set_filesystem(fname);
flist_dir = dir;
if (one_file_system)
set_filesystem(fname);
- send_file_name(f,flist,
recurse,
fname);
+ send_file_name(f,flist,fname);
flist_dir = NULL;
if (chdir(dbuf) != 0) {
fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno));
flist_dir = NULL;
if (chdir(dbuf) != 0) {
fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno));
@@
-452,7
+461,7
@@
struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
if (one_file_system)
set_filesystem(fname);
if (one_file_system)
set_filesystem(fname);
- send_file_name(f,flist,
recurse,
fname);
+ send_file_name(f,flist,fname);
}
if (f != -1) {
}
if (f != -1) {
@@
-460,7
+469,7
@@
struct file_list *send_file_list(int f,int recurse,int argc,char *argv[])
write_flush(f);
}
write_flush(f);
}
- if (verbose && recurse)
+ if (verbose && recurse
&& !am_server
)
fprintf(FINFO,"done\n");
clean_flist(flist);
fprintf(FINFO,"done\n");
clean_flist(flist);
@@
-474,8
+483,10
@@
struct file_list *recv_file_list(int f)
struct file_list *flist;
unsigned char flags;
struct file_list *flist;
unsigned char flags;
- if (verbose > 2)
- fprintf(FERROR,"recv_file_list starting\n");
+ if (verbose && recurse && !am_server) {
+ fprintf(FINFO,"receiving file list ... ");
+ fflush(FINFO);
+ }
flist = (struct file_list *)malloc(sizeof(flist[0]));
if (!flist)
flist = (struct file_list *)malloc(sizeof(flist[0]));
if (!flist)
@@
-518,6
+529,10
@@
struct file_list *recv_file_list(int f)
clean_flist(flist);
clean_flist(flist);
+ if (verbose && recurse && !am_server) {
+ fprintf(FINFO,"done\n");
+ }
+
return flist;
oom:
return flist;
oom: