Tweaking the license text a bit more.

[rsync/rsync.git] / batch.c

diff --git a/batch.c b/batch.c
index b1859fc..5b88b80 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1999 Weiss
  * Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * 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.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -36,19 +35,16 @@ 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 */
-       &tweaked_preserve_uid,  /* 1 */
-       &tweaked_preserve_gid,  /* 2 */
+       &preserve_uid,          /* 1 */
+       &preserve_gid,          /* 2 */
        &preserve_links,        /* 3 */
        &preserve_devices,      /* 4 */
        &preserve_hard_links,   /* 5 */
@@ -75,8 +71,6 @@ 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
@@ -118,16 +112,6 @@ 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 {