-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
+ patch -p1 <patches/atimes.diff
./prepare-source
./configure (optional if already run)
make
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-@@ -182,7 +184,7 @@ static int delete_item(char *fname, int
+@@ -210,7 +212,7 @@ static enum delret delete_dir_contents(c
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
-- if (fp->flags & FLAG_MOUNT_POINT)
-+ if (FFLAGS(fp) & FLAG_MOUNT_POINT)
- continue;
-
- strlcpy(p, fp->basename, remainder);
-@@ -260,7 +262,7 @@ static void delete_in_dir(struct file_li
+- if (fp->flags & FLAG_MOUNT_POINT) {
++ if (FFLAGS(fp) & FLAG_MOUNT_POINT) {
+ if (verbose > 1) {
+ rprintf(FINFO,
+ "mount point, %s, pins parent directory\n",
+@@ -285,7 +287,7 @@ static void delete_in_dir(struct file_li
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
if (one_file_system) {
filesystem_dev = stp->st_dev;
else if (filesystem_dev != stp->st_dev)
return;
-@@ -272,7 +274,7 @@ static void delete_in_dir(struct file_li
- * from the filesystem. */
- for (i = dirlist->count; i--; ) {
+@@ -299,7 +301,7 @@ static void delete_in_dir(struct file_li
struct file_struct *fp = dirlist->files[i];
-- if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
-+ if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT)
+ if (!fp->basename)
continue;
- if (flist_find(flist, fp) < 0) {
- f_name(fp, delbuf);
-@@ -298,11 +300,11 @@ static void do_delete_pass(struct file_l
+- if (fp->flags & FLAG_MOUNT_POINT) {
++ if (FLAGS(fp) & FLAG_MOUNT_POINT) {
+ if (verbose > 1)
+ rprintf(FINFO, "mount point %s not deleted\n",
+ f_name(fp, NULL));
+@@ -329,11 +331,11 @@ static void do_delete_pass(struct file_l
for (j = 0; j < flist->count; j++) {
struct file_struct *file = flist->files[j];
rprintf(FINFO, "deleting in %s\n", fbuf);
if (link_stat(fbuf, &st, keep_dirlinks) < 0
-@@ -346,6 +348,9 @@ void itemize(struct file_struct *file, i
- && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+@@ -378,6 +380,9 @@ void itemize(struct file_struct *file, i
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && cmp_time(file->atime, st->st_atime) != 0)
if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
if (preserve_uid && am_root && file->uid != st->st_uid)
-@@ -549,7 +554,7 @@ static int find_fuzzy(struct file_struct
+@@ -581,7 +586,7 @@ static int find_fuzzy(struct file_struct
uint32 dist;
if (!S_ISREG(fp->mode) || !fp->length
continue;
name = fp->basename;
-@@ -658,6 +663,8 @@ static int try_dests_reg(struct file_str
- itemizing && verbose > 1,
- code) < 0)
+@@ -689,6 +694,8 @@ static int try_dests_reg(struct file_str
+ if (hard_link_one(file, ndx, fname, 0, stp,
+ cmpbuf, 1, i, code) < 0)
goto try_a_copy;
+ if (preserve_atimes)
+ set_file_attrs(fname, file, stp, 0);
if (preserve_hard_links && file->link_u.links) {
if (dry_run)
file->link_u.links->link_dest_used = j + 1;
-@@ -930,7 +937,7 @@ static void recv_generator(char *fname,
+@@ -1040,7 +1047,7 @@ static void recv_generator(char *fname,
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
if (ndx+1 < the_file_list->count
&& the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
rprintf(FERROR,
-@@ -944,7 +951,7 @@ static void recv_generator(char *fname,
- && verbose && code != FNONE && f_out != -1)
- rprintf(code, "%s/\n", fname);
+@@ -1056,7 +1063,7 @@ static void recv_generator(char *fname,
+ if (real_ret != 0 && one_file_system)
+ real_st.st_dev = filesystem_dev;
if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_DEL_HERE))
+ && (FFLAGS(file) & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file, &st);
+ delete_in_dir(the_file_list, fname, file, &real_st);
return;
}
-@@ -1249,7 +1256,7 @@ static void recv_generator(char *fname,
+@@ -1360,7 +1367,7 @@ static void recv_generator(char *fname,
if (fuzzy_dirlist) {
int j = flist_find(fuzzy_dirlist, file);
if (j >= 0) /* don't use changing file as future fuzzy basis */
}
/* open the file */
-@@ -1514,7 +1521,7 @@ void generate_files(int f_out, struct fi
+@@ -1625,7 +1632,7 @@ void generate_files(int f_out, struct fi
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -309,8 +310,9 @@ void usage(enum logcode F)
+@@ -311,8 +312,9 @@ void usage(enum logcode F)
rprintf(F," --devices preserve device files (super-user only)\n");
rprintf(F," --specials preserve special files\n");
rprintf(F," -D same as --devices --specials\n");
rprintf(F," --super receiver attempts super-user activities\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -424,6 +426,9 @@ static struct poptOption long_options[]
+@@ -428,6 +430,9 @@ static struct poptOption long_options[]
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
-@@ -1534,6 +1539,8 @@ void server_options(char **args,int *arg
+@@ -1538,6 +1543,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -530,9 +532,12 @@ struct file_struct {
+@@ -531,9 +533,12 @@ struct file_struct {
uid_t uid;
gid_t gid;
mode_t mode;
* by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
--- old/rsync.yo
+++ new/rsync.yo
-@@ -327,8 +327,9 @@ to the detailed description below for a
+@@ -328,8 +328,9 @@ to the detailed description below for a
--devices preserve device files (super-user only)
--specials preserve special files
-D same as --devices --specials
--super receiver attempts super-user activities
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-@@ -861,6 +862,12 @@ it is preserving modification times (see
+@@ -869,6 +870,12 @@ it is preserving modification times (see
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
dit(bf(--super)) This tells the receiving side to attempt super-user
activities even if the receiving rsync wasn't run by the super-user. These
activities include: preserving users via the bf(--owner) option, preserving
-@@ -1382,7 +1389,7 @@ with older versions of rsync, but that a
+@@ -1395,7 +1402,7 @@ with older versions of rsync, but that a
verbose messages).
The "%i" escape has a cryptic output that is 9 letters long. The general
type of update being done, bf(X) is replaced by the file-type, and the
other letters represent attributes that may be output if they are being
modified.
-@@ -1422,7 +1429,7 @@ quote(itemization(
+@@ -1435,7 +1442,7 @@ quote(itemization(
by the file transfer.
it() A bf(t) means the modification time is different and is being updated
to the sender's value (requires bf(--times)). An alternate value of bf(T)
anytime a symlink is transferred, or when a file or device is transferred
without bf(--times).
it() A bf(p) means the permissions are different and are being updated to
-@@ -1431,7 +1438,10 @@ quote(itemization(
+@@ -1444,7 +1451,10 @@ quote(itemization(
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).
- fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
- "Trivial file listing program for portably checking rsync\n");
- return 1;
+- }
+ poptContext pc;
+ const char **extra_args;
+ int opt;
-+
+
+- for (argv++; *argv; argv++) {
+- list_file(*argv);
+ pc = poptGetContext(PROGRAM, argc, (const char **)argv,
+ long_options, 0);
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ }
}
-- for (argv++; *argv; argv++) {
-- list_file(*argv);
-- }
+ extra_args = poptGetArgs(pc);
+ if (*extra_args == NULL)
+ tls_usage(1);
+ for (; *extra_args; extra_args++)
+ list_file(*extra_args);
+ poptFreeContext(pc);
-
++
return 0;
}
--- old/util.c
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff