Added "am_generator".

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 9bd7e42..3c1115f 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -93,7 +93,7 @@ int delete_file(char *fname)
                if (strcmp(dname,".") == 0
                    || strcmp(dname,"..") == 0)
                        continue;
-               snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+               pathjoin(buf, sizeof buf, fname, dname);
                if (verbose > 0)
                        rprintf(FINFO,"deleting %s\n", buf);
                if (delete_file(buf) != 0) {
@@ -160,7 +160,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 failed: %s\n",
+                       rprintf(FERROR, "%s %s failed: %s\n",
+                               change_uid ? "chown" : "chgrp",
                                full_fname(fname), strerror(errno));
                        return 0;
                }