From owner-svn-soc-all@FreeBSD.ORG  Tue Jul 10 19:38:30 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 24356106564A
	for <svn-soc-all@FreeBSD.org>; Tue, 10 Jul 2012 19:38:28 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 10 Jul 2012 19:38:28 +0000
Date: Tue, 10 Jul 2012 19:38:28 +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: <20120710193828.24356106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r239250 - 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: Tue, 10 Jul 2012 19:38:30 -0000

Author: jhagewood
Date: Tue Jul 10 19:38:27 2012
New Revision: 239250
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239250

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	Tue Jul 10 19:21:07 2012	(r239249)
+++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Tue Jul 10 19:38:27 2012	(r239250)
@@ -112,7 +112,7 @@
 +
 diff -rupN jhagewood/sdiff/sdiff-orig/sdiff.c jhagewood/sdiff/sdiff/sdiff.c
 --- jhagewood/sdiff/sdiff-orig/sdiff.c	2012-07-07 19:37:22.000000000 -0400
-+++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-10 19:20:43.000000000 -0400
++++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-10 19:38:25.000000000 -0400
 @@ -5,6 +5,14 @@
   * Public domain.
   */
@@ -264,7 +264,7 @@
  		case DIFFPROG_OPT:
  			diffargv[0] = diffprog = optarg;
  			break;
-@@ -289,26 +324,23 @@ main(int argc, char **argv)
+@@ -289,32 +324,27 @@ main(int argc, char **argv)
  			if (errstr)
  				errx(2, "width is %s: %s", errstr, optarg);
  			break;
@@ -294,9 +294,17 @@
 -	
 +		
  	/* no single switches were used */
- 	if( strcmp( diffargv[1], "-" ) == 0 )
- 	{
-@@ -362,19 +394,19 @@ main(int argc, char **argv)
+-	if( strcmp( diffargv[1], "-" ) == 0 )
+-	{
++	if (strcmp(diffargv[1], "-") == 0 ) {
+ 		int i;
+-		for(i=1; i<argc-1; i++)
+-		{
++		for ( i = 1; i < argc-1; i++) {
+ 			diffargv[i] = diffargv[i+1];
+ 		}
+ 		diffargv[diffargc-1] = NULL;
+@@ -362,19 +392,18 @@ main(int argc, char **argv)
  	/* Add NULL to end of array to indicate end of array. */
  	diffargv[diffargc++] = NULL;
  
@@ -311,8 +319,8 @@
 +	line_width = ((width + 3) * 2);
  
 -	if( ppid == -1 )
-+	if (ppid == -1 )
- 	{
+-	{
++	if (ppid == -1 ) {
  		if (pipe(fd))
  			err(2, "pipe");
  
@@ -321,7 +329,7 @@
  		case 0:
  			/* child */
  			/* We don't read from the pipe. */
-@@ -383,7 +415,6 @@ main(int argc, char **argv)
+@@ -383,7 +412,6 @@ main(int argc, char **argv)
  				err(2, "child could not duplicate descriptor");
  			/* Free unused descriptor. */
  			close(fd[1]);
@@ -329,7 +337,7 @@
  			execvp(diffprog, diffargv);
  			err(2, "could not execute diff: %s", diffprog);
  			break;
-@@ -461,6 +492,7 @@ main(int argc, char **argv)
+@@ -461,6 +489,7 @@ main(int argc, char **argv)
  static void
  printcol(const char *s, size_t *col, const size_t col_max)
  {
@@ -337,7 +345,7 @@
  	for (; *s && *col < col_max; ++s) {
  		size_t new_col;
  
-@@ -484,11 +516,9 @@ printcol(const char *s, size_t *col, con
+@@ -484,11 +513,9 @@ printcol(const char *s, size_t *col, con
  				return;
  			*col = new_col;
  			break;
@@ -349,7 +357,7 @@
  		putchar(*s);
  	}
  }
-@@ -527,30 +557,24 @@ prompt(const char *s1, const char *s2)
+@@ -527,30 +554,24 @@ prompt(const char *s1, const char *s2)
  			/* Choose left column as-is. */
  			if (s1 != NULL)
  				fprintf(outfp, "%s\n", s1);
@@ -382,7 +390,7 @@
  		default:
  			/* Interactive usage help. */
  USAGE:
-@@ -570,7 +594,7 @@ PROMPT:
+@@ -570,7 +591,7 @@ PROMPT:
  	 * If there was no error, we received an EOF from stdin, so we
  	 * should quit.
  	 */
@@ -391,7 +399,15 @@
  	fclose(outfp);
  	exit(0);
  }
-@@ -1103,24 +1127,22 @@ printd(FILE *file1, size_t file1end)
+@@ -854,6 +875,7 @@ enqueue(char *left, char div, char *righ
+ static void
+ freediff(struct diffline *diffp)
+ {
++	
+ 	free(diffp->left);
+ 	free(diffp->right);
+ 	free(diffp);
+@@ -1103,24 +1125,23 @@ printd(FILE *file1, size_t file1end)
  static void
  int_usage(void)
  {
@@ -403,6 +419,7 @@
 -	    "r | 2:\tchoose right diff\n"
 -	    "s:\tsilent mode--don't print identical lines\n"
 -	    "v:\tverbose mode--print identical lines\n"
++	
 +	printf("%s", "e:\tedit blank diff\n",
 +	    "eb:\tedit both diffs concatenated\n",
 +	    "el:\tedit left diff\n",

Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff/sdiff.c	Tue Jul 10 19:21:07 2012	(r239249)
+++ soc2012/jhagewood/sdiff/sdiff/sdiff.c	Tue Jul 10 19:38:27 2012	(r239250)
@@ -342,11 +342,9 @@
 	}
 		
 	/* no single switches were used */
-	if( strcmp( diffargv[1], "-" ) == 0 )
-	{
+	if (strcmp(diffargv[1], "-") == 0 ) {
 		int i;
-		for(i=1; i<argc-1; i++)
-		{
+		for ( i = 1; i < argc-1; i++) {
 			diffargv[i] = diffargv[i+1];
 		}
 		diffargv[diffargc-1] = NULL;
@@ -401,8 +399,7 @@
 		errx(2, "width is too large: %zu", width);
 	line_width = ((width + 3) * 2);
 
-	if (ppid == -1 )
-	{
+	if (ppid == -1 ) {
 		if (pipe(fd))
 			err(2, "pipe");
 
@@ -878,6 +875,7 @@
 static void
 freediff(struct diffline *diffp)
 {
+	
 	free(diffp->left);
 	free(diffp->right);
 	free(diffp);
@@ -1127,6 +1125,7 @@
 static void
 int_usage(void)
 {
+	
 	printf("%s", "e:\tedit blank diff\n",
 	    "eb:\tedit both diffs concatenated\n",
 	    "el:\tedit left diff\n",