socsvn commit: r237244 - in soc2012/jhagewood: diff3 diff3/diff3
mdocml
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Thu Jun 7 05:45:54 UTC 2012
Author: jhagewood
Date: Thu Jun 7 05:45:50 2012
New Revision: 237244
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237244
Log:
Modified:
soc2012/jhagewood/diff3/diff3/diff3prog.c
soc2012/jhagewood/diff3/hagewood-diff3.patch
soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch
Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c
==============================================================================
--- soc2012/jhagewood/diff3/diff3/diff3prog.c Thu Jun 7 05:12:11 2012 (r237243)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c Thu Jun 7 05:45:50 2012 (r237244)
@@ -638,7 +638,7 @@
while (ch != EOF) {
fgetpos(f, &position);
ch = fgetc(f);
- if (ch == '\r' && fgetc(f) == EOF) {
+ if ((ch == '\r' || ch == '\n') && fgetc(f) == EOF) {
tcr_pos = position;
break;
}
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Thu Jun 7 05:12:11 2012 (r237243)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Thu Jun 7 05:45:50 2012 (r237244)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/diff3/diff3-orig/Makefile jhagewood/diff3/diff3/Makefile
---- jhagewood/diff3/diff3-orig/Makefile 2012-06-04 23:30:11.000000000 -0400
-+++ jhagewood/diff3/diff3/Makefile 2012-06-05 01:41:11.000000000 -0400
+--- 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
@@ -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-04 23:30:11.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 20:49:10.000000000 -0400
+--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-07 05:12:54.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-07 05:45:37.000000000 -0400
@@ -82,6 +82,9 @@
/* diff3 - 3-way differential file comparison */
@@ -127,7 +127,7 @@
+ while (ch != EOF) {
+ fgetpos(f, &position);
+ ch = fgetc(f);
-+ if (ch == '\r' && fgetc(f) == EOF) {
++ if ((ch == '\r' || ch == '\n') && fgetc(f) == EOF) {
+ tcr_pos = position;
+ break;
+ }
Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch Thu Jun 7 05:12:11 2012 (r237243)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch Thu Jun 7 05:45:50 2012 (r237244)
@@ -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-04 23:30:13.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc.c 2012-06-07 04:44:06.000000000 -0400
+--- 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
@@ -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-04 23:30:13.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc.h 2012-06-07 04:44:25.000000000 -0400
+--- 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
@@ -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-04 23:30:13.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_argv.c 2012-06-07 04:44:51.000000000 -0400
+--- 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
@@ -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-04 23:30:13.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_macro.c 2012-06-07 04:51:20.000000000 -0400
+--- 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
@@ -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-04 23:30:13.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c 2012-06-07 05:10:26.000000000 -0400
+--- 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
@@ -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