| author | Danek Duvall <danek.duvall@oracle.com> |
| Mon, 07 Apr 2014 12:48:54 -0700 | |
| branch | s11-update |
| changeset 3071 | b3248af1296a |
| parent 2708 | 0671d3e048aa |
| child 6487 | 6e536698eac2 |
| permissions | -rw-r--r-- |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
1 |
Reduce references to source pathnames down to the respective basenames so |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
2 |
that builds are reproducible between workspaces. |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
3 |
|
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
4 |
--- rsync-3.1.0/main.c.orig Sat Jan 19 11:05:53 2013 |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
5 |
+++ rsync-3.1.0/main.c Mon Mar 17 14:57:32 2014 |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
6 |
@@ -26,6 +26,7 @@ |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
7 |
#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
8 |
#include <locale.h> |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
9 |
#endif |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
10 |
+#include <libgen.h> |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
11 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
12 |
extern int dry_run; |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
13 |
extern int list_only; |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
14 |
@@ -1215,7 +1216,7 @@ |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
15 |
for (i = 0; argv[i]; i++) {
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
16 |
if (!(argv[i] = strdup(argv[i]))) {
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
17 |
rprintf (FERROR, "out of memory at %s(%d)\n", |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
18 |
- __FILE__, __LINE__); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
19 |
+ basename(__FILE__), __LINE__); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
20 |
return RERR_MALLOC; |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
21 |
} |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
22 |
} |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
23 |
--- rsync-3.1.0/cleanup.c.orig Sat Sep 28 10:40:27 2013 |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
24 |
+++ rsync-3.1.0/cleanup.c Mon Mar 17 14:57:58 2014 |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
25 |
@@ -21,6 +21,7 @@ |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
26 |
*/ |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
27 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
28 |
#include "rsync.h" |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
29 |
+#include <libgen.h> |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
30 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
31 |
extern int am_server; |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
32 |
extern int am_daemon; |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
33 |
@@ -134,7 +135,7 @@ |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
34 |
if (DEBUG_GTE(EXIT, 2)) {
|
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
35 |
rprintf(FINFO, |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
36 |
"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
37 |
- who_am_i(), code, file, line); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
38 |
+ who_am_i(), code, basename((char *)file), line); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
39 |
} |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
40 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
41 |
/* FALLTHROUGH */ |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
42 |
@@ -233,7 +234,7 @@ |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
43 |
rprintf(FINFO, |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
44 |
"[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
45 |
"about to call exit(%d)\n", |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
46 |
- who_am_i(), first_code, exit_file, exit_line, exit_code); |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
47 |
+ who_am_i(), first_code, basename((char *)exit_file), exit_line, exit_code); |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
48 |
} |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
49 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
50 |
/* FALLTHROUGH */ |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
51 |
--- rsync-3.1.0/t_stub.c.orig Tue Jun 11 18:06:53 2013 |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
52 |
+++ rsync-3.1.0/t_stub.c Mon Mar 17 14:58:24 2014 |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
53 |
@@ -20,6 +20,7 @@ |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
54 |
*/ |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
55 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
56 |
#include "rsync.h" |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
57 |
+#include <libgen.h> |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
58 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
59 |
int modify_window = 0; |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
60 |
int preallocate_files = 0; |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
61 |
@@ -56,7 +57,7 @@ |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
62 |
void _exit_cleanup(int code, const char *file, int line) |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
63 |
{
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
64 |
fprintf(stderr, "exit(%d): %s(%d)\n", |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
65 |
- code, file, line); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
66 |
+ code, basename((char *)file), line); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
67 |
exit(code); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
68 |
} |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
69 |
|
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
70 |
--- rsync-3.1.0/log.c.orig Tue Jun 11 13:36:44 2013 |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
71 |
+++ rsync-3.1.0/log.c Mon Mar 17 14:58:51 2014 |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
72 |
@@ -22,6 +22,7 @@ |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
73 |
#include "rsync.h" |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
74 |
#include "itypes.h" |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
75 |
#include "inums.h" |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
76 |
+#include <libgen.h> |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
77 |
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
78 |
extern int dry_run; |
|
3071
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
79 |
extern int am_daemon; |
|
b3248af1296a
18414592 update rsync to 3.1.0
Danek Duvall <danek.duvall@oracle.com>
parents:
2708
diff
changeset
|
80 |
@@ -887,10 +888,10 @@ |
|
2708
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
81 |
/* VANISHED is not an error, only a warning */ |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
82 |
if (code == RERR_VANISHED) {
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
83 |
rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
84 |
- name, code, file, line, who_am_i(), RSYNC_VERSION); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
85 |
+ name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
86 |
} else {
|
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
87 |
rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
88 |
- name, code, file, line, who_am_i(), RSYNC_VERSION); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
89 |
+ name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
90 |
} |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
91 |
} |
|
0671d3e048aa
15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff
changeset
|
92 |
} |