| 1 | To use this patch, run these commands for a successful build: |
| 2 | |
| 3 | patch -p1 <patches/atimes.diff |
| 4 | ./prepare-source |
| 5 | ./configure (optional if already run) |
| 6 | make |
| 7 | |
| 8 | |
| 9 | --- old/compat.c |
| 10 | +++ new/compat.c |
| 11 | @@ -56,6 +56,8 @@ void setup_protocol(int f_out,int f_in) |
| 12 | preserve_uid = ++file_extra_cnt; |
| 13 | if (preserve_gid) |
| 14 | preserve_gid = ++file_extra_cnt; |
| 15 | + if (preserve_atimes) |
| 16 | + preserve_atimes = ++file_extra_cnt; |
| 17 | |
| 18 | if (remote_protocol == 0) { |
| 19 | if (!read_batch) |
| 20 | --- old/flist.c |
| 21 | +++ new/flist.c |
| 22 | @@ -48,6 +48,7 @@ extern int preserve_devices; |
| 23 | extern int preserve_specials; |
| 24 | extern int preserve_uid; |
| 25 | extern int preserve_gid; |
| 26 | +extern int preserve_atimes; |
| 27 | extern int relative_paths; |
| 28 | extern int implied_dirs; |
| 29 | extern int file_extra_cnt; |
| 30 | @@ -143,6 +144,7 @@ void show_flist_stats(void) |
| 31 | static void list_file_entry(struct file_struct *f) |
| 32 | { |
| 33 | char permbuf[PERMSTRING_SIZE]; |
| 34 | + time_t atime = preserve_atimes ? F_ATIME(f) : 0; |
| 35 | double len; |
| 36 | |
| 37 | if (!F_IS_ACTIVE(f)) { |
| 38 | @@ -155,14 +157,16 @@ static void list_file_entry(struct file_ |
| 39 | |
| 40 | #ifdef SUPPORT_LINKS |
| 41 | if (preserve_links && S_ISLNK(f->mode)) { |
| 42 | - rprintf(FINFO, "%s %11.0f %s %s -> %s\n", |
| 43 | + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n", |
| 44 | permbuf, len, timestring(f->modtime), |
| 45 | + preserve_atimes ? timestring(atime) : "", |
| 46 | f_name(f, NULL), F_SYMLINK(f)); |
| 47 | } else |
| 48 | #endif |
| 49 | { |
| 50 | - rprintf(FINFO, "%s %11.0f %s %s\n", |
| 51 | + rprintf(FINFO, "%s %11.0f %s %s %s\n", |
| 52 | permbuf, len, timestring(f->modtime), |
| 53 | + preserve_atimes ? timestring(atime) : "", |
| 54 | f_name(f, NULL)); |
| 55 | } |
| 56 | } |
| 57 | @@ -346,6 +350,7 @@ int push_flist_dir(const char *dir, int |
| 58 | static void send_file_entry(int f, struct file_struct *file, int ndx) |
| 59 | { |
| 60 | static time_t modtime; |
| 61 | + static time_t atime; |
| 62 | static mode_t mode; |
| 63 | static int64 dev; |
| 64 | static dev_t rdev; |
| 65 | @@ -413,6 +418,13 @@ static void send_file_entry(int f, struc |
| 66 | flags |= XMIT_SAME_TIME; |
| 67 | else |
| 68 | modtime = file->modtime; |
| 69 | + if (preserve_atimes && !S_ISDIR(mode)) { |
| 70 | + time_t file_atime = F_ATIME(file); |
| 71 | + if (file_atime == atime) |
| 72 | + flags |= XMIT_SAME_ATIME; |
| 73 | + else |
| 74 | + atime = file_atime; |
| 75 | + } |
| 76 | |
| 77 | #ifdef SUPPORT_HARD_LINKS |
| 78 | if (tmp_dev != 0) { |
| 79 | @@ -480,6 +492,8 @@ static void send_file_entry(int f, struc |
| 80 | write_int(f, modtime); |
| 81 | if (!(flags & XMIT_SAME_MODE)) |
| 82 | write_int(f, to_wire_mode(mode)); |
| 83 | + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) |
| 84 | + write_int(f, atime); |
| 85 | if (preserve_uid && !(flags & XMIT_SAME_UID)) { |
| 86 | write_int(f, uid); |
| 87 | if (flags & XMIT_USER_NAME_FOLLOWS) { |
| 88 | @@ -553,7 +567,7 @@ static void send_file_entry(int f, struc |
| 89 | static struct file_struct *recv_file_entry(struct file_list *flist, |
| 90 | int flags, int f) |
| 91 | { |
| 92 | - static time_t modtime; |
| 93 | + static time_t modtime, atime; |
| 94 | static mode_t mode; |
| 95 | static int64 dev; |
| 96 | static dev_t rdev; |
| 97 | @@ -650,6 +664,8 @@ static struct file_struct *recv_file_ent |
| 98 | modtime = (time_t)read_int(f); |
| 99 | if (!(flags & XMIT_SAME_MODE)) |
| 100 | mode = from_wire_mode(read_int(f)); |
| 101 | + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) |
| 102 | + atime = (time_t)read_int(f); |
| 103 | |
| 104 | if (chmod_modes && !S_ISLNK(mode)) |
| 105 | mode = tweak_mode(mode, chmod_modes); |
| 106 | @@ -758,6 +774,8 @@ static struct file_struct *recv_file_ent |
| 107 | F_OWNER(file) = uid; |
| 108 | if (preserve_gid) |
| 109 | F_GROUP(file) = gid; |
| 110 | + if (preserve_atimes) |
| 111 | + F_ATIME(file) = atime; |
| 112 | |
| 113 | if (basename != thisname) { |
| 114 | file->dirname = lastdir; |
| 115 | @@ -1055,6 +1073,8 @@ struct file_struct *make_file(const char |
| 116 | F_OWNER(file) = st.st_uid; |
| 117 | if (preserve_gid) |
| 118 | F_GROUP(file) = st.st_gid; |
| 119 | + if (preserve_atimes) |
| 120 | + F_ATIME(file) = st.st_atime; |
| 121 | |
| 122 | if (basename != thisname) |
| 123 | file->dirname = lastdir; |
| 124 | --- old/generator.c |
| 125 | +++ new/generator.c |
| 126 | @@ -44,6 +44,7 @@ extern int preserve_perms; |
| 127 | extern int preserve_uid; |
| 128 | extern int preserve_gid; |
| 129 | extern int preserve_times; |
| 130 | +extern int preserve_atimes; |
| 131 | extern int omit_dir_times; |
| 132 | extern int delete_mode; |
| 133 | extern int delete_before; |
| 134 | @@ -539,6 +540,9 @@ void itemize(struct file_struct *file, i |
| 135 | && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) |
| 136 | || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) |
| 137 | iflags |= ITEM_REPORT_TIME; |
| 138 | + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode) |
| 139 | + && cmp_time(F_ATIME(file), st->st_atime) != 0) |
| 140 | + iflags |= ITEM_REPORT_ATIME; |
| 141 | if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS)) |
| 142 | iflags |= ITEM_REPORT_PERMS; |
| 143 | if (preserve_uid && am_root && F_UID(file) != st->st_uid) |
| 144 | @@ -849,6 +853,8 @@ static int try_dests_reg(struct file_str |
| 145 | if (link_dest) { |
| 146 | if (!hard_link_one(file, fname, cmpbuf, 1)) |
| 147 | goto try_a_copy; |
| 148 | + if (preserve_atimes) |
| 149 | + set_file_attrs(fname, file, stp, 0); |
| 150 | if (preserve_hard_links && F_IS_HLINKED(file)) |
| 151 | finish_hard_link(file, fname, stp, itemizing, code, j); |
| 152 | if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { |
| 153 | --- old/log.c |
| 154 | +++ new/log.c |
| 155 | @@ -37,6 +37,7 @@ extern int msg_fd_out; |
| 156 | extern int allow_8bit_chars; |
| 157 | extern int protocol_version; |
| 158 | extern int preserve_times; |
| 159 | +extern int preserve_atimes; |
| 160 | extern int preserve_uid; |
| 161 | extern int preserve_gid; |
| 162 | extern int stdout_format_has_i; |
| 163 | @@ -625,7 +626,8 @@ static void log_formatted(enum logcode c |
| 164 | c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; |
| 165 | c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; |
| 166 | c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; |
| 167 | - c[8] = '.'; |
| 168 | + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' |
| 169 | + : S_ISLNK(file->mode) ? 'U' : 'u'; |
| 170 | c[9] = '\0'; |
| 171 | |
| 172 | if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { |
| 173 | --- old/options.c |
| 174 | +++ new/options.c |
| 175 | @@ -55,6 +55,7 @@ int preserve_uid = 0; |
| 176 | int preserve_gid = 0; |
| 177 | int preserve_times = 0; |
| 178 | int omit_dir_times = 0; |
| 179 | +int preserve_atimes = 0; |
| 180 | int update_only = 0; |
| 181 | int cvs_exclude = 0; |
| 182 | int dry_run = 0; |
| 183 | @@ -307,8 +308,9 @@ void usage(enum logcode F) |
| 184 | rprintf(F," --devices preserve device files (super-user only)\n"); |
| 185 | rprintf(F," --specials preserve special files\n"); |
| 186 | rprintf(F," -D same as --devices --specials\n"); |
| 187 | - rprintf(F," -t, --times preserve times\n"); |
| 188 | - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); |
| 189 | + rprintf(F," -t, --times preserve modify times\n"); |
| 190 | + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n"); |
| 191 | + rprintf(F," -U, --atimes preserve access (use) times\n"); |
| 192 | rprintf(F," --super receiver attempts super-user activities\n"); |
| 193 | rprintf(F," -S, --sparse handle sparse files efficiently\n"); |
| 194 | rprintf(F," -n, --dry-run show what would have been transferred\n"); |
| 195 | @@ -425,6 +427,9 @@ static struct poptOption long_options[] |
| 196 | {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, |
| 197 | {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, |
| 198 | {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, |
| 199 | + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 }, |
| 200 | + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 }, |
| 201 | + {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 }, |
| 202 | {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 }, |
| 203 | {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, |
| 204 | {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 }, |
| 205 | @@ -1552,6 +1557,8 @@ void server_options(char **args,int *arg |
| 206 | argstr[x++] = 'D'; |
| 207 | if (preserve_times) |
| 208 | argstr[x++] = 't'; |
| 209 | + if (preserve_atimes) |
| 210 | + argstr[x++] = 'U'; |
| 211 | if (preserve_perms) |
| 212 | argstr[x++] = 'p'; |
| 213 | else if (preserve_executability && am_sender) |
| 214 | --- old/rsync.c |
| 215 | +++ new/rsync.c |
| 216 | @@ -34,6 +34,7 @@ extern int verbose; |
| 217 | extern int dry_run; |
| 218 | extern int preserve_perms; |
| 219 | extern int preserve_executability; |
| 220 | +extern int preserve_atimes; |
| 221 | extern int preserve_times; |
| 222 | extern int omit_dir_times; |
| 223 | extern int am_root; |
| 224 | @@ -232,6 +233,7 @@ int set_file_attrs(char *fname, struct f |
| 225 | int updated = 0; |
| 226 | STRUCT_STAT st2; |
| 227 | int change_uid, change_gid; |
| 228 | + time_t atime, mtime; |
| 229 | mode_t new_mode = file->mode; |
| 230 | |
| 231 | if (!st) { |
| 232 | @@ -251,18 +253,36 @@ int set_file_attrs(char *fname, struct f |
| 233 | } |
| 234 | } |
| 235 | |
| 236 | + /* This code must be the first update in the function due to |
| 237 | + * how it uses the "updated" variable. */ |
| 238 | if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) |
| 239 | flags |= ATTRS_SKIP_MTIME; |
| 240 | + if (!preserve_atimes || S_ISDIR(st->st_mode)) |
| 241 | + flags |= ATTRS_SKIP_ATIME; |
| 242 | if (!(flags & ATTRS_SKIP_MTIME) |
| 243 | && cmp_time(st->st_mtime, file->modtime) != 0) { |
| 244 | - int ret = set_modtime(fname, file->modtime, st->st_mode); |
| 245 | + mtime = file->modtime; |
| 246 | + updated = 1; |
| 247 | + } else |
| 248 | + mtime = st->st_mtime; |
| 249 | + if (!(flags & ATTRS_SKIP_ATIME)) { |
| 250 | + time_t file_atime = F_ATIME(file); |
| 251 | + if (cmp_time(st->st_atime, file_atime) != 0) { |
| 252 | + atime = file_atime; |
| 253 | + updated = 1; |
| 254 | + } else |
| 255 | + atime = st->st_atime; |
| 256 | + } else |
| 257 | + atime = st->st_atime; |
| 258 | + if (updated) { |
| 259 | + int ret = set_times(fname, mtime, atime, st->st_mode); |
| 260 | if (ret < 0) { |
| 261 | rsyserr(FERROR, errno, "failed to set times on %s", |
| 262 | full_fname(fname)); |
| 263 | return 0; |
| 264 | } |
| 265 | - if (ret == 0) /* ret == 1 if symlink could not be set */ |
| 266 | - updated = 1; |
| 267 | + if (ret > 0) /* ret == 1 if symlink could not be set */ |
| 268 | + updated = 0; |
| 269 | } |
| 270 | |
| 271 | change_uid = am_root && preserve_uid && st->st_uid != F_UID(file); |
| 272 | --- old/rsync.h |
| 273 | +++ new/rsync.h |
| 274 | @@ -57,6 +57,7 @@ |
| 275 | #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) |
| 276 | #define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */ |
| 277 | #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */ |
| 278 | +#define XMIT_SAME_ATIME (1<<14) /* protocols >= 30 */ |
| 279 | |
| 280 | /* These flags are used in the live flist data. */ |
| 281 | |
| 282 | @@ -135,6 +136,7 @@ |
| 283 | |
| 284 | #define ATTRS_REPORT (1<<0) |
| 285 | #define ATTRS_SKIP_MTIME (1<<1) |
| 286 | +#define ATTRS_SKIP_ATIME (1<<2) |
| 287 | |
| 288 | #define FULL_FLUSH 1 |
| 289 | #define NORMAL_FLUSH 0 |
| 290 | @@ -565,6 +567,7 @@ struct file_struct { |
| 291 | extern int file_extra_cnt; |
| 292 | extern int preserve_uid; |
| 293 | extern int preserve_gid; |
| 294 | +extern int preserve_atimes; |
| 295 | |
| 296 | #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) |
| 297 | #define EXTRA_LEN (sizeof (union file_extras)) |
| 298 | @@ -597,6 +600,7 @@ extern int preserve_gid; |
| 299 | /* When the associated option is on, all entries will have these present: */ |
| 300 | #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum |
| 301 | #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum |
| 302 | +#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum |
| 303 | |
| 304 | /* These items are per-entry optional and mutally exclusive: */ |
| 305 | #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num |
| 306 | --- old/rsync.yo |
| 307 | +++ new/rsync.yo |
| 308 | @@ -328,8 +328,9 @@ to the detailed description below for a |
| 309 | --devices preserve device files (super-user only) |
| 310 | --specials preserve special files |
| 311 | -D same as --devices --specials |
| 312 | - -t, --times preserve times |
| 313 | - -O, --omit-dir-times omit directories when preserving times |
| 314 | + -t, --times preserve modify times |
| 315 | + -O, --omit-dir-times omit directories when preserving mod-times |
| 316 | + -U, --atimes preserve access (use) times |
| 317 | --super receiver attempts super-user activities |
| 318 | -S, --sparse handle sparse files efficiently |
| 319 | -n, --dry-run show what would have been transferred |
| 320 | @@ -870,6 +871,12 @@ it is preserving modification times (see |
| 321 | the directories on the receiving side, it is a good idea to use bf(-O). |
| 322 | This option is inferred if you use bf(--backup) without bf(--backup-dir). |
| 323 | |
| 324 | +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the |
| 325 | +destination files to the same value as the source files. Note that the |
| 326 | +reading of the source file may update the atime of the source files, so |
| 327 | +repeated rsync runs with --atimes may be needed if you want to force the |
| 328 | +access-time values to be 100% identical on the two systems. |
| 329 | + |
| 330 | dit(bf(--super)) This tells the receiving side to attempt super-user |
| 331 | activities even if the receiving rsync wasn't run by the super-user. These |
| 332 | activities include: preserving users via the bf(--owner) option, preserving |
| 333 | @@ -1403,7 +1410,7 @@ with older versions of rsync, but that a |
| 334 | verbose messages). |
| 335 | |
| 336 | The "%i" escape has a cryptic output that is 9 letters long. The general |
| 337 | -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the |
| 338 | +format is like the string bf(YXcstpogu), where bf(Y) is replaced by the |
| 339 | type of update being done, bf(X) is replaced by the file-type, and the |
| 340 | other letters represent attributes that may be output if they are being |
| 341 | modified. |
| 342 | @@ -1443,7 +1450,7 @@ quote(itemization( |
| 343 | by the file transfer. |
| 344 | it() A bf(t) means the modification time is different and is being updated |
| 345 | to the sender's value (requires bf(--times)). An alternate value of bf(T) |
| 346 | - means that the time will be set to the transfer time, which happens |
| 347 | + means that the modify time will be set to the transfer time, which happens |
| 348 | anytime a symlink is transferred, or when a file or device is transferred |
| 349 | without bf(--times). |
| 350 | it() A bf(p) means the permissions are different and are being updated to |
| 351 | @@ -1452,7 +1459,10 @@ quote(itemization( |
| 352 | sender's value (requires bf(--owner) and super-user privileges). |
| 353 | it() A bf(g) means the group is different and is being updated to the |
| 354 | sender's value (requires bf(--group) and the authority to set the group). |
| 355 | - it() The bf(z) slot is reserved for future use. |
| 356 | + it() A bf(u) means the access (use) time is different and is being updated to |
| 357 | + the sender's value (requires bf(--atimes)). An alternate value of bf(U) |
| 358 | + means that the access time will be set to the transfer time, which happens |
| 359 | + when a symlink or directory is updated. |
| 360 | )) |
| 361 | |
| 362 | One other output is possible: when deleting files, the "%i" will output |
| 363 | --- old/sender.c |
| 364 | +++ new/sender.c |
| 365 | @@ -42,6 +42,7 @@ extern int do_progress; |
| 366 | extern int inplace; |
| 367 | extern int batch_fd; |
| 368 | extern int write_batch; |
| 369 | +extern unsigned int file_struct_len; |
| 370 | extern struct stats stats; |
| 371 | extern struct file_list *cur_flist, *first_flist; |
| 372 | extern char *stdout_format; |
| 373 | --- old/testsuite/atimes.test |
| 374 | +++ new/testsuite/atimes.test |
| 375 | @@ -0,0 +1,19 @@ |
| 376 | +#! /bin/sh |
| 377 | + |
| 378 | +# Test rsync copying atimes |
| 379 | + |
| 380 | +. "$suitedir/rsync.fns" |
| 381 | + |
| 382 | +set -x |
| 383 | + |
| 384 | +mkdir "$fromdir" |
| 385 | + |
| 386 | +touch "$fromdir/foo" |
| 387 | +touch -a -t 200102031717.42 "$fromdir/foo" |
| 388 | + |
| 389 | +TLS_ARGS=--atime |
| 390 | + |
| 391 | +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" |
| 392 | + |
| 393 | +# The script would have aborted on error, so getting here means we've won. |
| 394 | +exit 0 |
| 395 | --- old/testsuite/rsync.fns |
| 396 | +++ new/testsuite/rsync.fns |
| 397 | @@ -66,7 +66,7 @@ printmsg() { |
| 398 | } |
| 399 | |
| 400 | rsync_ls_lR() { |
| 401 | - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" |
| 402 | + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS |
| 403 | } |
| 404 | |
| 405 | check_perms() { |
| 406 | @@ -184,6 +184,10 @@ checkit() { |
| 407 | # We can just write everything to stdout/stderr, because the |
| 408 | # wrapper hides it unless there is a problem. |
| 409 | |
| 410 | + if test x$TLS_ARGS = x--atime; then |
| 411 | + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" |
| 412 | + fi |
| 413 | + |
| 414 | echo "Running: \"$1\"" |
| 415 | eval "$1" |
| 416 | status=$? |
| 417 | @@ -191,10 +195,13 @@ checkit() { |
| 418 | failed="YES"; |
| 419 | fi |
| 420 | |
| 421 | + if test x$TLS_ARGS != x--atime; then |
| 422 | + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" |
| 423 | + fi |
| 424 | + |
| 425 | echo "-------------" |
| 426 | echo "check how the directory listings compare with diff:" |
| 427 | echo "" |
| 428 | - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" |
| 429 | ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" |
| 430 | diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES |
| 431 | |
| 432 | --- old/tls.c |
| 433 | +++ new/tls.c |
| 434 | @@ -34,6 +34,7 @@ |
| 435 | * change. */ |
| 436 | |
| 437 | #include "rsync.h" |
| 438 | +#include "popt.h" |
| 439 | |
| 440 | #define PROGRAM "tls" |
| 441 | |
| 442 | @@ -43,6 +44,8 @@ int read_only = 1; |
| 443 | int list_only = 0; |
| 444 | int preserve_perms = 0; |
| 445 | |
| 446 | +static int display_atime = 0; |
| 447 | + |
| 448 | static void failed(char const *what, char const *where) |
| 449 | { |
| 450 | fprintf(stderr, PROGRAM ": %s %s: %s\n", |
| 451 | @@ -50,12 +53,29 @@ static void failed(char const *what, cha |
| 452 | exit(1); |
| 453 | } |
| 454 | |
| 455 | +static void storetime(char *dest, time_t t, size_t destsize) |
| 456 | +{ |
| 457 | + if (t) { |
| 458 | + struct tm *mt = gmtime(&t); |
| 459 | + |
| 460 | + snprintf(dest, destsize, |
| 461 | + "%04d-%02d-%02d %02d:%02d:%02d ", |
| 462 | + (int)mt->tm_year + 1900, |
| 463 | + (int)mt->tm_mon + 1, |
| 464 | + (int)mt->tm_mday, |
| 465 | + (int)mt->tm_hour, |
| 466 | + (int)mt->tm_min, |
| 467 | + (int)mt->tm_sec); |
| 468 | + } else |
| 469 | + strlcpy(dest, " ", destsize); |
| 470 | +} |
| 471 | + |
| 472 | static void list_file(const char *fname) |
| 473 | { |
| 474 | STRUCT_STAT buf; |
| 475 | char permbuf[PERMSTRING_SIZE]; |
| 476 | - struct tm *mt; |
| 477 | - char datebuf[50]; |
| 478 | + char mtimebuf[50]; |
| 479 | + char atimebuf[50]; |
| 480 | char linkbuf[4096]; |
| 481 | |
| 482 | if (do_lstat(fname, &buf) < 0) |
| 483 | @@ -88,19 +108,8 @@ static void list_file(const char *fname) |
| 484 | |
| 485 | permstring(permbuf, buf.st_mode); |
| 486 | |
| 487 | - if (buf.st_mtime) { |
| 488 | - mt = gmtime(&buf.st_mtime); |
| 489 | - |
| 490 | - snprintf(datebuf, sizeof datebuf, |
| 491 | - "%04d-%02d-%02d %02d:%02d:%02d", |
| 492 | - (int)mt->tm_year + 1900, |
| 493 | - (int)mt->tm_mon + 1, |
| 494 | - (int)mt->tm_mday, |
| 495 | - (int)mt->tm_hour, |
| 496 | - (int)mt->tm_min, |
| 497 | - (int)mt->tm_sec); |
| 498 | - } else |
| 499 | - strlcpy(datebuf, " ", sizeof datebuf); |
| 500 | + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf); |
| 501 | + storetime(atimebuf, buf.st_atime, sizeof atimebuf); |
| 502 | |
| 503 | /* TODO: Perhaps escape special characters in fname? */ |
| 504 | |
| 505 | @@ -111,23 +120,55 @@ static void list_file(const char *fname) |
| 506 | (long)minor(buf.st_rdev)); |
| 507 | } else /* NB: use double for size since it might not fit in a long. */ |
| 508 | printf("%12.0f", (double)buf.st_size); |
| 509 | - printf(" %6ld.%-6ld %6ld %s %s%s\n", |
| 510 | + printf(" %6ld.%-6ld %6ld %s%s%s%s\n", |
| 511 | (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink, |
| 512 | - datebuf, fname, linkbuf); |
| 513 | + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "", |
| 514 | + fname, linkbuf); |
| 515 | +} |
| 516 | + |
| 517 | +static struct poptOption long_options[] = { |
| 518 | + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ |
| 519 | + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0}, |
| 520 | + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0}, |
| 521 | + {0,0,0,0,0,0,0} |
| 522 | +}; |
| 523 | + |
| 524 | +static void tls_usage(int ret) |
| 525 | +{ |
| 526 | + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] FILE ...\n" |
| 527 | + "Trivial file listing program for portably checking rsync\n"); |
| 528 | + exit(ret); |
| 529 | } |
| 530 | |
| 531 | int |
| 532 | main(int argc, char *argv[]) |
| 533 | { |
| 534 | - if (argc < 2) { |
| 535 | - fprintf(stderr, "usage: " PROGRAM " FILE ...\n" |
| 536 | - "Trivial file listing program for portably checking rsync\n"); |
| 537 | - return 1; |
| 538 | - } |
| 539 | + poptContext pc; |
| 540 | + const char **extra_args; |
| 541 | + int opt; |
| 542 | |
| 543 | - for (argv++; *argv; argv++) { |
| 544 | - list_file(*argv); |
| 545 | + pc = poptGetContext(PROGRAM, argc, (const char **)argv, |
| 546 | + long_options, 0); |
| 547 | + while ((opt = poptGetNextOpt(pc)) != -1) { |
| 548 | + switch (opt) { |
| 549 | + case 'h': |
| 550 | + tls_usage(0); |
| 551 | + default: |
| 552 | + fprintf(stderr, |
| 553 | + "%s: %s\n", |
| 554 | + poptBadOption(pc, POPT_BADOPTION_NOALIAS), |
| 555 | + poptStrerror(opt)); |
| 556 | + tls_usage(1); |
| 557 | + } |
| 558 | } |
| 559 | |
| 560 | + extra_args = poptGetArgs(pc); |
| 561 | + if (*extra_args == NULL) |
| 562 | + tls_usage(1); |
| 563 | + |
| 564 | + for (; *extra_args; extra_args++) |
| 565 | + list_file(*extra_args); |
| 566 | + poptFreeContext(pc); |
| 567 | + |
| 568 | return 0; |
| 569 | } |
| 570 | --- old/util.c |
| 571 | +++ new/util.c |
| 572 | @@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char * |
| 573 | exit_cleanup(RERR_MALLOC); |
| 574 | } |
| 575 | |
| 576 | -int set_modtime(const char *fname, time_t modtime, mode_t mode) |
| 577 | +int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode) |
| 578 | { |
| 579 | #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES |
| 580 | if (S_ISLNK(mode)) |
| 581 | @@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_ |
| 582 | #endif |
| 583 | |
| 584 | if (verbose > 2) { |
| 585 | - rprintf(FINFO, "set modtime of %s to (%ld) %s", |
| 586 | + char mtimebuf[200]; |
| 587 | + |
| 588 | + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf); |
| 589 | + rprintf(FINFO, |
| 590 | + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n", |
| 591 | fname, (long)modtime, |
| 592 | - asctime(localtime(&modtime))); |
| 593 | + mtimebuf, (long)atime, timestring(atime)); |
| 594 | } |
| 595 | |
| 596 | if (dry_run) |
| 597 | @@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_ |
| 598 | { |
| 599 | #ifdef HAVE_UTIMES |
| 600 | struct timeval t[2]; |
| 601 | - t[0].tv_sec = time(NULL); |
| 602 | + t[0].tv_sec = atime; |
| 603 | t[0].tv_usec = 0; |
| 604 | t[1].tv_sec = modtime; |
| 605 | t[1].tv_usec = 0; |
| 606 | @@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_ |
| 607 | return utimes(fname, t); |
| 608 | #elif defined HAVE_UTIMBUF |
| 609 | struct utimbuf tbuf; |
| 610 | - tbuf.actime = time(NULL); |
| 611 | + tbuf.actime = atime; |
| 612 | tbuf.modtime = modtime; |
| 613 | return utime(fname,&tbuf); |
| 614 | #elif defined HAVE_UTIME |
| 615 | time_t t[2]; |
| 616 | - t[0] = time(NULL); |
| 617 | + t[0] = atime; |
| 618 | t[1] = modtime; |
| 619 | return utime(fname,t); |
| 620 | #else |