socsvn commit: r239967 - in soc2012/jhagewood/diff: . diff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Tue Jul 31 19:17:28 UTC 2012
Author: jhagewood
Date: Tue Jul 31 19:17:25 2012
New Revision: 239967
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239967
Log:
Added -lz to CFLAGS in diff Makefile.
Modified:
soc2012/jhagewood/diff/diff/Makefile
soc2012/jhagewood/diff/diff/diffreg.c
soc2012/jhagewood/diff/hagewood-diff.patch
Modified: soc2012/jhagewood/diff/diff/Makefile
==============================================================================
--- soc2012/jhagewood/diff/diff/Makefile Tue Jul 31 18:47:17 2012 (r239966)
+++ soc2012/jhagewood/diff/diff/Makefile Tue Jul 31 19:17:25 2012 (r239967)
@@ -3,8 +3,8 @@
DEBUG_FLAGS+= -g
-PROG= diff xdiff
+PROG= diff zdiff
SRCS= diff.c diffdir.c diffreg.c
-CFLAGS+= -std=c99 -Wall -pedantic
+CFLAGS+= -std=c99 -Wall -pedantic -lz
.include <bsd.prog.mk>
Modified: soc2012/jhagewood/diff/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diffreg.c Tue Jul 31 18:47:17 2012 (r239966)
+++ soc2012/jhagewood/diff/diff/diffreg.c Tue Jul 31 19:17:25 2012 (r239967)
@@ -306,7 +306,7 @@
int
diffreg(char *ofile1, char *ofile2, int flags)
{
- char *buf;
+ char *buf = "";
char *file1 = ofile1;
char *file2 = ofile2;
FILE *f1 = NULL;
Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch Tue Jul 31 18:47:17 2012 (r239966)
+++ soc2012/jhagewood/diff/hagewood-diff.patch Tue Jul 31 19:17:25 2012 (r239967)
@@ -1,15 +1,17 @@
diff -rupN diff-orig/Makefile diff/Makefile
--- diff-orig/Makefile 2012-07-26 03:11:00.000000000 -0400
-+++ diff/Makefile 2012-07-26 03:11:00.000000000 -0400
-@@ -3,7 +3,7 @@
++++ diff/Makefile 2012-07-31 19:16:23.000000000 -0400
+@@ -3,8 +3,8 @@
DEBUG_FLAGS+= -g
-PROG= diff
-+PROG= diff xdiff
++PROG= diff zdiff
SRCS= diff.c diffdir.c diffreg.c
- CFLAGS+= -std=c99 -Wall -pedantic
+-CFLAGS+= -std=c99 -Wall -pedantic
++CFLAGS+= -std=c99 -Wall -pedantic -lz
+ .include <bsd.prog.mk>
diff -rupN diff-orig/diff.c diff/diff.c
--- diff-orig/diff.c 2012-07-26 03:11:00.000000000 -0400
+++ diff/diff.c 2012-07-26 03:11:00.000000000 -0400
@@ -800,7 +802,7 @@
if (stat(path1, &stb1) != 0) {
diff -rupN diff-orig/diffreg.c diff/diffreg.c
--- diff-orig/diffreg.c 2012-07-26 03:11:00.000000000 -0400
-+++ diff/diffreg.c 2012-07-30 13:11:25.000000000 -0400
++++ diff/diffreg.c 2012-07-31 19:11:25.000000000 -0400
@@ -62,15 +62,13 @@
* @(#)diffreg.c 8.1 (Berkeley) 6/6/93
*/
@@ -940,7 +942,7 @@
- int rval = D_SAME;
- int i, ostdout = -1;
- pid_t pid = -1;
-+ char *buf;
++ char *buf = "";
+ char *file1 = ofile1;
+ char *file2 = ofile2;
+ FILE *f1 = NULL;
More information about the svn-soc-all
mailing list