Tweaked the output a little.

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index eb0c49a..b1859fc 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -1,15 +1,29 @@
-/* -*- c-file-style: "linux" -*-
-
-   Weiss 1/1999
-   Batch utilities for rsync.
-
-*/
+/*
+ * Support for the batch-file options.
+ *
+ * Copyright (C) 1999 Weiss
+ * Copyright (C) 2004 Chris Shoemaker
+ * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #include "rsync.h"
 #include "zlib/zlib.h"
 #include <time.h>
 
-extern int am_sender;
 extern int eol_nulls;
 extern int recurse;
 extern int xfer_dirs;
@@ -22,16 +36,19 @@ extern int always_checksum;
 extern int do_compression;
 extern int def_compress_level;
 extern int protocol_version;
+extern int flist_extra_cnt;
 extern char *batch_name;
 
 extern struct filter_list_struct filter_list;
 
+static int tweaked_preserve_uid;
+static int tweaked_preserve_gid;
 static int tweaked_compress_level;
 
 static int *flag_ptr[] = {
        &recurse,               /* 0 */
-       &preserve_uid,          /* 1 */
-       &preserve_gid,          /* 2 */
+       &tweaked_preserve_uid,  /* 1 */
+       &tweaked_preserve_gid,  /* 2 */
        &preserve_links,        /* 3 */
        &preserve_devices,      /* 4 */
        &preserve_hard_links,   /* 5 */
@@ -58,6 +75,8 @@ void write_stream_flags(int fd)
 {
        int i, flags;
 
+       tweaked_preserve_uid = preserve_uid != 0;
+       tweaked_preserve_gid = preserve_gid != 0;
 #if Z_DEFAULT_COMPRESSION == -1
        tweaked_compress_level = do_compression ? def_compress_level + 2 : 0;
 #else
@@ -99,6 +118,16 @@ void read_stream_flags(int fd)
                        xfer_dirs = 0;
        }
 
+       if (tweaked_preserve_uid) {
+               if (!preserve_uid)
+                       preserve_uid = ++flist_extra_cnt;
+       } else
+               preserve_uid = 0;
+       if (tweaked_preserve_gid) {
+               if (!preserve_gid)
+                       preserve_gid = ++flist_extra_cnt;
+       } else
+               preserve_gid = 0;
        if (tweaked_compress_level == 0 || tweaked_compress_level == 2)
                do_compression = 0;
        else {
@@ -165,7 +194,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
                     S_IRUSR | S_IWUSR | S_IEXEC);
        if (fd < 0) {
                rsyserr(FERROR, errno, "Batch file %s open error",
-                       safe_fname(filename));
+                       filename);
                exit_cleanup(1);
        }
 
@@ -211,42 +240,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt)
                write_filter_rules(fd);
        if (write(fd, "\n", 1) != 1 || close(fd) < 0) {
                rsyserr(FERROR, errno, "Batch file %s write error",
-                       safe_fname(filename));
+                       filename);
                exit_cleanup(1);
        }
 }
-
-void show_flist(int index, struct file_struct **fptr)
-{
-       /*  for debugging    show_flist(flist->count, flist->files * */
-
-       int i;
-       for (i = 0; i < index; i++) {
-               rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
-               rprintf(FINFO, "flist->modtime=%#lx\n",
-                       (long unsigned) fptr[i]->modtime);
-               rprintf(FINFO, "flist->length=%.0f\n",
-                       (double) fptr[i]->length);
-               rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
-               rprintf(FINFO, "flist->basename=%s\n",
-                       safe_fname(fptr[i]->basename));
-               if (fptr[i]->dirname) {
-                       rprintf(FINFO, "flist->dirname=%s\n",
-                               safe_fname(fptr[i]->dirname));
-               }
-               if (am_sender && fptr[i]->dir.root) {
-                       rprintf(FINFO, "flist->dir.root=%s\n",
-                               safe_fname(fptr[i]->dir.root));
-               }
-       }
-}
-
-/* for debugging */
-void show_argvs(int argc, char *argv[])
-{
-       int i;
-
-       rprintf(FINFO, "BATCH.C:show_argvs,argc=%d\n", argc);
-       for (i = 0; i < argc; i++)
-               rprintf(FINFO, "i=%d,argv[i]=%s\n", i, safe_fname(argv[i]));
-}