|
1 --- rsync-3.0.8/main.c.orig Tue Feb 22 08:21:08 2011 |
|
2 +++ rsync-3.0.8/main.c Tue May 15 23:45:20 2012 |
|
3 @@ -1100,7 +1100,7 @@ |
|
4 for (i = 0; argv[i]; i++) { |
|
5 if (!(argv[i] = strdup(argv[i]))) { |
|
6 rprintf (FERROR, "out of memory at %s(%d)\n", |
|
7 - __FILE__, __LINE__); |
|
8 + basename(__FILE__), __LINE__); |
|
9 return RERR_MALLOC; |
|
10 } |
|
11 } |
|
12 --- rsync-3.0.8/cleanup.c.orig Mon Feb 21 10:20:58 2011 |
|
13 +++ rsync-3.0.8/cleanup.c Tue May 15 23:45:56 2012 |
|
14 @@ -126,7 +126,7 @@ |
|
15 if (verbose > 3) { |
|
16 rprintf(FINFO, |
|
17 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
|
18 - who_am_i(), code, file, line); |
|
19 + who_am_i(), code, basename(file), line); |
|
20 } |
|
21 |
|
22 /* FALLTHROUGH */ |
|
23 @@ -202,7 +202,7 @@ |
|
24 rprintf(FINFO, |
|
25 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
|
26 "about to call exit(%d)\n", |
|
27 - who_am_i(), unmodified_code, file, line, code); |
|
28 + who_am_i(), unmodified_code, basename(file), line, code); |
|
29 } |
|
30 |
|
31 /* FALLTHROUGH */ |
|
32 --- rsync-3.0.8/t_stub.c.orig Mon Feb 21 11:32:48 2011 |
|
33 +++ rsync-3.0.8/t_stub.c Tue May 15 23:46:28 2012 |
|
34 @@ -54,7 +54,7 @@ |
|
35 void _exit_cleanup(int code, const char *file, int line) |
|
36 { |
|
37 fprintf(stderr, "exit(%d): %s(%d)\n", |
|
38 - code, file, line); |
|
39 + code, basename(file), line); |
|
40 exit(code); |
|
41 } |
|
42 |
|
43 --- rsync-3.0.8/log.c.orig Wed May 16 15:59:20 2012 |
|
44 +++ rsync-3.0.8/log.c Wed May 16 15:57:39 2012 |
|
45 @@ -829,10 +829,10 @@ |
|
46 /* VANISHED is not an error, only a warning */ |
|
47 if (code == RERR_VANISHED) { |
|
48 rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", |
|
49 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
|
50 + name, code, basename(file), line, who_am_i(), RSYNC_VERSION); |
|
51 } else { |
|
52 rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n", |
|
53 - name, code, file, line, who_am_i(), RSYNC_VERSION); |
|
54 + name, code, basename(file), line, who_am_i(), RSYNC_VERSION); |
|
55 } |
|
56 } |
|
57 } |