socsvn commit: r238809 - in soc2012/jhagewood: diff diff3 mdocml
sdiff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Mon Jul 2 15:08:41 UTC 2012
Author: jhagewood
Date: Mon Jul 2 15:08:39 2012
New Revision: 238809
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238809
Log:
Modified:
soc2012/jhagewood/diff/hagewood-diff.patch
soc2012/jhagewood/diff3/hagewood-diff3.patch
soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch
soc2012/jhagewood/sdiff/TODO
soc2012/jhagewood/sdiff/sdiff-test.sh
Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch Mon Jul 2 14:03:19 2012 (r238808)
+++ soc2012/jhagewood/diff/hagewood-diff.patch Mon Jul 2 15:08:39 2012 (r238809)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c
---- jhagewood/diff/diff-orig/diff.c 2012-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff/diff/diff.c 2012-06-30 03:46:55.000000000 -0400
+--- jhagewood/diff/diff-orig/diff.c 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff/diff/diff.c 2012-07-02 15:05:57.000000000 -0400
@@ -1,4 +1,4 @@
-/*-
+/*
@@ -528,8 +528,8 @@
"usage: diff [-abdilpqTtw] [-I pattern] [-c | -e | -f | -n | -u]\n"
" [-L label] file1 file2\n"
diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h
---- jhagewood/diff/diff-orig/diff.h 2012-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff/diff/diff.h 2012-06-30 03:36:16.000000000 -0400
+--- jhagewood/diff/diff-orig/diff.h 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff/diff/diff.h 2012-07-02 15:05:57.000000000 -0400
@@ -48,6 +48,8 @@
#define D_NREVERSE 5 /* Reverse ed script with numbered
lines and no trailing . */
@@ -553,8 +553,8 @@
extern char ignore_file_case;
extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
diff -rupN jhagewood/diff/diff-orig/diffdir.c jhagewood/diff/diff/diffdir.c
---- jhagewood/diff/diff-orig/diffdir.c 2012-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff/diff/diffdir.c 2012-06-30 03:36:16.000000000 -0400
+--- jhagewood/diff/diff-orig/diffdir.c 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff/diff/diffdir.c 2012-07-02 15:05:57.000000000 -0400
@@ -20,14 +20,13 @@
#include <sys/cdefs.h>
@@ -663,8 +663,8 @@
strlcpy(path1 + plen1, dp->d_name, MAXPATHLEN - plen1);
if (stat(path1, &stb1) != 0) {
diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
---- jhagewood/diff/diff-orig/diffreg.c 2012-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff/diff/diffreg.c 2012-06-30 03:44:30.000000000 -0400
+--- jhagewood/diff/diff-orig/diffreg.c 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff/diff/diffreg.c 2012-07-02 15:05:57.000000000 -0400
@@ -62,15 +62,13 @@
* @(#)diffreg.c 8.1 (Berkeley) 6/6/93
*/
@@ -1354,8 +1354,8 @@
+ file2, buf2);
}
diff -rupN jhagewood/diff/diff-orig/pathnames.h jhagewood/diff/diff/pathnames.h
---- jhagewood/diff/diff-orig/pathnames.h 2012-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff/diff/pathnames.h 2012-06-30 03:36:16.000000000 -0400
+--- jhagewood/diff/diff-orig/pathnames.h 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff/diff/pathnames.h 2012-07-02 15:05:57.000000000 -0400
@@ -23,4 +23,5 @@
#include <paths.h>
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jul 2 14:03:19 2012 (r238808)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Mon Jul 2 15:08:39 2012 (r238809)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
---- jhagewood/diff3/diff3-orig/Makefile 2012-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff3/diff3/Makefile 2012-06-30 03:36:16.000000000 -0400
+--- jhagewood/diff3/diff3-orig/Makefile 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff3/diff3/Makefile 2012-07-02 15:05:57.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-06-30 03:36:16.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-30 03:36:16.000000000 -0400
+--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-07-02 15:05:57.000000000 -0400
@@ -64,19 +64,23 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Mon Jul 2 14:03:19 2012 (r238808)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Mon Jul 2 15:08:39 2012 (r238809)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man.h jhagewood/mdocml/mdocml-1.12.1/man.h
---- jhagewood/mdocml/mdocml-1.12.1-orig/man.h 2012-06-30 03:36:17.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man.h 2012-06-30 03:36:17.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/man.h 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man.h 2012-07-02 15:05:58.000000000 -0400
@@ -43,6 +43,8 @@ enum mant {
MAN_sp,
MAN_nf,
@@ -12,7 +12,7 @@
MAN_DT,
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man.h.orig jhagewood/mdocml/mdocml-1.12.1/man.h.orig
--- jhagewood/mdocml/mdocml-1.12.1-orig/man.h.orig 1969-12-31 19:00:00.000000000 -0500
-+++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig 2012-06-30 03:36:17.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig 2012-07-02 15:05:58.000000000 -0400
@@ -0,0 +1,113 @@
+/* $Id: man.h,v 1.60 2012/01/03 15:16:24 kristaps Exp $ */
+/*
@@ -128,8 +128,8 @@
+
+#endif /*!MAN_H*/
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c jhagewood/mdocml/mdocml-1.12.1/man_term.c
---- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c 2012-06-30 03:36:17.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c 2012-06-30 03:36:17.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c 2012-07-02 15:05:58.000000000 -0400
@@ -82,6 +82,8 @@ static int pre_alternate(DECL_ARGS);
static int pre_ft(DECL_ARGS);
static int pre_ign(DECL_ARGS);
@@ -173,7 +173,7 @@
static int
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c.orig jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig
--- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c.orig 1969-12-31 19:00:00.000000000 -0500
-+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig 2012-06-30 03:36:17.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig 2012-07-02 15:05:58.000000000 -0400
@@ -0,0 +1,1117 @@
+/* $Id: man_term.c,v 1.127 2012/01/03 15:16:24 kristaps Exp $ */
+/*
Modified: soc2012/jhagewood/sdiff/TODO
==============================================================================
--- soc2012/jhagewood/sdiff/TODO Mon Jul 2 14:03:19 2012 (r238808)
+++ soc2012/jhagewood/sdiff/TODO Mon Jul 2 15:08:39 2012 (r238809)
@@ -0,0 +1,2 @@
+Combine diff-spec args and pipe to diff INCOMPLETE
+Test script IN PROGRESS
Modified: soc2012/jhagewood/sdiff/sdiff-test.sh
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff-test.sh Mon Jul 2 14:03:19 2012 (r238808)
+++ soc2012/jhagewood/sdiff/sdiff-test.sh Mon Jul 2 15:08:39 2012 (r238809)
@@ -0,0 +1,27 @@
+# Script for testing BSD sdiff outputs against GNU sdiff outputs.
+# Jesse Hagewood
+# jhagewood at freebsd.org
+
+#!/bin/sh
+
+rm -rf ./test_outputs
+mkdir ./test_outputs
+mkdir ./test_outputs/gnu
+mkdir ./test_outputs/bsd
+
+run () {
+
+}
+
+DIR_PATH="./test_outputs/gnu"
+DIFF_PATH="/usr/bin/sdiff"
+run "$DIFF_PATH" "$DIR_PATH"
+DIR_PATH="./test_outputs/bsd"
+DIFF_PATH="./sdiff"
+run "$DIFF_PATH" "$DIR_PATH"
+
+#
+# Get the diff between the GNU sdiff and BSD sdiff outputs.
+#
+
+diff -rupN ./test_outputs/gnu/ ./test_outputs/bsd/ >> ./test_outputs/gnu-bsd-sdiff.txt
More information about the svn-soc-all
mailing list