socsvn commit: r238917 - in soc2012/jhagewood: diff diff/diff sdiff
sdiff/sdiff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Tue Jul 3 16:58:46 UTC 2012
Author: jhagewood
Date: Tue Jul 3 16:58:43 2012
New Revision: 238917
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238917
Log:
Modified:
soc2012/jhagewood/diff/diff/diff.c
soc2012/jhagewood/diff/hagewood-diff.patch
soc2012/jhagewood/sdiff/TODO
soc2012/jhagewood/sdiff/hagewood-sdiff.patch
soc2012/jhagewood/sdiff/sdiff/sdiff.c
Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c Tue Jul 3 15:54:20 2012 (r238916)
+++ soc2012/jhagewood/diff/diff/diff.c Tue Jul 3 16:58:43 2012 (r238917)
@@ -355,7 +355,7 @@
case OPT_NEW_GF:
case OPT_OLD_GF:
case OPT_UNCHGD_GF:
- /* XXX To do: Coplete --GTYPE-group-format. */
+ /* XXX To do: Complete --GTYPE-group-format. */
format = D_GF;
group_format = optarg;
break;
Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch Tue Jul 3 15:54:20 2012 (r238916)
+++ soc2012/jhagewood/diff/hagewood-diff.patch Tue Jul 3 16:58:43 2012 (r238917)
@@ -1,6 +1,6 @@
diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c
--- 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
++++ jhagewood/diff/diff/diff.c 2012-07-03 15:59:52.000000000 -0400
@@ -1,4 +1,4 @@
-/*-
+/*
@@ -292,7 +292,7 @@
+ case OPT_NEW_GF:
+ case OPT_OLD_GF:
+ case OPT_UNCHGD_GF:
-+ /* XXX To do: Coplete --GTYPE-group-format. */
++ /* XXX To do: Complete --GTYPE-group-format. */
+ format = D_GF;
+ group_format = optarg;
+ break;
@@ -664,7 +664,7 @@
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-07-02 15:05:57.000000000 -0400
-+++ jhagewood/diff/diff/diffreg.c 2012-07-02 15:05:57.000000000 -0400
++++ jhagewood/diff/diff/diffreg.c 2012-07-03 16:22:08.000000000 -0400
@@ -62,15 +62,13 @@
* @(#)diffreg.c 8.1 (Berkeley) 6/6/93
*/
Modified: soc2012/jhagewood/sdiff/TODO
==============================================================================
--- soc2012/jhagewood/sdiff/TODO Tue Jul 3 15:54:20 2012 (r238916)
+++ soc2012/jhagewood/sdiff/TODO Tue Jul 3 16:58:43 2012 (r238917)
@@ -1,6 +1,8 @@
Combine diff-spec args and pipe to diff INCOMPLETE
Test script COMPLETE
Adapt code to FreeBSD style guidelines INCOMPLETE
+Fix --width output indention IN PROGRESS
+
NOTES:
Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch
==============================================================================
--- soc2012/jhagewood/sdiff/hagewood-sdiff.patch Tue Jul 3 15:54:20 2012 (r238916)
+++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch Tue Jul 3 16:58:43 2012 (r238917)
@@ -1,6 +1,15 @@
diff -rupN jhagewood/sdiff/sdiff-orig/sdiff.c jhagewood/sdiff/sdiff/sdiff.c
--- jhagewood/sdiff/sdiff-orig/sdiff.c 2012-07-02 15:05:58.000000000 -0400
-+++ jhagewood/sdiff/sdiff/sdiff.c 2012-07-02 16:34:59.000000000 -0400
++++ jhagewood/sdiff/sdiff/sdiff.c 2012-07-03 16:56:41.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include "common.h"
+ #include "extern.h"
+
+-#define WIDTH 130
++#define WIDTH 128
+ /*
+ * Each column must be at least one character wide, plus three
+ * characters between the columns (space, [<|>], space).
@@ -101,7 +101,8 @@ enum {
HLINES_OPT,
LFILES_OPT,
@@ -11,25 +20,22 @@
/* pid from the diff parent (if applicable) */
DIFF_PID,
-@@ -604,7 +605,7 @@ println(const char *s1, const char div,
- }
-
- /* Otherwise, we pad this column up to width. */
-- for (; col < width; ++col)
-+ for (; col < width-1; ++col)
- putchar(' ');
-
- /*
-@@ -612,10 +613,10 @@ println(const char *s1, const char div,
- * need to add the space for padding.
- */
- if (!s2) {
-- printf(" %c\n", div);
-+ printf("%c\n", div);
- return;
- }
-- printf(" %c ", div);
-+ printf("%c ", div);
- col += 3;
+@@ -363,7 +364,9 @@ main(int argc, char **argv)
+ diffargv[diffargc++] = NULL;
- /* Skip angle bracket and space. */
+ /* Subtract column divider and divide by two. */
+- width = (wflag - 3) / 2;
++ width = ((wflag - 3) / 2) - 2;
++ if (!wflag)
++ width = ((wflag - 3) / 2);
+ /* Make sure line_width can fit in size_t. */
+ if (width > (SIZE_MAX - 3) / 2)
+ errx(2, "width is too large: %zu", width);
+@@ -383,7 +386,6 @@ main(int argc, char **argv)
+ err(2, "child could not duplicate descriptor");
+ /* Free unused descriptor. */
+ close(fd[1]);
+-
+ execvp(diffprog, diffargv);
+ err(2, "could not execute diff: %s", diffprog);
+ break;
Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff/sdiff.c Tue Jul 3 15:54:20 2012 (r238916)
+++ soc2012/jhagewood/sdiff/sdiff/sdiff.c Tue Jul 3 16:58:43 2012 (r238917)
@@ -34,7 +34,7 @@
#include "common.h"
#include "extern.h"
-#define WIDTH 130
+#define WIDTH 128
/*
* Each column must be at least one character wide, plus three
* characters between the columns (space, [<|>], space).
@@ -364,7 +364,9 @@
diffargv[diffargc++] = NULL;
/* Subtract column divider and divide by two. */
- width = (wflag - 3) / 2;
+ width = ((wflag - 3) / 2) - 2;
+ if (!wflag)
+ width = ((wflag - 3) / 2);
/* Make sure line_width can fit in size_t. */
if (width > (SIZE_MAX - 3) / 2)
errx(2, "width is too large: %zu", width);
@@ -384,7 +386,6 @@
err(2, "child could not duplicate descriptor");
/* Free unused descriptor. */
close(fd[1]);
-
execvp(diffprog, diffargv);
err(2, "could not execute diff: %s", diffprog);
break;
@@ -605,7 +606,7 @@
}
/* Otherwise, we pad this column up to width. */
- for (; col < width-1; ++col)
+ for (; col < width; ++col)
putchar(' ');
/*
@@ -613,10 +614,10 @@
* need to add the space for padding.
*/
if (!s2) {
- printf("%c\n", div);
+ printf(" %c\n", div);
return;
}
- printf("%c ", div);
+ printf(" %c ", div);
col += 3;
/* Skip angle bracket and space. */
More information about the svn-soc-all
mailing list