|
1 --- rsync-3.0.9/main.c.orig 2011-06-18 12:44:47.000000000 -0700 |
|
2 +++ rsync-3.0.9/main.c 2013-07-03 17:44:42.596018396 -0700 |
|
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 @@ |
|
12 for (i = 0; argv[i]; i++) { |
|
13 if (!(argv[i] = strdup(argv[i]))) { |
|
14 rprintf (FERROR, "out of memory at %s(%d)\n", |
|
15 - __FILE__, __LINE__); |
|
16 + basename(__FILE__), __LINE__); |
|
17 return RERR_MALLOC; |
|
18 } |
|
19 } |
|
20 --- rsync-3.0.9/cleanup.c.orig 2011-02-21 10:20:58.000000000 -0800 |
|
21 +++ rsync-3.0.9/cleanup.c 2013-07-03 18:10:38.003756993 -0700 |
|
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 @@ |
|
31 if (verbose > 3) { |
|
32 rprintf(FINFO, |
|
33 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
|
34 - who_am_i(), code, file, line); |
|
35 + who_am_i(), code, basename((char *)file), line); |
|
36 } |
|
37 |
|
38 /* FALLTHROUGH */ |
|
39 @@ -202,7 +203,7 @@ |
|
40 rprintf(FINFO, |
|
41 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
|
42 "about to call exit(%d)\n", |
|
43 - who_am_i(), unmodified_code, file, line, code); |
|
44 + who_am_i(), unmodified_code, basename((char *)file), line, code); |
|
45 } |
|
46 |
|
47 /* FALLTHROUGH */ |
|
48 --- rsync-3.0.9/t_stub.c.orig 2011-02-21 11:32:48.000000000 -0800 |
|
49 +++ rsync-3.0.9/t_stub.c 2013-07-03 17:44:42.597023354 -0700 |
|
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 @@ |
|
59 void _exit_cleanup(int code, const char *file, int line) |
|
60 { |
|
61 fprintf(stderr, "exit(%d): %s(%d)\n", |
|
62 - code, file, line); |
|
63 + code, basename((char *)file), line); |
|
64 exit(code); |
|
65 } |
|
66 |
|
67 --- rsync-3.0.9/log.c.orig 2011-01-29 19:25:53.000000000 -0800 |
|
68 +++ rsync-3.0.9/log.c 2013-07-03 18:12:34.878333604 -0700 |
|
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 @@ |
|
78 /* VANISHED is not an error, only a warning */ |
|
79 if (code == RERR_VANISHED) { |
|
80 rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
|
81 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
|
82 + name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
|
83 } else { |
|
84 rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", |
|
85 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
|
86 + name, code, basename((char *)file), line, who_am_i(), RSYNC_VERSION); |
|
87 } |
|
88 } |
|
89 } |