* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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"
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 */
{
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
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 {