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/15730984.patch
author klauw <ken.lauw@oracle.com>
Tue, 18 Jun 2013 13:15:45 -0700
changeset 1351 5c589218fa09
child 1406 bad4899167db
permissions -rw-r--r--
15752593 SUNBT7107925 bump rsync to 3.0.9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1351
5c589218fa09 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
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     2
 
+++ rsync-3.0.9/main.c	2013-04-19 14:14:00.331981573 -0700
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     3
 
@@ -1100,7 +1100,7 @@
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     4
 
 	for (i = 0; argv[i]; i++) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     5
 
 		if (!(argv[i] = strdup(argv[i]))) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     6
 
 			rprintf (FERROR, "out of memory at %s(%d)\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     7
 
-				 __FILE__, __LINE__);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     8
 
+				 basename(__FILE__), __LINE__);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
     9
 
 			return RERR_MALLOC;
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    10
 
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    11
 
 	}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    12
 
--- rsync-3.0.9/cleanup.c.orig	2011-02-21 10:20:58.000000000 -0800
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    13
 
+++ rsync-3.0.9/cleanup.c	2013-04-19 14:14:00.332420836 -0700
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    14
 
@@ -126,7 +126,7 @@
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    15
 
 		if (verbose > 3) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    16
 
 			rprintf(FINFO,
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    17
 
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    18
 
-				who_am_i(), code, file, line);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    19
 
+				who_am_i(), code, basename(file), line);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    20
 
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    21
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    22
 
 		/* FALLTHROUGH */
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    23
 
@@ -202,7 +202,7 @@
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    24
 
 			rprintf(FINFO,
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    25
 
 				"[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    26
 
 				"about to call exit(%d)\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    27
 
-				who_am_i(), unmodified_code, file, line, code);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    28
 
+				who_am_i(), unmodified_code, basename(file), line, code);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    29
 
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    30
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    31
 
 		/* FALLTHROUGH */
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    32
 
--- rsync-3.0.9/t_stub.c.orig	2011-02-21 11:32:48.000000000 -0800
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    33
 
+++ rsync-3.0.9/t_stub.c	2013-04-19 14:14:00.332763107 -0700
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    34
 
@@ -54,7 +54,7 @@
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    35
 
  void _exit_cleanup(int code, const char *file, int line)
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    36
 
 {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    37
 
 	fprintf(stderr, "exit(%d): %s(%d)\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    38
 
-		code, file, line);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    39
 
+		code, basename(file), line);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    40
 
 	exit(code);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    41
 
 }
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    42
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    43
 
--- rsync-3.0.9/log.c.orig	2011-01-29 19:25:53.000000000 -0800
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    44
 
+++ rsync-3.0.9/log.c	2013-04-19 14:14:00.333124681 -0700
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    45
 
@@ -829,10 +829,10 @@
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    46
 
 		/* VANISHED is not an error, only a warning */
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    47
 
 		if (code == RERR_VANISHED) {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    48
 
 			rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    49
 
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    50
 
+				name, code, basename(file), line, who_am_i(), RSYNC_VERSION);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    51
 
 		} else {
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    52
 
 			rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    53
 
-				name, code, file, line, who_am_i(), RSYNC_VERSION);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    54
 
+				name, code, basename(file), line, who_am_i(), RSYNC_VERSION);
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    55
 
 		}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    56
 
 	}
5c589218fa09 15752593 SUNBT7107925 bump rsync to 3.0.9
klauw <ken.lauw@oracle.com>
parents:
diff changeset 
    57
 
 }
upstream/oracle/userland-gate