socsvn commit: r238518 - in soc2012/jhagewood: diff diff/diff diff3
mdocml
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Fri Jun 29 02:27:01 UTC 2012
Author: jhagewood
Date: Fri Jun 29 02:26:58 2012
New Revision: 238518
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238518
Log:
Modified:
soc2012/jhagewood/diff/diff/diff.c
soc2012/jhagewood/diff/hagewood-diff.patch
soc2012/jhagewood/diff3/hagewood-diff3.patch
soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch
Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c Fri Jun 29 01:55:20 2012 (r238517)
+++ soc2012/jhagewood/diff/diff/diff.c Fri Jun 29 02:26:58 2012 (r238518)
@@ -147,11 +147,32 @@
};
static const char *help_msg[] = {
-"-a --text treat files as ASCII text",
-"-B --ignore-blank-lines Ignore blank newlines in the comparison",
-"-b --ignore-space-change Ignore all changes due to whitespace",
-"-C NUM --context=[NUM] Show NUM lines before and after change (default 3)",
-"-D --ifdef=NAME",
+"\t-a --text treat files as ASCII text",
+"\t-B --ignore-blank-lines Ignore blank newlines in the comparison",
+"\t-b --ignore-space-change Ignore all changes due to whitespace",
+"\t-C -c NUM --context=NUM Show NUM lines before and after change (default 3)",
+"\t-D --ifdef=NAME Output merged file with `#ifdef NAME' diffs",
+"\t-E --ignore-tab-expansion Ignore tab expansion in the comparison",
+"\t-e --ed Output an ed script",
+"\t-F --show-function-line=RE Show the most recent line matching RE",
+"\t-f --forward-ed Output a forward ed script",
+"\t-I --ignore-matching-lines=RE Ignore changes whose lines all match RE",
+"\t-i --ignore-case Ignore case differences in file contents",
+"\t-L --label=NAME Label file header",
+"\t-l --paginate Paginates output through pr",
+"\t-N --new-file Treat new files as empty",
+"\t-n --rcs Output an RCS format diff",
+"\t-P --unidirectional-new-file Treat absent-first files as empty",
+"\t-p --show-c-function Show which C function each change is in",
+"\t-q --brief report only when files differ",
+"\t-r --recursive Recursively compare any sub-directories found",
+"\t-S --starting-file=FILE Start with FILE when comparing directories",
+"\t-s --report-identical-files Report when two files are the same",
+"\t-T --initial-tab Make tabs line up by prepending a tab",
+"\t-t --expand-tabs Expand tabs to spaces in output",
+"\t-U -u NUM --unified=NUM Show NUM lines of unified context",
+"\t-v --version Show diff version",
+"\t-w --width=NUM Output at most NUM (default 130) print columns"
NULL,
};
char **help_strs = (char **)help_msg;
Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch Fri Jun 29 01:55:20 2012 (r238517)
+++ soc2012/jhagewood/diff/hagewood-diff.patch Fri Jun 29 02:26:58 2012 (r238518)
@@ -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-28 02:16:56.000000000 -0400
-+++ jhagewood/diff/diff/diff.c 2012-06-28 14:21:49.000000000 -0400
+--- jhagewood/diff/diff-orig/diff.c 2012-06-28 18:13:23.287983517 -0400
++++ jhagewood/diff/diff/diff.c 2012-06-28 22:26:40.173964963 -0400
@@ -1,4 +1,4 @@
-/*-
+/*
@@ -56,7 +56,7 @@
/* Options which exceed manageable alphanumeric assignments */
-@@ -69,75 +67,82 @@ enum
+@@ -69,84 +67,112 @@ enum
OPT_STRIPCR,
OPT_NORMAL,
OPT_LEFTC,
@@ -186,7 +186,42 @@
{ NULL, 0, NULL, '\0'}
};
-@@ -162,11 +167,12 @@ void read_excludes_file(char *);
+ static const char *help_msg[] = {
+-"-a --text treat files as ASCII text",
+-"-B --ignore-blank-lines Ignore blank newlines in the comparison",
+-"-b --ignore-space-change Ignore all changes due to whitespace",
+-"-C NUM --context=[NUM] Show NUM lines before and after change (default 3)",
+-"-D --ifdef=NAME",
++"\t-a --text treat files as ASCII text",
++"\t-B --ignore-blank-lines Ignore blank newlines in the comparison",
++"\t-b --ignore-space-change Ignore all changes due to whitespace",
++"\t-C -c NUM --context=NUM Show NUM lines before and after change (default 3)",
++"\t-D --ifdef=NAME Output merged file with `#ifdef NAME' diffs",
++"\t-E --ignore-tab-expansion Ignore tab expansion in the comparison",
++"\t-e --ed Output an ed script",
++"\t-F --show-function-line=RE Show the most recent line matching RE",
++"\t-f --forward-ed Output a forward ed script",
++"\t-I --ignore-matching-lines=RE Ignore changes whose lines all match RE",
++"\t-i --ignore-case Ignore case differences in file contents",
++"\t-L --label=NAME Label file header",
++"\t-l --paginate Paginates output through pr",
++"\t-N --new-file Treat new files as empty",
++"\t-n --rcs Output an RCS format diff",
++"\t-P --unidirectional-new-file Treat absent-first files as empty",
++"\t-p --show-c-function Show which C function each change is in",
++"\t-q --brief report only when files differ",
++"\t-r --recursive Recursively compare any sub-directories found",
++"\t-S --starting-file=FILE Start with FILE when comparing directories",
++"\t-s --report-identical-files Report when two files are the same",
++"\t-T --initial-tab Make tabs line up by prepending a tab",
++"\t-t --expand-tabs Expand tabs to spaces in output",
++"\t-U -u NUM --unified=NUM Show NUM lines of unified context",
++"\t-v --version Show diff version",
++"\t-w --width=NUM Output at most NUM (default 130) print columns"
+ NULL,
+ };
+ char **help_strs = (char **)help_msg;
+@@ -162,11 +188,12 @@ void read_excludes_file(char *);
int
main(int argc, char **argv)
{
@@ -204,7 +239,7 @@
oargv = argv;
oargc = argc;
gotstdin = 0;
-@@ -197,6 +203,7 @@ main(int argc, char **argv)
+@@ -197,6 +224,7 @@ main(int argc, char **argv)
break;
case 'C':
case 'c':
@@ -212,7 +247,7 @@
format = D_CONTEXT;
if (optarg != NULL) {
l = strtol(optarg, &ep, 10);
-@@ -213,6 +220,9 @@ main(int argc, char **argv)
+@@ -213,6 +241,9 @@ main(int argc, char **argv)
case 'd':
dflag = 1;
break;
@@ -222,7 +257,7 @@
case 'e':
format = D_EDIT;
break;
-@@ -296,15 +306,52 @@ main(int argc, char **argv)
+@@ -296,15 +327,52 @@ main(int argc, char **argv)
case 'y':
yflag = 1;
break;
@@ -283,7 +318,7 @@
case OPT_STRIPCR:
strip_cr=1;
break;
-@@ -328,20 +375,58 @@ main(int argc, char **argv)
+@@ -328,20 +396,58 @@ main(int argc, char **argv)
lastch = ch;
newarg = optind != prevoptind;
prevoptind = optind;
@@ -347,7 +382,7 @@
execv(_PATH_SDIFF, oargv);
_exit(127);
}
-@@ -380,7 +465,10 @@ main(int argc, char **argv)
+@@ -380,7 +486,10 @@ main(int argc, char **argv)
set_argstr(oargv, argv);
if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
if (format == D_IFDEF)
@@ -359,7 +394,7 @@
diffdir(argv[0], argv[1]);
} else {
if (S_ISDIR(stb1.st_mode)) {
-@@ -402,11 +490,10 @@ main(int argc, char **argv)
+@@ -402,11 +511,10 @@ main(int argc, char **argv)
void *
emalloc(size_t n)
{
@@ -372,7 +407,7 @@
if ((p = malloc(n)) == NULL)
errx(2, NULL);
return (p);
-@@ -415,7 +502,7 @@ emalloc(size_t n)
+@@ -415,7 +523,7 @@ emalloc(size_t n)
void *
erealloc(void *p, size_t n)
{
@@ -381,7 +416,7 @@
if (n == 0)
errx(2, NULL);
-@@ -431,13 +518,12 @@ erealloc(void *p, size_t n)
+@@ -431,13 +539,12 @@ erealloc(void *p, size_t n)
int
easprintf(char **ret, const char *fmt, ...)
{
@@ -397,7 +432,7 @@
if (len < 0 || *ret == NULL)
errx(2, NULL);
return (len);
-@@ -446,11 +532,12 @@ easprintf(char **ret, const char *fmt, .
+@@ -446,11 +553,12 @@ easprintf(char **ret, const char *fmt, .
char *
estrdup(const char *str)
{
@@ -412,7 +447,7 @@
strlcpy(cp, str, len);
return (cp);
}
-@@ -531,6 +618,7 @@ push_ignore_pats(char *pattern)
+@@ -531,6 +639,7 @@ push_ignore_pats(char *pattern)
void
print_only(const char *path, size_t dirlen, const char *entry)
{
@@ -420,7 +455,7 @@
if (dirlen > 1)
dirlen--;
printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
-@@ -539,45 +627,46 @@ print_only(const char *path, size_t dirl
+@@ -539,45 +648,46 @@ print_only(const char *path, size_t dirl
void
print_status(int val, char *path1, char *path2, char *entry)
{
@@ -478,7 +513,7 @@
break;
}
}
-@@ -585,6 +674,7 @@ print_status(int val, char *path1, char
+@@ -585,6 +695,7 @@ print_status(int val, char *path1, char
void
usage(void)
{
@@ -486,34 +521,9 @@
(void)fprintf(stderr,
"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-28 02:16:56.000000000 -0400
-+++ jhagewood/diff/diff/diff.h 2012-06-28 14:03:06.000000000 -0400
-@@ -48,6 +48,8 @@
- #define D_NREVERSE 5 /* Reverse ed script with numbered
- lines and no trailing . */
- #define D_BRIEF 6 /* Say if the files differ */
-+#define D_GF 7 /* Group format */
-+#define D_LF 8 /* Line format */
-
- /*
- * Output flags
-@@ -75,9 +77,9 @@ struct excludes {
- struct excludes *next;
- };
-
--extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
-- sflag, tflag, Tflag, wflag;
--extern int Bflag, strip_cr, tabsize;
-+extern int aflag, bflag, cflag, dflag, Eflag, Fromflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
-+ sflag, tflag, Tflag, Toflag, wflag;
-+extern int Bflag, strip_cr, suppress_cl, tabsize;
- extern int format, context, status;
- 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-28 02:16:56.000000000 -0400
-+++ jhagewood/diff/diff/diffdir.c 2012-06-28 02:16:56.000000000 -0400
+--- jhagewood/diff/diff-orig/diffdir.c 2012-06-28 18:13:23.287983517 -0400
++++ jhagewood/diff/diff/diffdir.c 2012-06-28 18:13:23.375983516 -0400
@@ -20,14 +20,13 @@
#include <sys/cdefs.h>
@@ -621,9 +631,34 @@
strlcpy(path1 + plen1, dp->d_name, MAXPATHLEN - plen1);
if (stat(path1, &stb1) != 0) {
+diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h
+--- jhagewood/diff/diff-orig/diff.h 2012-06-28 18:13:23.288983517 -0400
++++ jhagewood/diff/diff/diff.h 2012-06-28 18:13:23.376983516 -0400
+@@ -48,6 +48,8 @@
+ #define D_NREVERSE 5 /* Reverse ed script with numbered
+ lines and no trailing . */
+ #define D_BRIEF 6 /* Say if the files differ */
++#define D_GF 7 /* Group format */
++#define D_LF 8 /* Line format */
+
+ /*
+ * Output flags
+@@ -75,9 +77,9 @@ struct excludes {
+ struct excludes *next;
+ };
+
+-extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
+- sflag, tflag, Tflag, wflag;
+-extern int Bflag, strip_cr, tabsize;
++extern int aflag, bflag, cflag, dflag, Eflag, Fromflag, iflag, lflag, Nflag, Pflag, pflag, rflag,
++ sflag, tflag, Tflag, Toflag, wflag;
++extern int Bflag, strip_cr, suppress_cl, tabsize;
+ extern int format, context, status;
+ extern char ignore_file_case;
+ extern char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;
diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
---- jhagewood/diff/diff-orig/diffreg.c 2012-06-28 02:16:56.000000000 -0400
-+++ jhagewood/diff/diff/diffreg.c 2012-06-28 17:22:00.000000000 -0400
+--- jhagewood/diff/diff-orig/diffreg.c 2012-06-28 18:13:23.286983517 -0400
++++ jhagewood/diff/diff/diffreg.c 2012-06-28 18:13:23.374983516 -0400
@@ -62,15 +62,13 @@
* @(#)diffreg.c 8.1 (Berkeley) 6/6/93
*/
@@ -687,7 +722,7 @@
anychange = 0;
lastline = 0;
-@@ -353,7 +357,6 @@ diffreg(char *ofile1, char *ofile2, int
+@@ -353,7 +357,6 @@ diffreg(char *ofile1, char *ofile2, int
status |= 2;
goto closem;
}
@@ -695,7 +730,7 @@
switch (files_differ(f1, f2, flags)) {
case 0:
goto closem;
-@@ -365,7 +368,7 @@ diffreg(char *ofile1, char *ofile2, int
+@@ -365,7 +368,7 @@ diffreg(char *ofile1, char *ofile2, int
goto closem;
}
@@ -1304,8 +1339,8 @@
+ file2, buf2);
}
diff -rupN jhagewood/diff/diff-orig/pathnames.h jhagewood/diff/diff/pathnames.h
---- jhagewood/diff/diff-orig/pathnames.h 2012-06-28 02:16:56.000000000 -0400
-+++ jhagewood/diff/diff/pathnames.h 2012-06-28 02:16:56.000000000 -0400
+--- jhagewood/diff/diff-orig/pathnames.h 2012-06-28 18:13:23.281983517 -0400
++++ jhagewood/diff/diff/pathnames.h 2012-06-28 18:13:23.374983516 -0400
@@ -23,4 +23,5 @@
#include <paths.h>
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jun 29 01:55:20 2012 (r238517)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jun 29 02:26:58 2012 (r238518)
@@ -1,17 +1,6 @@
-diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
---- jhagewood/diff3/diff3-orig/Makefile 2012-06-28 02:16:56.000000000 -0400
-+++ jhagewood/diff3/diff3/Makefile 2012-06-28 02:16:57.000000000 -0400
-@@ -6,6 +6,6 @@ BINDIR= /usr/libexec
-
- beforeinstall:
- install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-- ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3
-+ ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3
-
- .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-28 02:16:56.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-28 02:16:57.000000000 -0400
+--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-28 18:13:23.389983516 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-28 18:13:23.422983515 -0400
@@ -64,19 +64,23 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
@@ -466,3 +455,14 @@
+ fprintf(stderr, "usage: diff3 %s file1 file2 file3\n", OPTIONS);
exit(EXIT_FAILURE);
}
+diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
+--- jhagewood/diff3/diff3-orig/Makefile 2012-06-28 18:13:23.390983516 -0400
++++ jhagewood/diff3/diff3/Makefile 2012-06-28 18:13:23.423983515 -0400
+@@ -6,6 +6,6 @@ BINDIR= /usr/libexec
+
+ beforeinstall:
+ install ${INSTALL_COPY}c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+- ${.CURDIR}/diff3.ksh ${DESTDIR}/usr/bin/diff3
++ ${.CURDIR}/diff3.sh ${DESTDIR}/usr/bin/diff3
+
+ .include <bsd.prog.mk>
Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Fri Jun 29 01:55:20 2012 (r238517)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml-ns.patch Fri Jun 29 02:26:58 2012 (r238518)
@@ -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-28 02:16:57.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man.h 2012-06-28 02:16:58.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/man.h 2012-06-28 18:13:23.821983512 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man.h 2012-06-28 18:13:24.149983509 -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-28 02:16:58.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man.h.orig 2012-06-28 18:13:24.137983510 -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-28 02:16:57.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/man_term.c 2012-06-28 02:16:58.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/man_term.c 2012-06-28 18:13:23.808983512 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c 2012-06-28 18:13:24.131983510 -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-28 02:16:58.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/man_term.c.orig 2012-06-28 18:13:24.146983510 -0400
@@ -0,0 +1,1117 @@
+/* $Id: man_term.c,v 1.127 2012/01/03 15:16:24 kristaps Exp $ */
+/*
More information about the svn-soc-all
mailing list