From owner-svn-soc-all@FreeBSD.ORG  Tue Jun  5 01:17:58 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id E7C8F106564A
	for <svn-soc-all@FreeBSD.org>; Tue,  5 Jun 2012 01:17:55 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 05 Jun 2012 01:17:55 +0000
Date: Tue, 05 Jun 2012 01:17:55 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120605011755.E7C8F106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237107 - in soc2012/jhagewood/diff3: . diff3
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jun 2012 01:17:58 -0000

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);
 +}
 +