Date: Tue, 19 Jun 2012 06:06:38 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237930 - in soc2012/jhagewood/diff: . diff Message-ID: <20120619060638.7083A106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Tue Jun 19 06:06:37 2012 New Revision: 237930 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237930 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 Tue Jun 19 05:55:56 2012 (r237929) +++ soc2012/jhagewood/diff/TODO Tue Jun 19 06:06:37 2012 (r237930) @@ -7,7 +7,7 @@ --show-function-line INCOMPLETE --unidirectional-new-file INCOMPLETE --normal COMPLETE Sets format to D_NORMAL in getopt_long(). ---supress-common-lines INCOMPLETE +--suppress-common-lines IN PROGRESS --GTYPE-group-format INCOMPLETE --line-format IN PROGRESS --LTYPE-line-format INCOMPLETE Modified: soc2012/jhagewood/diff/diff/diff.c ============================================================================== --- soc2012/jhagewood/diff/diff/diff.c Tue Jun 19 05:55:56 2012 (r237929) +++ soc2012/jhagewood/diff/diff/diff.c Tue Jun 19 06:06:37 2012 (r237930) @@ -67,7 +67,7 @@ OPT_STRIPCR, OPT_NORMAL, OPT_LEFTC, - OT_SUPCL, + OPT_SUPCL, OPT_GTYPE, OPT_LF, OPT_LLF, @@ -84,9 +84,9 @@ { "normal", no_argument, NULL, OPT_NORMAL }, { "line-format", required_argument, NULL, OPT_LF }, + { "suppress-common-lines", no_argument, NULL, OPT_SUPCL }, /* 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 }, { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, { "from-file", required_argument, NULL, OPT_FFILE }, @@ -102,7 +102,6 @@ /* XXX: UNIMPLEMENTED */ { "ignore-blank-lines", no_argument, NULL, 'B' }, { "ignore-space-change", no_argument, NULL, 'b' }, -/* XXX: -c is incompatible with GNU version */ { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, @@ -302,15 +301,18 @@ case OPT_NORMAL: format = D_NORMAL; break; + case OPT_SUPCL: + /* XXX To do: Complete --suppress-common-lines */ + break; case OPT_TSIZE: - if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 1 || l >= INT_MAX) - usage(); - tabsize = (int)l; - } else - tabsize = 8; - break; + if (optarg != NULL) { + l = strtol(optarg, &ep, 10); + if (*ep != '\0' || l < 1 || l >= INT_MAX) + usage(); + tabsize = (int)l; + } else + tabsize = 8; + break; case OPT_STRIPCR: strip_cr=1; break; Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Tue Jun 19 05:55:56 2012 (r237929) +++ soc2012/jhagewood/diff/hagewood-diff.patch Tue Jun 19 06:06:37 2012 (r237930) @@ -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-18 03:07:38.000000000 -0400 -+++ jhagewood/diff/diff/diff.c 2012-06-19 05:12:45.000000000 -0400 ++++ jhagewood/diff/diff/diff.c 2012-06-19 06:04:34.000000000 -0400 @@ -18,15 +18,13 @@ * Materiel Command, USAF, under agreement number F39502-99-1-0512. */ @@ -43,7 +43,13 @@ /* Options which exceed manageable alphanumeric assignments */ -@@ -74,7 +72,6 @@ enum +@@ -69,12 +67,11 @@ enum + OPT_STRIPCR, + OPT_NORMAL, + OPT_LEFTC, +- OT_SUPCL, ++ OPT_SUPCL, + OPT_GTYPE, OPT_LF, OPT_LLF, OPT_TSIZE, @@ -59,18 +65,23 @@ + { "normal", no_argument, NULL, OPT_NORMAL }, - { "left-column", no_argument, NULL, OPT_LEFTC }, -+ { "line-format", required_argument, NULL, OPT_LF }, +- { "suppress-common-lines", no_argument, NULL, OT_SUPCL }, +- { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, + { "line-format", required_argument, NULL, OPT_LF }, ++ { "suppress-common-lines", no_argument, NULL, OPT_SUPCL }, +/* 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 }, ++ { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, { "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 +106,7 @@ static struct option longopts[] = { +@@ -105,12 +102,10 @@ static struct option longopts[] = { + /* XXX: UNIMPLEMENTED */ + { "ignore-blank-lines", no_argument, NULL, 'B' }, + { "ignore-space-change", no_argument, NULL, 'b' }, +-/* XXX: -c is incompatible with GNU version */ { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, @@ -80,7 +91,7 @@ { "ed", no_argument, NULL, 'e' }, /* XXX: UNIMPLEMENTED { "show-function-line", required_argument, NULL, 'F' }, */ -@@ -129,7 +125,6 @@ static struct option longopts[] = { +@@ -129,7 +124,6 @@ static struct option longopts[] = { { "report-identical-files", no_argument, NULL, 's' }, { "initial-tab", no_argument, NULL, 'T' }, { "expand-tabs", no_argument, NULL, 't' }, @@ -88,7 +99,7 @@ { "unified", optional_argument, NULL, 'U' }, { "version", no_argument, NULL, 'v' }, /* XXX: UNIMPLEMENTED -@@ -162,10 +157,10 @@ void read_excludes_file(char *); +@@ -162,10 +156,10 @@ void read_excludes_file(char *); int main(int argc, char **argv) { @@ -103,7 +114,7 @@ oargv = argv; oargc = argc; -@@ -197,6 +192,7 @@ main(int argc, char **argv) +@@ -197,6 +191,7 @@ main(int argc, char **argv) break; case 'C': case 'c': @@ -111,7 +122,7 @@ format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10); -@@ -213,6 +209,9 @@ main(int argc, char **argv) +@@ -213,6 +208,9 @@ main(int argc, char **argv) case 'd': dflag = 1; break; @@ -121,7 +132,7 @@ case 'e': format = D_EDIT; break; -@@ -296,6 +295,13 @@ main(int argc, char **argv) +@@ -296,15 +294,25 @@ main(int argc, char **argv) case 'y': yflag = 1; break; @@ -132,10 +143,30 @@ + case OPT_NORMAL: + format = D_NORMAL; + break; ++ case OPT_SUPCL: ++ /* XXX To do: Complete --suppress-common-lines */ ++ break; case OPT_TSIZE: - if (optarg != NULL) { - l = strtol(optarg, &ep, 10); -@@ -402,11 +408,10 @@ main(int argc, char **argv) +- if (optarg != NULL) { +- l = strtol(optarg, &ep, 10); +- if (*ep != '\0' || l < 1 || l >= INT_MAX) +- usage(); +- tabsize = (int)l; +- } else +- tabsize = 8; +- break; ++ if (optarg != NULL) { ++ l = strtol(optarg, &ep, 10); ++ if (*ep != '\0' || l < 1 || l >= INT_MAX) ++ usage(); ++ tabsize = (int)l; ++ } else ++ tabsize = 8; ++ break; + case OPT_STRIPCR: + strip_cr=1; + break; +@@ -402,11 +410,10 @@ main(int argc, char **argv) void * emalloc(size_t n) { @@ -148,7 +179,7 @@ if ((p = malloc(n)) == NULL) errx(2, NULL); return (p); -@@ -415,7 +420,7 @@ emalloc(size_t n) +@@ -415,7 +422,7 @@ emalloc(size_t n) void * erealloc(void *p, size_t n) { @@ -157,7 +188,7 @@ if (n == 0) errx(2, NULL); -@@ -431,13 +436,12 @@ erealloc(void *p, size_t n) +@@ -431,13 +438,12 @@ erealloc(void *p, size_t n) int easprintf(char **ret, const char *fmt, ...) { @@ -173,7 +204,7 @@ if (len < 0 || *ret == NULL) errx(2, NULL); return (len); -@@ -446,11 +450,12 @@ easprintf(char **ret, const char *fmt, . +@@ -446,11 +452,12 @@ easprintf(char **ret, const char *fmt, . char * estrdup(const char *str) { @@ -188,7 +219,7 @@ strlcpy(cp, str, len); return (cp); } -@@ -531,6 +536,7 @@ push_ignore_pats(char *pattern) +@@ -531,6 +538,7 @@ push_ignore_pats(char *pattern) void print_only(const char *path, size_t dirlen, const char *entry) { @@ -196,7 +227,7 @@ if (dirlen > 1) dirlen--; printf("Only in %.*s: %s\n", (int)dirlen, path, entry); -@@ -539,45 +545,46 @@ print_only(const char *path, size_t dirl +@@ -539,45 +547,46 @@ print_only(const char *path, size_t dirl void print_status(int val, char *path1, char *path2, char *entry) { @@ -254,7 +285,7 @@ break; } } -@@ -585,6 +592,7 @@ print_status(int val, char *path1, char +@@ -585,6 +594,7 @@ print_status(int val, char *path1, char void usage(void) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120619060638.7083A106564A>