socsvn commit: r239063 - in soc2012/jhagewood/sdiff: . sdiff

[jhagewood at FreeBSD.org]

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

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:10:59 2012	(r239062)
+++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch	Sat Jul  7 01:26:52 2012	(r239063)
@@ -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:10:58.000000000 -0400
++++ jhagewood/sdiff/sdiff/sdiff.c	2012-07-07 01:25:58.000000000 -0400
 @@ -101,7 +101,8 @@ enum {
        HLINES_OPT,
        LFILES_OPT,
@@ -181,7 +181,7 @@
  		putchar(*s);
  	}
  }
-@@ -527,13 +538,12 @@ prompt(const char *s1, const char *s2)
+@@ -527,13 +538,13 @@ prompt(const char *s1, const char *s2)
  			/* Choose left column as-is. */
  			if (s1 != NULL)
  				fprintf(outfp, "%s\n", s1);
@@ -190,13 +190,24 @@
  			break;
  
  		case 'q':
- 			goto QUIT;
+-			goto QUIT;
 -
++			fclose(outfp);
++			exit(0);
 +			
  		case 'r':
  		case '2':
  			/* Choose right column as-is. */
-@@ -1103,24 +1113,22 @@ printd(FILE *file1, size_t file1end)
+@@ -570,7 +581,7 @@ PROMPT:
+ 	 * If there was no error, we received an EOF from stdin, so we
+ 	 * should quit.
+ 	 */
+-QUIT:
++	 
+ 	fclose(outfp);
+ 	exit(0);
+ }
+@@ -1103,24 +1114,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:10:59 2012	(r239062)
+++ soc2012/jhagewood/sdiff/sdiff/sdiff.c	Sat Jul  7 01:26:52 2012	(r239063)
@@ -542,7 +542,8 @@
 			break;
 
 		case 'q':
-			goto QUIT;
+			fclose(outfp);
+			exit(0);
 			
 		case 'r':
 		case '2':
@@ -580,7 +581,7 @@
 	 * If there was no error, we received an EOF from stdin, so we
 	 * should quit.
 	 */
-QUIT:
+	 
 	fclose(outfp);
 	exit(0);
 }