components/rsync/patches/15730984.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 02 Dec 2013 12:25:36 -0800
branchs11-update
changeset 2840 9ea568061f2e
parent 2708 0671d3e048aa
child 3071 b3248af1296a
permissions -rw-r--r--
Close of build 29.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2708
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     1
--- rsync-3.0.9/main.c.orig	2011-06-18 12:44:47.000000000 -0700
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     2
+++ rsync-3.0.9/main.c	2013-07-03 17:44:42.596018396 -0700
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     3
@@ -26,6 +26,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     4
 #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
     5
 #include <locale.h>
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     6
 #endif
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     7
+#include <libgen.h>
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     8
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
     9
 extern int verbose;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    10
 extern int dry_run;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    11
@@ -1100,7 +1101,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    12
 	for (i = 0; argv[i]; i++) {
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    13
 		if (!(argv[i] = strdup(argv[i]))) {
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    14
 			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
    15
-				 __FILE__, __LINE__);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    16
+				 basename(__FILE__), __LINE__);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    17
 			return RERR_MALLOC;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    18
 		}
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    19
 	}
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    20
--- rsync-3.0.9/cleanup.c.orig	2011-02-21 10:20:58.000000000 -0800
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    21
+++ rsync-3.0.9/cleanup.c	2013-07-03 18:10:38.003756993 -0700
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    22
@@ -21,6 +21,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    23
  */
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    24
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    25
 #include "rsync.h"
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    26
+#include <libgen.h>
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
 extern int am_server;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    29
 extern int am_daemon;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    30
@@ -126,7 +127,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    31
 		if (verbose > 3) {
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    32
 			rprintf(FINFO,
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    33
 				"[%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
    34
-				who_am_i(), code, file, line);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    35
+				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
    36
 		}
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    37
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    38
 		/* FALLTHROUGH */
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    39
@@ -202,7 +203,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    40
 			rprintf(FINFO,
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    41
 				"[%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
    42
 				"about to call exit(%d)\n",
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    43
-				who_am_i(), unmodified_code, file, line, code);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    44
+				who_am_i(), unmodified_code, basename((char *)file), line, code);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    45
 		}
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    46
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    47
 		/* FALLTHROUGH */
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    48
--- rsync-3.0.9/t_stub.c.orig	2011-02-21 11:32:48.000000000 -0800
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    49
+++ rsync-3.0.9/t_stub.c	2013-07-03 17:44:42.597023354 -0700
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    50
@@ -20,6 +20,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    51
  */
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    52
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    53
 #include "rsync.h"
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    54
+#include <libgen.h>
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
 int modify_window = 0;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    57
 int module_id = -1;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    58
@@ -54,7 +55,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    59
  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
    60
 {
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    61
 	fprintf(stderr, "exit(%d): %s(%d)\n",
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    62
-		code, file, line);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    63
+		code, basename((char *)file), line);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    64
 	exit(code);
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    65
 }
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    66
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    67
--- rsync-3.0.9/log.c.orig	2011-01-29 19:25:53.000000000 -0800
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    68
+++ rsync-3.0.9/log.c	2013-07-03 18:12:34.878333604 -0700
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    69
@@ -21,6 +21,7 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    70
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    71
 #include "rsync.h"
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    72
 #include "ifuncs.h"
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    73
+#include <libgen.h>
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    74
 
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    75
 extern int verbose;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    76
 extern int dry_run;
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    77
@@ -829,10 +830,10 @@
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    78
 		/* 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
    79
 		if (code == RERR_VANISHED) {
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    80
 			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
    81
-				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
    82
+				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
    83
 		} else {
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    84
 			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
    85
-				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
    86
+				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
    87
 		}
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    88
 	}
0671d3e048aa 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset
    89
 }