Date: Sun, 17 Jun 2012 04:32:44 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237827 - in soc2012/jhagewood/diff: . diff Message-ID: <20120617043244.DA8E31065670@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Sun Jun 17 04:32:44 2012 New Revision: 237827 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237827 Log: Modified: soc2012/jhagewood/diff/TODO soc2012/jhagewood/diff/diff/diff.c soc2012/jhagewood/diff/hagewood-diff.patch Modified: soc2012/jhagewood/diff/TODO ============================================================================== --- soc2012/jhagewood/diff/TODO Sun Jun 17 04:30:52 2012 (r237826) +++ soc2012/jhagewood/diff/TODO Sun Jun 17 04:32:44 2012 (r237827) @@ -9,7 +9,7 @@ --normal COMPLETE Sets format to D_NORMAL in getopt_long(). --supress-common-lines INCOMPLETE --GTYPE-group-format INCOMPLETE ---line-format INCOMPLETE +--line-format IN PROGRESS --LTYPE-line-format INCOMPLETE --from-file INCOMPLETE --to-file INCOMPLETE Modified: soc2012/jhagewood/diff/diff/diff.c ============================================================================== --- soc2012/jhagewood/diff/diff/diff.c Sun Jun 17 04:30:52 2012 (r237826) +++ soc2012/jhagewood/diff/diff/diff.c Sun Jun 17 04:32:44 2012 (r237827) @@ -85,11 +85,12 @@ static struct option longopts[] = { { "normal", no_argument, NULL, OPT_NORMAL }, + { "line-format", required_argument, NULL, OPT_LF }, /* XXX: UNIMPLEMENTED { "left-column", no_argument, NULL, OPT_LEFTC }, { "suppress-common-lines", no_argument, NULL, OT_SUPCL }, { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, - { "line-format", required_argument, NULL, OPT_LF }, + { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, { "from-file", required_argument, NULL, OPT_FFILE }, { "to-file", required_argument, NULL, OPT_TOFILE }, @@ -297,6 +298,10 @@ case 'y': yflag = 1; break; + case OPT_LF: + /* XXX To do: Complete --line-format. */ + format = D_IFDEF; + break; case OPT_NORMAL: format = D_NORMAL; break; Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Sun Jun 17 04:30:52 2012 (r237826) +++ soc2012/jhagewood/diff/hagewood-diff.patch Sun Jun 17 04:32:44 2012 (r237827) @@ -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-17 04:30:34.000000000 -0400 -+++ jhagewood/diff/diff/diff.c 2012-06-17 04:30:34.000000000 -0400 +--- jhagewood/diff/diff-orig/diff.c 2012-06-10 03:31:05.000000000 -0400 ++++ jhagewood/diff/diff/diff.c 2012-06-17 04:31:37.036993000 -0400 @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "pathnames.h" @@ -31,7 +31,7 @@ OPT_FFILE, OPT_TOFILE, OPT_HLINES, -@@ -84,14 +83,14 @@ enum +@@ -84,14 +83,15 @@ enum static struct option longopts[] = { @@ -39,17 +39,19 @@ + { "normal", no_argument, NULL, OPT_NORMAL }, - { "left-column", no_argument, NULL, OPT_LEFTC }, ++ { "line-format", required_argument, NULL, OPT_LF }, +/* XXX: UNIMPLEMENTED + { "left-column", no_argument, NULL, OPT_LEFTC }, { "suppress-common-lines", no_argument, NULL, OT_SUPCL }, { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, - { "line-format", required_argument, NULL, OPT_LF }, +- { "line-format", required_argument, NULL, OPT_LF }, ++ { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, - { "unidirectional-new-file", no_argument, NULL, OPT_UNINF }, { "from-file", required_argument, NULL, OPT_FFILE }, { "to-file", required_argument, NULL, OPT_TOFILE }, { "horizon-lines", required_argument, NULL, OPT_HLINES }, -@@ -109,8 +108,7 @@ static struct option longopts[] = { +@@ -109,8 +109,7 @@ static struct option longopts[] = { { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, @@ -59,7 +61,7 @@ { "ed", no_argument, NULL, 'e' }, /* XXX: UNIMPLEMENTED { "show-function-line", required_argument, NULL, 'F' }, */ -@@ -129,7 +127,6 @@ static struct option longopts[] = { +@@ -129,7 +128,6 @@ static struct option longopts[] = { { "report-identical-files", no_argument, NULL, 's' }, { "initial-tab", no_argument, NULL, 'T' }, { "expand-tabs", no_argument, NULL, 't' }, @@ -67,7 +69,7 @@ { "unified", optional_argument, NULL, 'U' }, { "version", no_argument, NULL, 'v' }, /* XXX: UNIMPLEMENTED -@@ -197,6 +194,7 @@ main(int argc, char **argv) +@@ -197,6 +195,7 @@ main(int argc, char **argv) break; case 'C': case 'c': @@ -75,7 +77,7 @@ format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10); -@@ -213,6 +211,9 @@ main(int argc, char **argv) +@@ -213,6 +212,9 @@ main(int argc, char **argv) case 'd': dflag = 1; break; @@ -85,17 +87,21 @@ case 'e': format = D_EDIT; break; -@@ -296,6 +297,9 @@ main(int argc, char **argv) +@@ -296,6 +298,13 @@ main(int argc, char **argv) case 'y': yflag = 1; break; ++ case OPT_LF: ++ /* XXX To do: Complete --line-format. */ ++ format = D_IFDEF; ++ break; + case OPT_NORMAL: + format = D_NORMAL; + break; case OPT_TSIZE: if (optarg != NULL) { l = strtol(optarg, &ep, 10); -@@ -548,7 +552,7 @@ print_status(int val, char *path1, char +@@ -548,7 +557,7 @@ print_status(int val, char *path1, char path1, entry ? entry : "", path2, entry ? entry : ""); break; case D_BINARY: @@ -105,8 +111,8 @@ break; case D_DIFFER: diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h ---- jhagewood/diff/diff-orig/diff.h 2012-06-17 04:30:34.000000000 -0400 -+++ jhagewood/diff/diff/diff.h 2012-06-17 04:30:34.000000000 -0400 +--- jhagewood/diff/diff-orig/diff.h 2012-06-10 03:31:05.000000000 -0400 ++++ jhagewood/diff/diff/diff.h 2012-06-13 05:07:22.000000000 -0400 @@ -75,7 +75,7 @@ struct excludes { struct excludes *next; }; @@ -117,8 +123,8 @@ extern int Bflag, strip_cr, tabsize; extern int format, context, status; diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c ---- jhagewood/diff/diff-orig/diffreg.c 2012-06-17 04:30:34.000000000 -0400 -+++ jhagewood/diff/diff/diffreg.c 2012-06-17 04:30:34.000000000 -0400 +--- jhagewood/diff/diff-orig/diffreg.c 2012-06-10 03:31:05.000000000 -0400 ++++ jhagewood/diff/diff/diffreg.c 2012-06-17 04:31:40.465581000 -0400 @@ -90,6 +90,12 @@ __FBSDID("$FreeBSD"); #include "diff.h" #include "pathnames.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120617043244.DA8E31065670>