socsvn commit: r237394 - in soc2012/jhagewood: diff diff3 mdocml
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Sun Jun 10 03:33:49 UTC 2012
Author: jhagewood
Date: Sun Jun 10 03:33:47 2012
New Revision: 237394
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237394
Log:
Modified:
soc2012/jhagewood/diff/hagewood-diff.patch
soc2012/jhagewood/diff3/hagewood-diff3.patch
soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch
Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch Sun Jun 10 03:29:40 2012 (r237393)
+++ soc2012/jhagewood/diff/hagewood-diff.patch Sun Jun 10 03:33:47 2012 (r237394)
@@ -0,0 +1,31 @@
+diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
+--- jhagewood/diff/diff-orig/diffreg.c 2012-06-10 03:31:05.000000000 -0400
++++ jhagewood/diff/diff/diffreg.c 2012-06-10 03:31:05.000000000 -0400
+@@ -1551,16 +1551,23 @@ dump_unified_vec(FILE *f1, FILE *f2)
+ static void
+ print_header(const char *file1, const char *file2)
+ {
++ struct tm *tm_ptr1, *tm_ptr2;
++ char buf1[256];
++ char buf2[256];
++ tm_ptr1 = localtime(&stb1.st_mtime);
++ tm_ptr2 = localtime(&stb2.st_mtime);
++ strftime(buf1, 256, "%Y-%m-%d %H:%M:%S %z", tm_ptr1);
++ strftime(buf2, 256, "%Y-%m-%d %H:%M:%S %z", tm_ptr2);
+ if (label[0] != NULL)
+ printf("%s %s\n", format == D_CONTEXT ? "***" : "---",
+ label[0]);
+ else
+- printf("%s %s\t%s", format == D_CONTEXT ? "***" : "---",
+- file1, ctime(&stb1.st_mtime));
++ printf("%s %s\t%s\n", format == D_CONTEXT ? "***" : "---",
++ file1, buf1);
+ if (label[1] != NULL)
+ printf("%s %s\n", format == D_CONTEXT ? "---" : "+++",
+ label[1]);
+ else
+- printf("%s %s\t%s", format == D_CONTEXT ? "---" : "+++",
+- file2, ctime(&stb2.st_mtime));
++ printf("%s %s\t%s\n", format == D_CONTEXT ? "---" : "+++",
++ file2, buf2);
+ }
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Sun Jun 10 03:29:40 2012 (r237393)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Sun Jun 10 03:33:47 2012 (r237394)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
---- jhagewood/diff3/diff3-orig/Makefile 2012-06-07 05:12:54.000000000 -0400
-+++ jhagewood/diff3/diff3/Makefile 2012-06-07 05:12:54.000000000 -0400
+--- jhagewood/diff3/diff3-orig/Makefile 2012-06-10 03:31:05.000000000 -0400
++++ jhagewood/diff3/diff3/Makefile 2012-06-10 03:31:05.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-07 05:12:54.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-09 05:08:37.000000000 -0400
+--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-10 03:31:05.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-10 03:31:05.000000000 -0400
@@ -64,24 +64,34 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch Sun Jun 10 03:29:40 2012 (r237393)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch Sun Jun 10 03:33:47 2012 (r237394)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc.c jhagewood/mdocml/mdocml-1.12.1/mdoc.c
---- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc.c 2012-06-07 05:12:55.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc.c 2012-06-07 05:12:56.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc.c 2012-06-10 03:31:06.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc.c 2012-06-10 03:31:06.000000000 -0400
@@ -70,7 +70,7 @@ const char *const __mdoc_macronames[MDOC
/* LINTED */
"Dx", "%Q", "br", "sp",
@@ -11,8 +11,8 @@
const char *const __mdoc_argnames[MDOC_ARG_MAX] = {
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc.h jhagewood/mdocml/mdocml-1.12.1/mdoc.h
---- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc.h 2012-06-07 05:12:55.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc.h 2012-06-07 05:12:56.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc.h 2012-06-10 03:31:06.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc.h 2012-06-10 03:31:06.000000000 -0400
@@ -136,6 +136,7 @@ enum mdoct {
MDOC_En,
MDOC_Dx,
@@ -22,8 +22,8 @@
MDOC_sp,
MDOC__U,
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_argv.c jhagewood/mdocml/mdocml-1.12.1/mdoc_argv.c
---- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_argv.c 2012-06-07 05:12:55.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_argv.c 2012-06-07 05:12:56.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_argv.c 2012-06-10 03:31:06.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc_argv.c 2012-06-10 03:31:06.000000000 -0400
@@ -264,6 +264,7 @@ static const struct mdocarg mdocargs[MDO
{ ARGSFL_NONE, NULL }, /* En */
{ ARGSFL_NONE, NULL }, /* Dx */
@@ -33,8 +33,8 @@
{ ARGSFL_NONE, NULL }, /* sp */
{ ARGSFL_NONE, NULL }, /* %U */
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_macro.c jhagewood/mdocml/mdocml-1.12.1/mdoc_macro.c
---- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_macro.c 2012-06-07 05:12:55.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_macro.c 2012-06-07 05:12:56.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_macro.c 2012-06-10 03:31:06.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc_macro.c 2012-06-10 03:31:06.000000000 -0400
@@ -188,6 +188,7 @@ const struct mdoc_macro __mdoc_macros[MD
{ obsolete, 0 }, /* En */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
@@ -44,8 +44,8 @@
{ in_line_eoln, 0 }, /* sp */
{ in_line_eoln, 0 }, /* %U */
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c
---- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c 2012-06-07 05:12:55.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c 2012-06-07 05:12:56.000000000 -0400
+--- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c 2012-06-10 03:31:06.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c 2012-06-10 03:31:06.000000000 -0400
@@ -115,6 +115,7 @@ static int termp_sh_pre(DECL_ARGS);
static int termp_sm_pre(DECL_ARGS);
static int termp_sp_pre(DECL_ARGS);
More information about the svn-soc-all
mailing list