}
+/*
+ * delete a file or directory. If force_delet is set then delete
+ * recursively
+ */
+static int delete_file(char *fname)
+{
+ DIR *d;
+ struct dirent *di;
+ char buf[MAXPATHLEN];
+ extern int force_delete;
+ struct stat st;
+ int ret;
+
+ if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
+
+#if SUPPORT_LINKS
+ ret = lstat(fname, &st);
+#else
+ ret = stat(fname, &st);
+#endif
+ if (ret) {
+ fprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ if (!S_ISDIR(st.st_mode)) {
+ fprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
+ if (!force_delete || errno != ENOTEMPTY) {
+ fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ /* now we do a recsursive delete on the directory ... */
+ d = opendir(fname);
+ if (!d) {
+ fprintf(FERROR,"opendir(%s): %s\n",
+ fname,strerror(errno));
+ return -1;
+ }
+
+ for (di=readdir(d); di; di=readdir(d)) {
+ if (strcmp(di->d_name,".")==0 ||
+ strcmp(di->d_name,"..")==0)
+ continue;
+ strncpy(buf, fname, (MAXPATHLEN-strlen(di->d_name))-2);
+ strcat(buf, "/");
+ strcat(buf, di->d_name);
+ buf[MAXPATHLEN-1] = 0;
+ if (verbose > 0)
+ fprintf(FINFO,"deleting %s\n", buf);
+ if (delete_file(buf) != 0) {
+ closedir(d);
+ return -1;
+ }
+ }
+
+ closedir(d);
+
+ if (do_rmdir(fname) != 0) {
+ fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+ return -1;
+ }
+
+ return 0;
+}
/*
send a sums struct down a fd
if (preserve_perms && !S_ISLNK(st->st_mode) &&
st->st_mode != file->mode) {
updated = 1;
- if (chmod(fname,file->mode) != 0) {
+ if (do_chmod(fname,file->mode) != 0) {
fprintf(FERROR,"failed to set permissions on %s : %s\n",
fname,strerror(errno));
return 0;
if ((am_root && preserve_uid && st->st_uid != file->uid) ||
(preserve_gid && st->st_gid != file->gid)) {
- updated = 1;
- if (lchown(fname,
- (am_root&&preserve_uid)?file->uid:-1,
- preserve_gid?file->gid:-1) != 0) {
- if (verbose>1 || preserve_uid)
- fprintf(FERROR,"chown %s : %s\n",fname,strerror(errno));
- return updated;
- }
+ if (do_lchown(fname,
+ (am_root&&preserve_uid)?file->uid:-1,
+ preserve_gid?file->gid:-1) != 0) {
+ if (preserve_uid && st->st_uid != file->uid)
+ updated = 1;
+ if (verbose>1 || preserve_uid)
+ fprintf(FERROR,"chown %s : %s\n",
+ fname,strerror(errno));
+ return updated;
+ }
+ updated = 1;
}
if (verbose > 1 && report) {
- if (updated)
- fprintf(FINFO,"%s\n",fname);
- else
- fprintf(FINFO,"%s is uptodate\n",fname);
+ if (updated)
+ fprintf(FINFO,"%s\n",fname);
+ else
+ fprintf(FINFO,"%s is uptodate\n",fname);
}
return updated;
}
}
}
}
- do_unlink(fname);
+ delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
fprintf(FERROR,"link %s -> %s : %s\n",
fname,file->link,strerror(errno));
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->rdev) {
- do_unlink(fname);
+ delete_file(fname);
if (verbose > 2)
fprintf(FERROR,"mknod(%s,0%o,0x%x)\n",
fname,(int)file->mode,(int)file->rdev);
}
if (!S_ISREG(st.st_mode)) {
- /* its not a regular file on the receiving end, but it is on the
- sending end. If its a directory then skip it (too dangerous to
- do a recursive deletion??) otherwise try to unlink it */
- if (S_ISDIR(st.st_mode)) {
- fprintf(FERROR,"ERROR: %s is a directory\n",fname);
- return;
- }
- if (do_unlink(fname) != 0) {
- fprintf(FERROR,"%s : not a regular file (generator)\n",fname);
+ if (delete_file(fname) != 0) {
return;
}
-off_t send_files(struct file_list *flist,int f_out,int f_in)
+void send_files(struct file_list *flist,int f_out,int f_in)
{
int fd;
struct sum_struct *s;
struct map_struct *buf;
struct stat st;
char fname[MAXPATHLEN];
- off_t total=0;
int i;
struct file_struct *file;
int phase = 0;
+ int offset=0;
if (verbose > 2)
fprintf(FERROR,"send_files starting\n");
if (strlen(fname) == MAXPATHLEN-1) {
fprintf(FERROR, "send_files failed on long-named directory %s\n",
fname);
- return -1;
+ return;
}
strcat(fname,"/");
+ offset = strlen(file->basedir)+1;
}
strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
s = receive_sums(f_in);
if (!s) {
fprintf(FERROR,"receive_sums failed\n");
- return -1;
+ return;
}
fd = open(fname,O_RDONLY);
fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
free_sums(s);
close(fd);
- return -1;
+ return;
}
if (st.st_size > 0) {
fprintf(FERROR,"calling match_sums %s\n",fname);
if (!am_server && verbose)
- printf("%s\n",fname);
+ printf("%s\n",fname+offset);
match_sums(f_out,s,buf,st.st_size);
write_flush(f_out);
if (verbose > 2)
fprintf(FERROR,"sender finished %s\n",fname);
-
- total += st.st_size;
}
if (verbose > 2)
write_int(f_out,-1);
write_flush(f_out);
-
- return total;
}