Attachment #70804 for bug #100981




#define SEND_XATTR(file, f)
#define RECEIVE_XATTR(file, f)
#define SORT_FILE_XATTR_INDEX_LISTS()
#define SET_XATTR(fname, file)                 1 /* checked return value */
#define NEXT_XATTR_UID()
#define XATTR_UID_MAP(uid)
#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest)
#define CLEANUP_KEEP_BACKUP_XATTR()
#define DUP_XATTR(src, orig)           1 /* checked return value */
#endif /* SUPPORT_XATTRS */

#include "proto.h"

Lines 458-464 Link Here

(-)rsync-2.6.6/xattr.c (-2 / +2 lines)
458	static int set_keep_backup_xal(void)	458	static int set_keep_backup_xal(void)
459	{	459	{
460	if (!preserve_xattrs)	460	if (!preserve_xattrs)
461	return 0;	461	return 1;
462	return rsync_xal_set(backup_dest_fname, &backup_xal);	462	return rsync_xal_set(backup_dest_fname, &backup_xal);
463	}	463	}
464		464
Lines 532-538 Link Here
532		532
533	updated = 0;	533	updated = 0;
534	if (dry_run \|\| !preserve_xattrs)	534	if (dry_run \|\| !preserve_xattrs)
535	return 0;	535	return 1;
536	if (file == backup_orig_file) {	536	if (file == backup_orig_file) {
537	if (!strcmp(fname, backup_dest_fname))	537	if (!strcmp(fname, backup_dest_fname))
538	return set_keep_backup_xal();	538	return set_keep_backup_xal();

Return to bug 100981

Lines 700-711 Link Here

(-)rsync-2.6.6/rsync.h (-2 / +2 lines)
700	#define SEND_XATTR(file, f)	700	#define SEND_XATTR(file, f)
701	#define RECEIVE_XATTR(file, f)	701	#define RECEIVE_XATTR(file, f)
702	#define SORT_FILE_XATTR_INDEX_LISTS()	702	#define SORT_FILE_XATTR_INDEX_LISTS()
703	#define SET_XATTR(fname, file) 0 /* checked return value */	703	#define SET_XATTR(fname, file) 1 /* checked return value */
704	#define NEXT_XATTR_UID()	704	#define NEXT_XATTR_UID()
705	#define XATTR_UID_MAP(uid)	705	#define XATTR_UID_MAP(uid)
706	#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest)	706	#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest)
707	#define CLEANUP_KEEP_BACKUP_XATTR()	707	#define CLEANUP_KEEP_BACKUP_XATTR()
708	#define DUP_XATTR(src, orig) 0 /* checked return value */	708	#define DUP_XATTR(src, orig) 1 /* checked return value */
709	#endif /* SUPPORT_XATTRS */	709	#endif /* SUPPORT_XATTRS */
710		710
711	#include "proto.h"	711	#include "proto.h"