static void clean_flist(struct file_list *flist, int strip_root);
+
+static void list_file_entry(struct file_struct *f)
+{
+ char perms[11] = "----------";
+ char *perm_map = "rwxrwxrwx";
+ int i;
+
+ for (i=0;i<9;i++) {
+ if (f->mode & (1<<i)) perms[9-i] = perm_map[8-i];
+ }
+ if (S_ISLNK(f->mode)) perms[0] = 'l';
+ if (S_ISDIR(f->mode)) perms[0] = 'd';
+ if (S_ISBLK(f->mode)) perms[0] = 'b';
+ if (S_ISCHR(f->mode)) perms[0] = 'c';
+ if (S_ISSOCK(f->mode)) perms[0] = 's';
+ if (S_ISFIFO(f->mode)) perms[0] = 'p';
+
+ if (preserve_links && S_ISLNK(f->mode)) {
+ rprintf(FINFO,"%s %11.0f %s %s -> %s\n",
+ perms,
+ (double)f->length, timestring(f->modtime),
+ f_name(f), f->link);
+ } else {
+ rprintf(FINFO,"%s %11.0f %s %s\n",
+ perms,
+ (double)f->length, timestring(f->modtime), f_name(f));
+ }
+}
+
+
int link_stat(const char *Path, STRUCT_STAT *Buffer)
{
#if SUPPORT_LINKS
}
+static int to_wire_mode(mode_t mode)
+{
+ if (S_ISLNK(mode) && (S_IFLNK != 0120000)) {
+ return (mode & ~(_S_IFMT)) | 0120000;
+ }
+ return (int)mode;
+}
+
+static mode_t from_wire_mode(int mode)
+{
+ if ((mode & (_S_IFMT)) == 0120000 && (S_IFLNK != 0120000)) {
+ return (mode & ~(_S_IFMT)) | S_IFLNK;
+ }
+ return (mode_t)mode;
+}
+
+
static void send_directory(int f,struct file_list *flist,char *dir);
static char *flist_dir;
if (!(flags & SAME_TIME))
write_int(f,(int)file->modtime);
if (!(flags & SAME_MODE))
- write_int(f,(int)file->mode);
+ write_int(f,to_wire_mode(file->mode));
if (preserve_uid && !(flags & SAME_UID)) {
add_uid(file->uid);
write_int(f,(int)file->uid);
last_gid = file->gid;
last_time = file->modtime;
- strlcpy(lastname,fname,MAXPATHLEN-1);
+ strlcpy(lastname,fname,MAXPATHLEN);
lastname[MAXPATHLEN-1] = 0;
}
if (l2 >= MAXPATHLEN-l1) overflow("receive_file_entry");
- strlcpy(thisname,lastname,l1);
+ strlcpy(thisname,lastname,l1+1);
read_sbuf(f,&thisname[l1],l2);
thisname[l1+l2] = 0;
- strlcpy(lastname,thisname,MAXPATHLEN-1);
+ strlcpy(lastname,thisname,MAXPATHLEN);
lastname[MAXPATHLEN-1] = 0;
clean_fname(thisname);
file->flags = flags;
file->length = read_longint(f);
file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f);
- file->mode = (flags & SAME_MODE) ? last_mode : (mode_t)read_int(f);
+ file->mode = (flags & SAME_MODE) ? last_mode : from_wire_mode(read_int(f));
if (preserve_uid)
file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f);
if (preserve_gid)
char *p;
char cleaned_name[MAXPATHLEN];
- strlcpy(cleaned_name, fname, MAXPATHLEN-1);
+ strlcpy(cleaned_name, fname, MAXPATHLEN);
cleaned_name[MAXPATHLEN-1] = 0;
clean_fname(cleaned_name);
fname = cleaned_name;
-static void send_file_name(int f,struct file_list *flist,char *fname,
+void send_file_name(int f,struct file_list *flist,char *fname,
int recursive, unsigned base_flags)
{
struct file_struct *file;
return;
}
- strlcpy(fname,dir,MAXPATHLEN-1);
+ strlcpy(fname,dir,MAXPATHLEN);
l = strlen(fname);
if (fname[l-1] != '/') {
if (l == MAXPATHLEN-1) {
closedir(d);
return;
}
- strlcat(fname,"/", MAXPATHLEN-1);
+ strlcat(fname,"/", MAXPATHLEN);
l++;
}
p = fname + strlen(fname);
if (strcmp(dname,".")==0 ||
strcmp(dname,"..")==0)
continue;
- strlcpy(p,dname,MAXPATHLEN-(l+1));
+ strlcpy(p,dname,MAXPATHLEN-l);
send_file_name(f,flist,fname,recurse,0);
}
{
int i,l;
STRUCT_STAT st;
- char *p,*dir;
+ char *p,*dir,*olddir;
char lastpath[MAXPATHLEN]="";
struct file_list *flist;
int64 start_write;
char fname2[MAXPATHLEN];
char *fname = fname2;
- strlcpy(fname,argv[i],MAXPATHLEN-1);
+ strlcpy(fname,argv[i],MAXPATHLEN);
l = strlen(fname);
if (l != 1 && fname[l-1] == '/') {
- strlcat(fname,".",MAXPATHLEN-1);
+ strlcat(fname,".",MAXPATHLEN);
}
if (link_stat(fname,&st) != 0) {
}
dir = NULL;
+ olddir = NULL;
if (!relative_paths) {
p = strrchr(fname,'/');
thus getting their permissions right */
*p = 0;
if (strcmp(lastpath,fname)) {
- strlcpy(lastpath, fname, sizeof(lastpath)-1);
+ strlcpy(lastpath, fname, sizeof(lastpath));
*p = '/';
for (p=fname+1; (p=strchr(p,'/')); p++) {
int copy_links_saved = copy_links;
fname = ".";
if (dir && *dir) {
- char *olddir = push_dir(dir, 1);
+ olddir = push_dir(dir, 1);
if (!olddir) {
io_error=1;
}
flist_dir = dir;
- if (one_file_system)
- set_filesystem(fname);
+ }
+
+ if (one_file_system)
+ set_filesystem(fname);
+
+ if (!recurse || !send_included_file_names(f,flist))
send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+
+ if (olddir != NULL) {
flist_dir = NULL;
if (pop_dir(olddir) != 0) {
rprintf(FERROR,"pop_dir %s : %s\n",
dir,strerror(errno));
- exit_cleanup(1);
+ exit_cleanup(RERR_FILESELECT);
}
- continue;
}
-
- if (one_file_system)
- set_filesystem(fname);
- send_file_name(f,flist,fname,recurse,FLAG_DELETE);
}
if (f != -1) {
struct file_list *flist;
unsigned char flags;
int64 start_read;
+ extern int list_only;
if (verbose && recurse && !am_server) {
rprintf(FINFO,"receiving file list ... ");
io_error |= read_int(f);
}
+ if (list_only) {
+ int i;
+ for (i=0;i<flist->count;i++) {
+ list_file_entry(flist->files[i]);
+ }
+ }
+
+
if (verbose > 2)
rprintf(FINFO,"recv_file_list done\n");
for (i=0;i<flist->count;i++) {
rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%d\n",
getpid(), i,
- flist->files[i]->dirname,
- flist->files[i]->basename,
+ NS(flist->files[i]->dirname),
+ NS(flist->files[i]->basename),
flist->files[i]->mode,
- flist->files[i]->length);
+ (int)flist->files[i]->length);
}
}
n = (n+1)%10;
if (f->dirname) {
- slprintf(p, MAXPATHLEN-1, "%s/%s", f->dirname, f->basename);
+ strlcpy(p, f->dirname, MAXPATHLEN);
+ strlcat(p, "/", MAXPATHLEN);
+ strlcat(p, f->basename, MAXPATHLEN);
} else {
- strlcpy(p, f->basename, MAXPATHLEN-1);
+ strlcpy(p, f->basename, MAXPATHLEN);
}
return p;