Date: Tue, 05 Jun 2012 01:17:55 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237107 - in soc2012/jhagewood/diff3: . diff3 Message-ID: <20120605011755.E7C8F106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Tue Jun 5 01:17:55 2012 New Revision: 237107 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237107 Log: Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3prog.c Tue Jun 5 01:14:45 2012 (r237106) +++ soc2012/jhagewood/diff3/diff3/diff3prog.c Tue Jun 5 01:17:55 2012 (r237107) @@ -83,7 +83,7 @@ /* diff3 - 3-way differential file comparison */ extern char const *__progname; -char const version_string[] = "8.1"; +char const __version[] = "8.1"; /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3] * @@ -224,7 +224,7 @@ oflag = eflag = 1; break; case 'v': - printf("FreeBSD %s %s\n", __progname, version_string); + printf("FreeBSD %s %s\n", __progname, __version); exit(0); case 'x': eflag = 1; @@ -718,7 +718,7 @@ __dead void try_help(void) { - fprintf(stderr, "diff3: Try `diff3 --help' for more information.\n"); + fprintf(stderr, "%s: Try `%s --help' for more information.\n", __progname, __progname); exit(EXIT_FAILURE); } Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 01:14:45 2012 (r237106) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 01:17:55 2012 (r237107) @@ -1,12 +1,12 @@ diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c --- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-04 23:30:11.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 01:13:37.000000000 -0400 ++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 01:17:18.000000000 -0400 @@ -82,6 +82,9 @@ /* diff3 - 3-way differential file comparison */ +extern char const *__progname; -+char const version_string[] = "8.1"; ++char const __version[] = "8.1"; + /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3] * @@ -59,7 +59,7 @@ oflag = eflag = 1; break; + case 'v': -+ printf("FreeBSD %s %s\n", __progname, version_string); ++ printf("FreeBSD %s %s\n", __progname, __version); + exit(0); case 'x': eflag = 1; @@ -94,7 +94,7 @@ +__dead void +try_help(void) +{ -+ fprintf(stderr, "diff3: Try `diff3 --help' for more information.\n"); ++ fprintf(stderr, "%s: Try `%s --help' for more information.\n", __progname, __progname); + exit(EXIT_FAILURE); +} +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120605011755.E7C8F106564A>