Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/rsync/patches/7070857.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 823 dc5bf8bfadaa
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
823
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     1
 
--- rsync-3.0.8/main.c.orig	Tue Feb 22 08:21:08 2011
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     2
 
+++ rsync-3.0.8/main.c	Tue May 15 23:45:20 2012
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -1100,7 +1100,7 @@
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     4
 
 	for (i = 0; argv[i]; i++) {
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     5
 
 		if (!(argv[i] = strdup(argv[i]))) {
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     6
 
 			rprintf (FERROR, "out of memory at %s(%d)\n",
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     7
 
-				 __FILE__, __LINE__);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     8
 
+				 basename(__FILE__), __LINE__);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
     9
 
 			return RERR_MALLOC;
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    10
 
 		}
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    11
 
 	}
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    12
 
--- rsync-3.0.8/cleanup.c.orig	Mon Feb 21 10:20:58 2011
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    13
 
+++ rsync-3.0.8/cleanup.c	Tue May 15 23:45:56 2012
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    14
 
@@ -126,7 +126,7 @@
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    15
 
 		if (verbose > 3) {
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    16
 
 			rprintf(FINFO,
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    17
 
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    18
 
-				who_am_i(), code, file, line);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    19
 
+				who_am_i(), code, basename(file), line);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    20
 
 		}
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    21
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    22
 
 		/* FALLTHROUGH */
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    23
 
@@ -202,7 +202,7 @@
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    24
 
 			rprintf(FINFO,
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    25
 
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    26
 
 				"about to call exit(%d)\n",
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    27
 
-				who_am_i(), unmodified_code, file, line, code);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    28
 
+				who_am_i(), unmodified_code, basename(file), line, code);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    29
 
 		}
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    30
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    31
 
 		/* FALLTHROUGH */
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    32
 
--- rsync-3.0.8/t_stub.c.orig	Mon Feb 21 11:32:48 2011
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    33
 
+++ rsync-3.0.8/t_stub.c	Tue May 15 23:46:28 2012
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    34
 
@@ -54,7 +54,7 @@
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    35
 
  void _exit_cleanup(int code, const char *file, int line)
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    36
 
 {
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    37
 
 	fprintf(stderr, "exit(%d): %s(%d)\n",
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    38
 
-		code, file, line);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    39
 
+		code, basename(file), line);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    40
 
 	exit(code);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    41
 
 }
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    42
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    43
 
--- rsync-3.0.8/log.c.orig	Wed May 16 15:59:20 2012
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    44
 
+++ rsync-3.0.8/log.c	Wed May 16 15:57:39 2012
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    45
 
@@ -829,10 +829,10 @@
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    46
 
 		/* VANISHED is not an error, only a warning */
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    47
 
 		if (code == RERR_VANISHED) {
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    48
 
 			rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    49
 
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    50
 
+				name, code, basename(file), line, who_am_i(), RSYNC_VERSION);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    51
 
 		} else {
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    52
 
 			rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    53
 
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    54
 
+				name, code, basename(file), line, who_am_i(), RSYNC_VERSION);
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    55
 
 		}
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    56
 
 	}
dc5bf8bfadaa 7070857 rsync is unnecessarily verbose about internal paths
Praveen Dasaraju <Praveen.Dasaraju@Oracle.COM>
parents:
diff changeset 
    57
 
 }
upstream/oracle/userland-gate