socsvn commit: r239603 - soc2012/jhagewood/diff3
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Fri Jul 20 03:09:18 UTC 2012
Author: jhagewood
Date: Fri Jul 20 03:09:16 2012
New Revision: 239603
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239603
Log:
Fixed file opening in diff3
Modified:
soc2012/jhagewood/diff3/TODO
soc2012/jhagewood/diff3/hagewood-diff3.patch
Modified: soc2012/jhagewood/diff3/TODO
==============================================================================
--- soc2012/jhagewood/diff3/TODO Fri Jul 20 03:08:12 2012 (r239602)
+++ soc2012/jhagewood/diff3/TODO Fri Jul 20 03:09:16 2012 (r239603)
@@ -6,6 +6,7 @@
--diff-program INCOMPLETE
Fixed binary detection COMPLETE
Test script COMPLETE
+Pipe to diff INCOMPLETE
- BUG: Goes to usage when argc < 5 FIX: argc < 3
- BUG: Would not open files correctly FIX: change which argv[] is passed
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jul 20 03:08:12 2012 (r239602)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jul 20 03:09:16 2012 (r239603)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
---- jhagewood/diff3/diff3-orig/Makefile 2012-07-18 16:22:12.000000000 -0400
-+++ jhagewood/diff3/diff3/Makefile 2012-07-18 16:22:12.000000000 -0400
+--- jhagewood/diff3/diff3-orig/Makefile 2012-07-19 17:32:16.000000000 -0400
++++ jhagewood/diff3/diff3/Makefile 2012-07-19 17:32:16.000000000 -0400
@@ -6,6 +6,6 @@ BINDIR= /usr/libexec
beforeinstall:
@@ -10,8 +10,8 @@
.include <bsd.prog.mk>
diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c
---- jhagewood/diff3/diff3-orig/diff3prog.c 2012-07-18 16:22:12.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-07-19 17:13:54.000000000 -0400
+--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-07-19 17:32:16.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-07-20 03:04:16.000000000 -0400
@@ -64,19 +64,23 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
@@ -181,7 +181,7 @@
- if ((fp[i] = fopen(argv[i + 2], "r")) == NULL)
- err(EXIT_FAILURE, "can't open %s", argv[i + 2]);
+ j = 0;
-+ for (i = 2; i >= 0; i++) {
++ for (i = 2; i >= 0; i--) {
+ if ((fp[j] = fopen(argv[(argc-1)-i], "r")) == NULL)
+ err(EXIT_FAILURE, "Can't open %s", argv[(argc-1)-i]);
+ if (strip_cr)
More information about the svn-soc-all
mailing list