socsvn commit: r237280 - in soc2012/jhagewood/diff3: . diff3

jhagewood at FreeBSD.org jhagewood at FreeBSD.org
Thu Jun 7 23:42:35 UTC 2012


Author: jhagewood
Date: Thu Jun  7 23:42:32 2012
New Revision: 237280
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237280

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	Thu Jun  7 23:33:07 2012	(r237279)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c	Thu Jun  7 23:42:32 2012	(r237280)
@@ -82,7 +82,6 @@
 
 /* diff3 - 3-way differential file comparison */
 
-extern char const *__progname;
 char const __version[] = "8.1";
 
 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
@@ -155,9 +154,8 @@
 void remove_cr(FILE *);
 __dead void trouble(void);
 void increase(void);
-__dead void try_help(void);
 void help(void);
-void usage(void);
+__dead void usage(void);
 
 enum {  
     HELP_OPT = CHAR_MAX + 1,
@@ -225,7 +223,7 @@
 			oflag = eflag = 1;
 			break;
 		case 'v':
-			printf("FreeBSD %s %s\n", __progname, __version);
+			printf("FreeBSD diff3 %s\n" __version);
 			exit(0);
 		case 'x':
 			eflag = 1;
@@ -234,7 +232,6 @@
 			eflag = 2;
 			break;
 		case HELP_OPT:
-			usage();
 			help();
 			exit(0);
 		case STRIPCR_OPT:
@@ -743,14 +740,6 @@
 	szchanges = newsz;
 }
 
-
-__dead void 
-try_help(void)
-{
-	fprintf(stderr, "%s: Try `%s --help' for more information.\n", __progname, __progname);
-	exit(EXIT_FAILURE);
-}
-
 void 
 help(void)
 {
@@ -770,11 +759,11 @@
 	
 }
 
-void
+__dead void
 usage(void)
 {
 
-	fprintf(stderr, "usage: %s [-exEX3] /tmp/d3a.?????????? "
-	    "/tmp/d3b.?????????? file1 file2 file3\n", __progname);
-	    
+	fprintf(stderr, "usage: diff3 [-exEX3] /tmp/d3a.?????????? "
+	    "/tmp/d3b.?????????? file1 file2 file3\n");
+	exit(EXIT_FAILURE);
 }

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Thu Jun  7 23:33:07 2012	(r237279)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Thu Jun  7 23:42:32 2012	(r237280)
@@ -11,28 +11,25 @@
  .include <bsd.prog.mk>
 diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c
 --- jhagewood/diff3/diff3-orig/diff3prog.c	2012-06-07 05:12:54.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c	2012-06-07 05:45:37.000000000 -0400
-@@ -82,6 +82,9 @@
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-07 23:42:04.000000000 -0400
+@@ -82,6 +82,8 @@
  
  /* diff3 - 3-way differential file comparison */
  
-+extern char const *__progname;
 +char const __version[] = "8.1";
 +
  /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
   *
   * d13 = diff report on f1 vs f3
-@@ -149,33 +152,38 @@ void prange(struct range *);
+@@ -149,33 +151,37 @@ void prange(struct range *);
  void repos(int);
  void separate(const char *);
  __dead void edscript(int);
 +void remove_cr(FILE *);
  __dead void trouble(void);
  void increase(void);
--__dead void usage(void);
-+__dead void try_help(void);
 +void help(void);
-+void usage(void);
+ __dead void usage(void);
  
  enum {  
 -        HELP_OPT = CHAR_MAX + 1,
@@ -69,12 +66,12 @@
  };
  
  
-@@ -216,12 +224,19 @@ main(int argc, char **argv)
+@@ -216,12 +222,18 @@ main(int argc, char **argv)
  		case 'X':
  			oflag = eflag = 1;
  			break;
 +		case 'v':
-+			printf("FreeBSD %s %s\n", __progname, __version);
++			printf("FreeBSD diff3 %s\n" __version);
 +			exit(0);
  		case 'x':
  			eflag = 1;
@@ -83,13 +80,12 @@
  			eflag = 2;
  			break;
 +		case HELP_OPT:
-+			usage();
 +			help();
 +			exit(0);
  		case STRIPCR_OPT:
  			strip_cr = 1;
  			break;
-@@ -233,8 +248,10 @@ main(int argc, char **argv)
+@@ -233,8 +245,10 @@ main(int argc, char **argv)
  	argc -= optind;
  	argv += optind;
  	/* XXX - argc usage seems wrong here */
@@ -101,7 +97,7 @@
  
  	if (oflag) {
  		(void)snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s",
-@@ -254,6 +271,8 @@ main(int argc, char **argv)
+@@ -254,6 +268,8 @@ main(int argc, char **argv)
  	for (i = 0; i <= 2; i++) {
  		if ((fp[i] = fopen(argv[i + 2], "r")) == NULL)
  			err(EXIT_FAILURE, "can't open %s", argv[i + 2]);
@@ -110,7 +106,7 @@
  	}
  	merge(m, n);
  	exit(EXIT_SUCCESS);
-@@ -606,6 +625,32 @@ repos(int nchar)
+@@ -606,6 +622,32 @@ repos(int nchar)
  		(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
  }
  
@@ -143,18 +139,10 @@
  __dead void
  trouble(void)
  {
-@@ -699,12 +744,37 @@ increase(void)
+@@ -698,13 +740,30 @@ increase(void)
+ 	szchanges = newsz;
  }
  
- 
--__dead void
-+__dead void 
-+try_help(void)
-+{
-+	fprintf(stderr, "%s: Try `%s --help' for more information.\n", __progname, __progname);
-+	exit(EXIT_FAILURE);
-+}
-+
 +void 
 +help(void)
 +{
@@ -173,14 +161,15 @@
 +	--help  Output this help.\n\n");
 +	
 +}
-+
-+void
+ 
+ __dead void
  usage(void)
  {
 -	extern char *__progname;
  
- 	fprintf(stderr, "usage: %s [-exEX3] /tmp/d3a.?????????? "
- 	    "/tmp/d3b.?????????? file1 file2 file3\n", __progname);
--	exit(EXIT_FAILURE);
-+	    
+-	fprintf(stderr, "usage: %s [-exEX3] /tmp/d3a.?????????? "
+-	    "/tmp/d3b.?????????? file1 file2 file3\n", __progname);
++	fprintf(stderr, "usage: diff3 [-exEX3] /tmp/d3a.?????????? "
++	    "/tmp/d3b.?????????? file1 file2 file3\n");
+ 	exit(EXIT_FAILURE);
  }


More information about the svn-soc-all mailing list