1 --- rsync-3.0.9/main.c.orig 2011-06-18 12:44:47.000000000 -0700 |
1 --- rsync-3.0.9/main.c.orig 2011-06-18 12:44:47.000000000 -0700 |
2 +++ rsync-3.0.9/main.c 2013-04-19 14:14:00.331981573 -0700 |
2 +++ rsync-3.0.9/main.c 2013-07-03 17:44:42.596018396 -0700 |
3 @@ -1100,7 +1100,7 @@ |
3 @@ -26,6 +26,7 @@ |
|
4 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H |
|
5 #include <locale.h> |
|
6 #endif |
|
7 +#include <libgen.h> |
|
8 |
|
9 extern int verbose; |
|
10 extern int dry_run; |
|
11 @@ -1100,7 +1101,7 @@ |
4 for (i = 0; argv[i]; i++) { |
12 for (i = 0; argv[i]; i++) { |
5 if (!(argv[i] = strdup(argv[i]))) { |
13 if (!(argv[i] = strdup(argv[i]))) { |
6 rprintf (FERROR, "out of memory at %s(%d)\n", |
14 rprintf (FERROR, "out of memory at %s(%d)\n", |
7 - __FILE__, __LINE__); |
15 - __FILE__, __LINE__); |
8 + basename(__FILE__), __LINE__); |
16 + basename(__FILE__), __LINE__); |
9 return RERR_MALLOC; |
17 return RERR_MALLOC; |
10 } |
18 } |
11 } |
19 } |
12 --- rsync-3.0.9/cleanup.c.orig 2011-02-21 10:20:58.000000000 -0800 |
20 --- rsync-3.0.9/cleanup.c.orig 2011-02-21 10:20:58.000000000 -0800 |
13 +++ rsync-3.0.9/cleanup.c 2013-04-19 14:14:00.332420836 -0700 |
21 +++ rsync-3.0.9/cleanup.c 2013-07-03 18:10:38.003756993 -0700 |
14 @@ -126,7 +126,7 @@ |
22 @@ -21,6 +21,7 @@ |
|
23 */ |
|
24 |
|
25 #include "rsync.h" |
|
26 +#include <libgen.h> |
|
27 |
|
28 extern int am_server; |
|
29 extern int am_daemon; |
|
30 @@ -126,7 +127,7 @@ |
15 if (verbose > 3) { |
31 if (verbose > 3) { |
16 rprintf(FINFO, |
32 rprintf(FINFO, |
17 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
33 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
18 - who_am_i(), code, file, line); |
34 - who_am_i(), code, file, line); |
19 + who_am_i(), code, basename(file), line); |
35 + who_am_i(), code, basename((char *)file), line); |
20 } |
36 } |
21 |
37 |
22 /* FALLTHROUGH */ |
38 /* FALLTHROUGH */ |
23 @@ -202,7 +202,7 @@ |
39 @@ -202,7 +203,7 @@ |
24 rprintf(FINFO, |
40 rprintf(FINFO, |
25 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
41 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
26 "about to call exit(%d)\n", |
42 "about to call exit(%d)\n", |
27 - who_am_i(), unmodified_code, file, line, code); |
43 - who_am_i(), unmodified_code, file, line, code); |
28 + who_am_i(), unmodified_code, basename(file), line, code); |
44 + who_am_i(), unmodified_code, basename((char *)file), line, code); |
29 } |
45 } |
30 |
46 |
31 /* FALLTHROUGH */ |
47 /* FALLTHROUGH */ |
32 --- rsync-3.0.9/t_stub.c.orig 2011-02-21 11:32:48.000000000 -0800 |
48 --- rsync-3.0.9/t_stub.c.orig 2011-02-21 11:32:48.000000000 -0800 |
33 +++ rsync-3.0.9/t_stub.c 2013-04-19 14:14:00.332763107 -0700 |
49 +++ rsync-3.0.9/t_stub.c 2013-07-03 17:44:42.597023354 -0700 |
34 @@ -54,7 +54,7 @@ |
50 @@ -20,6 +20,7 @@ |
|
51 */ |
|
52 |
|
53 #include "rsync.h" |
|
54 +#include <libgen.h> |
|
55 |
|
56 int modify_window = 0; |
|
57 int module_id = -1; |
|
58 @@ -54,7 +55,7 @@ |
35 void _exit_cleanup(int code, const char *file, int line) |
59 void _exit_cleanup(int code, const char *file, int line) |
36 { |
60 { |
37 fprintf(stderr, "exit(%d): %s(%d)\n", |
61 fprintf(stderr, "exit(%d): %s(%d)\n", |
38 - code, file, line); |
62 - code, file, line); |
39 + code, basename(file), line); |
63 + code, basename((char *)file), line); |
40 exit(code); |
64 exit(code); |
41 } |
65 } |
42 |
66 |
43 --- rsync-3.0.9/log.c.orig 2011-01-29 19:25:53.000000000 -0800 |
67 --- rsync-3.0.9/log.c.orig 2011-01-29 19:25:53.000000000 -0800 |
44 +++ rsync-3.0.9/log.c 2013-04-19 14:14:00.333124681 -0700 |
68 +++ rsync-3.0.9/log.c 2013-07-03 18:12:34.878333604 -0700 |
45 @@ -829,10 +829,10 @@ |
69 @@ -21,6 +21,7 @@ |
|
70 |
|
71 #include "rsync.h" |
|
72 #include "ifuncs.h" |
|
73 +#include <libgen.h> |
|
74 |
|
75 extern int verbose; |
|
76 extern int dry_run; |
|
77 @@ -829,10 +830,10 @@ |
46 /* VANISHED is not an error, only a warning */ |
78 /* VANISHED is not an error, only a warning */ |
47 if (code == RERR_VANISHED) { |
79 if (code == RERR_VANISHED) { |
48 rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
80 rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
49 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
81 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
50 + name, code, basename(file), line, who_am_i(), RSYNC_VERSION); |
82 + name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
51 } else { |
83 } else { |
52 rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", |
84 rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", |
53 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
85 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
54 + name, code, basename(file), line, who_am_i(), RSYNC_VERSION); |
86 + name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
55 } |
87 } |
56 } |
88 } |
57 } |
89 } |