From owner-svn-soc-all@FreeBSD.ORG  Tue Jun  5 01:03:12 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 C09991065678
	for <svn-soc-all@FreeBSD.org>; Tue,  5 Jun 2012 01:03:10 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 05 Jun 2012 01:03:10 +0000
Date: Tue, 05 Jun 2012 01:03:10 +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: <20120605010310.C09991065678@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237105 - 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:03:12 -0000

Author: jhagewood
Date: Tue Jun  5 01:03:10 2012
New Revision: 237105
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237105

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 00:06:45 2012	(r237104)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c	Tue Jun  5 01:03:10 2012	(r237105)
@@ -169,7 +169,7 @@
 	{ "initial-tab",	no_argument,		NULL,	'T' },
 	{ "text",		no_argument,		NULL,	'a' },
 	{ "version",		no_argument,		NULL,	'v' },
-	{ "help",		no_argument,		NULL,	128 },	
+	{ "help",		no_argument,		NULL,	HELP_OPT },	
 	
 	/* features to implement */
 	{ "show-all",		no_argument,		NULL,	'A' },
@@ -229,7 +229,7 @@
 		case '3':
 			eflag = 2;
 			break;
-		case 128:
+		case HELP_OPT:
 			usage();
 			help();
 			exit(0);
@@ -715,7 +715,7 @@
 __dead void 
 try_help(void)
 {
-	fprintf(stderr, "diff3: Try `diff3 --help' for more information.");
+	fprintf(stderr, "diff3: Try `diff3 --help' for more information.\n");
 	exit(EXIT_FAILURE);
 }
 

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Tue Jun  5 00:06:45 2012	(r237104)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Tue Jun  5 01:03:10 2012	(r237105)
@@ -1,6 +1,6 @@
 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 00:06:08.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-05 01:02:57.000000000 -0400
 @@ -151,7 +151,9 @@ void separate(const char *);
  __dead void edscript(int);
  __dead void trouble(void);
@@ -18,7 +18,7 @@
  	{ "text",		no_argument,		NULL,	'a' },
 -
 +	{ "version",		no_argument,		NULL,	'v' },
-+	{ "help",		no_argument,		NULL,	128 },	
++	{ "help",		no_argument,		NULL,	HELP_OPT },	
 +	
  	/* features to implement */
  	{ "show-all",		no_argument,		NULL,	'A' },
@@ -47,7 +47,7 @@
  		case '3':
  			eflag = 2;
  			break;
-+		case 128:
++		case HELP_OPT:
 +			usage();
 +			help();
 +			exit(0);
@@ -74,7 +74,7 @@
 +__dead void 
 +try_help(void)
 +{
-+	fprintf(stderr, "diff3: Try `diff3 --help' for more information.");
++	fprintf(stderr, "diff3: Try `diff3 --help' for more information.\n");
 +	exit(EXIT_FAILURE);
 +}
 +