Mention my recent changes.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index ce8e901..1141402 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -43,7 +43,7 @@ void free_sums(struct sum_struct *s)
 
 
 /*
- * delete a file or directory. If force_delet is set then delete 
+ * delete a file or directory. If force_delete is set then delete 
  * recursively 
  */
 int delete_file(char *fname)
@@ -62,28 +62,29 @@ int delete_file(char *fname)
        ret = do_stat(fname, &st);
 #endif
        if (ret) {
-               rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
                return -1;
        }
 
        if (!S_ISDIR(st.st_mode)) {
                if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
-               rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+               rprintf(FERROR, "delete_file: unlink %s failed: %s\n",
+                       full_fname(fname), strerror(errno));
                return -1;
        }
 
        if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
        if (!force_delete || !recurse || 
            (errno != ENOTEMPTY && errno != EEXIST)) {
-               rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+               rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
+                       full_fname(fname), strerror(errno));
                return -1;
        }
 
        /* now we do a recsursive delete on the directory ... */
        d = opendir(fname);
        if (!d) {
-               rprintf(FERROR,"opendir(%s): %s\n",
-                       fname,strerror(errno));
+               rprintf(FERROR, "delete_file: opendir %s failed: %s\n",
+                       full_fname(fname), strerror(errno));
                return -1;
        }
 
@@ -92,7 +93,7 @@ int delete_file(char *fname)
                if (strcmp(dname,".")==0 ||
                    strcmp(dname,"..")==0)
                        continue;
-               slprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+               snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
                if (verbose > 0)
                        rprintf(FINFO,"deleting %s\n", buf);
                if (delete_file(buf) != 0) {
@@ -104,7 +105,8 @@ int delete_file(char *fname)
        closedir(d);
        
        if (do_rmdir(fname) != 0) {
-               rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+               rprintf(FERROR, "delete_file: rmdir %s failed: %s\n",
+                       full_fname(fname), strerror(errno));
                return -1;
        }
 
@@ -156,20 +158,21 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
        if (!st) {
                if (link_stat(fname,&st2) != 0) {
-                       rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
+                       rprintf(FERROR, "stat %s failed: %s\n",
+                               full_fname(fname), strerror(errno));
                        return 0;
                }
                st = &st2;
        }
 
        if (preserve_times && !S_ISLNK(st->st_mode) &&
-           st->st_mtime != file->modtime) {
+           cmp_modtime(st->st_mtime, file->modtime) != 0) {
                /* don't complain about not setting times on directories
                   because some filesystems can't do it */
                if (set_modtime(fname,file->modtime) != 0 &&
                    !S_ISDIR(st->st_mode)) {
-                       rprintf(FERROR,"failed to set times on %s : %s\n",
-                               fname,strerror(errno));
+                       rprintf(FERROR, "failed to set times on %s: %s\n",
+                               full_fname(fname), strerror(errno));
                        return 0;
                } else {
                        updated = 1;
@@ -190,7 +193,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                              change_gid?file->gid:st->st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                             unless have the privilege */
-                       rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
+                       rprintf(FERROR, "chown %s failed: %s\n",
+                               full_fname(fname), strerror(errno));
                        return 0;
                }
                /* a lchown had been done - we have to re-stat if the
@@ -204,11 +208,11 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
 #ifdef HAVE_CHMOD
        if (!S_ISLNK(st->st_mode)) {
-               if (st->st_mode != file->mode) {
+               if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
                        updated = 1;
-                       if (do_chmod(fname,file->mode) != 0) {
-                               rprintf(FERROR,"failed to set permissions on %s : %s\n",
-                                       fname,strerror(errno));
+                       if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) {
+                               rprintf(FERROR, "failed to set permissions on %s: %s\n",
+                                       full_fname(fname), strerror(errno));
                                return 0;
                        }
                }
@@ -244,14 +248,15 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
                        /* rename failed on cross-filesystem link.  
                           Copy the file instead. */
                        if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
-                               rprintf(FERROR,"copy %s -> %s : %s\n",
-                                       fnametmp,fname,strerror(errno));
+                               rprintf(FERROR, "copy %s -> \"%s\": %s\n",
+                                       full_fname(fnametmp), fname,
+                                       strerror(errno));
                        } else {
                                set_perms(fname,file,NULL,0);
                        }
                } else {
-                       rprintf(FERROR,"rename %s -> %s : %s\n",
-                               fnametmp,fname,strerror(errno));
+                       rprintf(FERROR,"rename %s -> \"%s\": %s\n",
+                               full_fname(fnametmp), fname, strerror(errno));
                }
                do_unlink(fnametmp);
        } else {