From owner-svn-soc-all@FreeBSD.ORG  Sat Jul  7 01:31:25 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 9EFCC106564A
	for <svn-soc-all@FreeBSD.org>; Sat,  7 Jul 2012 01:31:24 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sat, 07 Jul 2012 01:31:24 +0000
Date: Sat, 07 Jul 2012 01:31:24 +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: <20120707013124.9EFCC106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r239064 - in soc2012/jhagewood/sdiff: . sdiff
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: Sat, 07 Jul 2012 01:31:25 -0000

Author: jhagewood
Date: Sat Jul  7 01:31:24 2012
New Revision: 239064
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239064

Log:

Modified:
  soc2012/jhagewood/sdiff/hagewood-sdiff.patch
  soc2012/jhagewood/sdiff/sdiff/sdiff.c

Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch
==============================================================================
--- soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Sat Jul  7 01:26:52 2012	(r239063)
+++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Sat Jul  7 01:31:24 2012	(r239064)
@@ -12,7 +12,7 @@
  .Sh NAME
 diff -rupN jhagewood/sdiff/sdiff-orig/sdiff.c jhagewood/sdiff/sdiff/sdiff.c
 --- jhagewood/sdiff/sdiff-orig/sdiff.c	2012-07-02 15:05:58.000000000 -0400
-+++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-07 01:25:58.000000000 -0400
++++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-07 01:31:20.000000000 -0400
 @@ -101,7 +101,8 @@ enum {
        HLINES_OPT,
        LFILES_OPT,
@@ -181,24 +181,40 @@
  		putchar(*s);
  	}
  }
-@@ -527,13 +538,13 @@ prompt(const char *s1, const char *s2)
+@@ -527,30 +538,24 @@ prompt(const char *s1, const char *s2)
  			/* Choose left column as-is. */
  			if (s1 != NULL)
  				fprintf(outfp, "%s\n", s1);
 -
  			/* End of command parsing. */
  			break;
- 
+-
  		case 'q':
 -			goto QUIT;
 -
 +			fclose(outfp);
 +			exit(0);
-+			
  		case 'r':
  		case '2':
  			/* Choose right column as-is. */
-@@ -570,7 +581,7 @@ PROMPT:
+ 			if (s2 != NULL)
+ 				fprintf(outfp, "%s\n", s2);
+-
+ 			/* End of command parsing. */
+ 			break;
+-
+ 		case 's':
+ 			sflag = 1;
+ 			goto PROMPT;
+-
+ 		case 'v':
+ 			sflag = 0;
+ 			/* FALLTHROUGH */
+-
+ 		default:
+ 			/* Interactive usage help. */
+ USAGE:
+@@ -570,7 +575,7 @@ PROMPT:
  	 * If there was no error, we received an EOF from stdin, so we
  	 * should quit.
  	 */
@@ -207,7 +223,7 @@
  	fclose(outfp);
  	exit(0);
  }
-@@ -1103,24 +1114,22 @@ printd(FILE *file1, size_t file1end)
+@@ -1103,24 +1108,22 @@ printd(FILE *file1, size_t file1end)
  static void
  int_usage(void)
  {

Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff/sdiff.c	Sat Jul  7 01:26:52 2012	(r239063)
+++ soc2012/jhagewood/sdiff/sdiff/sdiff.c	Sat Jul  7 01:31:24 2012	(r239064)
@@ -540,28 +540,22 @@
 				fprintf(outfp, "%s\n", s1);
 			/* End of command parsing. */
 			break;
-
 		case 'q':
 			fclose(outfp);
 			exit(0);
-			
 		case 'r':
 		case '2':
 			/* Choose right column as-is. */
 			if (s2 != NULL)
 				fprintf(outfp, "%s\n", s2);
-
 			/* End of command parsing. */
 			break;
-
 		case 's':
 			sflag = 1;
 			goto PROMPT;
-
 		case 'v':
 			sflag = 0;
 			/* FALLTHROUGH */
-
 		default:
 			/* Interactive usage help. */
 USAGE: