28 #include "rsync.h" |
28 #include "rsync.h" |
29 +#include <libgen.h> |
29 +#include <libgen.h> |
30 |
30 |
31 extern int am_server; |
31 extern int am_server; |
32 extern int am_daemon; |
32 extern int am_daemon; |
33 @@ -134,7 +135,7 @@ |
33 --- Originals/cleanup.c 2016-07-13 15:37:38.279157151 -0700 |
34 if (DEBUG_GTE(EXIT, 2)) { |
34 +++ rsync-3.1.2/cleanup.c 2016-07-13 15:42:51.107529619 -0700 |
35 rprintf(FINFO, |
35 @@ -235,7 +235,7 @@ |
36 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", |
|
37 - who_am_i(), code, file, line); |
|
38 + who_am_i(), code, basename((char *)file), line); |
|
39 } |
|
40 |
|
41 /* FALLTHROUGH */ |
|
42 @@ -233,7 +234,7 @@ |
|
43 rprintf(FINFO, |
36 rprintf(FINFO, |
44 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
37 "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " |
45 "about to call exit(%d)\n", |
38 "about to call exit(%d)%s\n", |
46 - who_am_i(), first_code, exit_file, exit_line, exit_code); |
39 - who_am_i(), first_code, exit_file, exit_line, exit_code, |
47 + who_am_i(), first_code, basename((char *)exit_file), exit_line, exit_code); |
40 + who_am_i(), first_code, basename((char*)exit_file), exit_line, exit_code, |
|
41 dry_run ? " (DRY RUN)" : ""); |
48 } |
42 } |
49 |
|
50 /* FALLTHROUGH */ |
43 /* FALLTHROUGH */ |
51 --- rsync-3.1.0/t_stub.c.orig Tue Jun 11 18:06:53 2013 |
44 --- rsync-3.1.0/t_stub.c.orig Tue Jun 11 18:06:53 2013 |
52 +++ rsync-3.1.0/t_stub.c Mon Mar 17 14:58:24 2014 |
45 +++ rsync-3.1.0/t_stub.c Mon Mar 17 14:58:24 2014 |
53 @@ -20,6 +20,7 @@ |
46 @@ -20,6 +20,7 @@ |
54 */ |
47 */ |