1 --- rsync-3.0.9/main.c.orig 2011-06-18 12:44:47.000000000 -0700 |
1 Reduce references to source pathnames down to the respective basenames so |
2 +++ rsync-3.0.9/main.c 2013-07-03 17:44:42.596018396 -0700 |
2 that builds are reproducible between workspaces. |
|
3 |
|
4 --- rsync-3.1.0/main.c.orig Sat Jan 19 11:05:53 2013 |
|
5 +++ rsync-3.1.0/main.c Mon Mar 17 14:57:32 2014 |
3 @@ -26,6 +26,7 @@ |
6 @@ -26,6 +26,7 @@ |
4 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H |
7 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H |
5 #include <locale.h> |
8 #include <locale.h> |
6 #endif |
9 #endif |
7 +#include <libgen.h> |
10 +#include <libgen.h> |
8 |
11 |
9 extern int verbose; |
|
10 extern int dry_run; |
12 extern int dry_run; |
11 @@ -1100,7 +1101,7 @@ |
13 extern int list_only; |
|
14 @@ -1215,7 +1216,7 @@ |
12 for (i = 0; argv[i]; i++) { |
15 for (i = 0; argv[i]; i++) { |
13 if (!(argv[i] = strdup(argv[i]))) { |
16 if (!(argv[i] = strdup(argv[i]))) { |
14 rprintf (FERROR, "out of memory at %s(%d)\n", |
17 rprintf (FERROR, "out of memory at %s(%d)\n", |
15 - __FILE__, __LINE__); |
18 - __FILE__, __LINE__); |
16 + basename(__FILE__), __LINE__); |
19 + basename(__FILE__), __LINE__); |
17 return RERR_MALLOC; |
20 return RERR_MALLOC; |
18 } |
21 } |
19 } |
22 } |
20 --- rsync-3.0.9/cleanup.c.orig 2011-02-21 10:20:58.000000000 -0800 |
23 --- rsync-3.1.0/cleanup.c.orig Sat Sep 28 10:40:27 2013 |
21 +++ rsync-3.0.9/cleanup.c 2013-07-03 18:10:38.003756993 -0700 |
24 +++ rsync-3.1.0/cleanup.c Mon Mar 17 14:57:58 2014 |
22 @@ -21,6 +21,7 @@ |
25 @@ -21,6 +21,7 @@ |
23 */ |
26 */ |
24 |
27 |
25 #include "rsync.h" |
28 #include "rsync.h" |
26 +#include <libgen.h> |
29 +#include <libgen.h> |
27 |
30 |
28 extern int am_server; |
31 extern int am_server; |
29 extern int am_daemon; |
32 extern int am_daemon; |
30 @@ -126,7 +127,7 @@ |
33 @@ -134,7 +135,7 @@ |
31 if (verbose > 3) { |
34 if (DEBUG_GTE(EXIT, 2)) { |
32 rprintf(FINFO, |
35 rprintf(FINFO, |
33 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
36 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
34 - who_am_i(), code, file, line); |
37 - who_am_i(), code, file, line); |
35 + who_am_i(), code, basename((char *)file), line); |
38 + who_am_i(), code, basename((char *)file), line); |
36 } |
39 } |
37 |
40 |
38 /* FALLTHROUGH */ |
41 /* FALLTHROUGH */ |
39 @@ -202,7 +203,7 @@ |
42 @@ -233,7 +234,7 @@ |
40 rprintf(FINFO, |
43 rprintf(FINFO, |
41 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
44 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
42 "about to call exit(%d)\n", |
45 "about to call exit(%d)\n", |
43 - who_am_i(), unmodified_code, file, line, code); |
46 - who_am_i(), first_code, exit_file, exit_line, exit_code); |
44 + who_am_i(), unmodified_code, basename((char *)file), line, code); |
47 + who_am_i(), first_code, basename((char *)exit_file), exit_line, exit_code); |
45 } |
48 } |
46 |
49 |
47 /* FALLTHROUGH */ |
50 /* FALLTHROUGH */ |
48 --- rsync-3.0.9/t_stub.c.orig 2011-02-21 11:32:48.000000000 -0800 |
51 --- rsync-3.1.0/t_stub.c.orig Tue Jun 11 18:06:53 2013 |
49 +++ rsync-3.0.9/t_stub.c 2013-07-03 17:44:42.597023354 -0700 |
52 +++ rsync-3.1.0/t_stub.c Mon Mar 17 14:58:24 2014 |
50 @@ -20,6 +20,7 @@ |
53 @@ -20,6 +20,7 @@ |
51 */ |
54 */ |
52 |
55 |
53 #include "rsync.h" |
56 #include "rsync.h" |
54 +#include <libgen.h> |
57 +#include <libgen.h> |
55 |
58 |
56 int modify_window = 0; |
59 int modify_window = 0; |
57 int module_id = -1; |
60 int preallocate_files = 0; |
58 @@ -54,7 +55,7 @@ |
61 @@ -56,7 +57,7 @@ |
59 void _exit_cleanup(int code, const char *file, int line) |
62 void _exit_cleanup(int code, const char *file, int line) |
60 { |
63 { |
61 fprintf(stderr, "exit(%d): %s(%d)\n", |
64 fprintf(stderr, "exit(%d): %s(%d)\n", |
62 - code, file, line); |
65 - code, file, line); |
63 + code, basename((char *)file), line); |
66 + code, basename((char *)file), line); |
64 exit(code); |
67 exit(code); |
65 } |
68 } |
66 |
69 |
67 --- rsync-3.0.9/log.c.orig 2011-01-29 19:25:53.000000000 -0800 |
70 --- rsync-3.1.0/log.c.orig Tue Jun 11 13:36:44 2013 |
68 +++ rsync-3.0.9/log.c 2013-07-03 18:12:34.878333604 -0700 |
71 +++ rsync-3.1.0/log.c Mon Mar 17 14:58:51 2014 |
69 @@ -21,6 +21,7 @@ |
72 @@ -22,6 +22,7 @@ |
70 |
|
71 #include "rsync.h" |
73 #include "rsync.h" |
72 #include "ifuncs.h" |
74 #include "itypes.h" |
|
75 #include "inums.h" |
73 +#include <libgen.h> |
76 +#include <libgen.h> |
74 |
77 |
75 extern int verbose; |
|
76 extern int dry_run; |
78 extern int dry_run; |
77 @@ -829,10 +830,10 @@ |
79 extern int am_daemon; |
|
80 @@ -887,10 +888,10 @@ |
78 /* VANISHED is not an error, only a warning */ |
81 /* VANISHED is not an error, only a warning */ |
79 if (code == RERR_VANISHED) { |
82 if (code == RERR_VANISHED) { |
80 rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
83 rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
81 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
84 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
82 + name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
85 + name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |