Make get_xattr_names() even safer at fetching the list of attr names.

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index ba47048..649f2ef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -82,6 +82,7 @@ extern struct filter_list_struct server_filter_list;
 extern iconv_t ic_send;
 #endif
 
+uid_t our_uid;
 int local_server = 0;
 int daemon_over_rsh = 0;
 mode_t orig_umask = 0;
@@ -278,7 +279,7 @@ static void output_summary(void)
                rprintf(FINFO, "total size is %s  speedup is %.2f%s\n",
                        human_num(stats.total_size),
                        (double)stats.total_size / (total_written+total_read),
-                       dry_run ? " (DRY RUN)" : "");
+                       write_batch < 0 ? " (BATCH ONLY)" : dry_run ? " (DRY RUN)" : "");
        }
 
        fflush(stdout);
@@ -640,7 +641,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
  * dry-run mode and the destination dir does not yet exist, we'll try to
  * tweak any dest-relative paths to make them work for a dry-run (the
  * destination dir must be in curr_dir[] when this function is called).
- * We also report if any arg that is non-existent or not a directory. */
+ * We also warn about any arg that is non-existent or not a directory. */
 static void check_alt_basis_dirs(void)
 {
        STRUCT_STAT st;
@@ -1427,7 +1428,8 @@ int main(int argc,char *argv[])
 #endif
 
        starttime = time(NULL);
-       am_root = (MY_UID() == 0);
+       our_uid = MY_UID();
+       am_root = our_uid == 0;
 
        memset(&stats, 0, sizeof(stats));