View | Details | Raw Unified | Return to bug 33751 | Differences between
and this patch

Collapse All | Expand All

(-)rsync-3.0.7.orig/generator.c (+21 lines)
 Lines 1434-1439   static void recv_generator(char *fname, Link Here 
1434
				dry_missing_dir = file;
1434
				dry_missing_dir = file;
1435
			file->flags |= FLAG_MISSING_DIR;
1435
			file->flags |= FLAG_MISSING_DIR;
1436
		}
1436
		}
1437
1438
		if (update_only > 0 && statret == 0
1439
		    && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
1440
			if (verbose > 1)
1441
				rprintf(FINFO, "%s is newer\n", fname);
1442
#ifdef SUPPORT_HARD_LINKS
1443
			if (F_IS_HLINKED(file))
1444
				handle_skipped_hlink(file, itemizing, code, f_out);
1445
#endif
1446
			file->flags |= FLAG_DONT_TOUCH;
1447
			goto cleanup;
1448
		}
1449
1437
		real_ret = statret;
1450
		real_ret = statret;
1438
		real_sx = sx;
1451
		real_sx = sx;
1439
		if (file->flags & FLAG_DIR_CREATED)
1452
		if (file->flags & FLAG_DIR_CREATED)
 Lines 2049-2054   static void touch_up_dirs(struct file_li Link Here 
2049
		if (!S_ISDIR(file->mode)
2062
		if (!S_ISDIR(file->mode)
2050
		 || (!implied_dirs && file->flags & FLAG_IMPLIED_DIR))
2063
		 || (!implied_dirs && file->flags & FLAG_IMPLIED_DIR))
2051
			continue;
2064
			continue;
2065
		if (S_ISDIR(file->mode) && file->flags & FLAG_DONT_TOUCH) {
2066
			fname = f_name(file, NULL);
2067
			if (verbose > 3) {
2068
				rprintf(FINFO, "skipping touch_up_dirs: %s (%d)\n",
2069
					NS(fname), i);
2070
				continue;
2071
			}
2072
		}
2052
		if (verbose > 3) {
2073
		if (verbose > 3) {
2053
			fname = f_name(file, NULL);
2074
			fname = f_name(file, NULL);
2054
			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
2075
			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
(-)rsync-3.0.7.orig/rsync.h (+1 lines)
 Lines 80-85    Link Here 
80
#define FLAG_LENGTH64 (1<<9)	/* sender/receiver/generator */
80
#define FLAG_LENGTH64 (1<<9)	/* sender/receiver/generator */
81
#define FLAG_SKIP_GROUP (1<<10)	/* receiver/generator */
81
#define FLAG_SKIP_GROUP (1<<10)	/* receiver/generator */
82
#define FLAG_TIME_FAILED (1<<11)/* generator */
82
#define FLAG_TIME_FAILED (1<<11)/* generator */
83
#define FLAG_DONT_TOUCH (1<<12)/* generator */
83
84
84
/* These flags are passed to functions but not stored. */
85
/* These flags are passed to functions but not stored. */
85
86

Return to bug 33751