Date: Wed, 13 Jun 2012 05:12:57 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237593 - in soc2012/jhagewood: diff diff/diff diff3 Message-ID: <20120613051257.54F9B106566B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Wed Jun 13 05:12:56 2012 New Revision: 237593 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237593 Log: Modified: soc2012/jhagewood/diff/diff/diff.c soc2012/jhagewood/diff/diff/diff.h soc2012/jhagewood/diff/diff/diffreg.c soc2012/jhagewood/diff/hagewood-diff.patch soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff/diff/diff.c ============================================================================== --- soc2012/jhagewood/diff/diff/diff.c Wed Jun 13 04:59:55 2012 (r237592) +++ soc2012/jhagewood/diff/diff/diff.c Wed Jun 13 05:12:56 2012 (r237593) @@ -45,7 +45,7 @@ #include "diff.h" #include "pathnames.h" -int aflag, bflag, cflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; +int aflag, bflag, cflag, dflag, Eflag, iflag, lflag, Nflag, Pflag, pflag, rflag; int sflag, tflag, Tflag, wflag; int Bflag, yflag; int strip_cr, tabsize=8; @@ -109,8 +109,7 @@ { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, -/* XXX: UNIMPLEMENTED - { "ignore-tab-expansion", no_argument, NULL, 'E' }, */ + { "ignore-tab-expansion", no_argument, NULL, 'E' }, { "ed", no_argument, NULL, 'e' }, /* XXX: UNIMPLEMENTED { "show-function-line", required_argument, NULL, 'F' }, */ @@ -213,6 +212,9 @@ case 'd': dflag = 1; break; + case 'E': + Eflag = 1; + break; case 'e': format = D_EDIT; break; Modified: soc2012/jhagewood/diff/diff/diff.h ============================================================================== --- soc2012/jhagewood/diff/diff/diff.h Wed Jun 13 04:59:55 2012 (r237592) +++ soc2012/jhagewood/diff/diff/diff.h Wed Jun 13 05:12:56 2012 (r237593) @@ -75,7 +75,7 @@ struct excludes *next; }; -extern int aflag, bflag, cflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, +extern int aflag, bflag, cflag, dflag, Eflag, iflag, lflag, Nflag, Pflag, pflag, rflag, sflag, tflag, Tflag, wflag; extern int Bflag, strip_cr, tabsize; extern int format, context, status; Modified: soc2012/jhagewood/diff/diff/diffreg.c ============================================================================== --- soc2012/jhagewood/diff/diff/diffreg.c Wed Jun 13 04:59:55 2012 (r237592) +++ soc2012/jhagewood/diff/diff/diffreg.c Wed Jun 13 05:12:56 2012 (r237593) @@ -766,7 +766,8 @@ ixnew[j] = ctnew += skipline(f2); j++; } - if (bflag || wflag || iflag || Bflag) { + /* XXX Implement functionality for Eflag here */ + if (bflag || wflag || iflag || Bflag || Eflag) { for (;;) { c = getc(f1); d = getc(f2); Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Wed Jun 13 04:59:55 2012 (r237592) +++ soc2012/jhagewood/diff/hagewood-diff.patch Wed Jun 13 05:12:56 2012 (r237593) @@ -1,16 +1,26 @@ diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c --- jhagewood/diff/diff-orig/diff.c 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diff.c 2012-06-12 05:35:45.000000000 -0400 ++++ jhagewood/diff/diff/diff.c 2012-06-13 05:07:54.000000000 -0400 @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "pathnames.h" -int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; -+int aflag, bflag, cflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; ++int aflag, bflag, cflag, dflag, Eflag, iflag, lflag, Nflag, Pflag, pflag, rflag; int sflag, tflag, Tflag, wflag; int Bflag, yflag; int strip_cr, tabsize=8; -@@ -129,7 +129,6 @@ 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' }, +-/* XXX: UNIMPLEMENTED +- { "ignore-tab-expansion", no_argument, NULL, 'E' }, */ ++ { "ignore-tab-expansion", no_argument, NULL, 'E' }, + { "ed", no_argument, NULL, 'e' }, + /* XXX: UNIMPLEMENTED + { "show-function-line", required_argument, NULL, 'F' }, */ +@@ -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' }, @@ -18,7 +28,7 @@ { "unified", optional_argument, NULL, 'U' }, { "version", no_argument, NULL, 'v' }, /* XXX: UNIMPLEMENTED -@@ -197,6 +196,7 @@ main(int argc, char **argv) +@@ -197,6 +195,7 @@ main(int argc, char **argv) break; case 'C': case 'c': @@ -26,7 +36,17 @@ format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10); -@@ -548,7 +548,7 @@ print_status(int val, char *path1, char +@@ -213,6 +212,9 @@ main(int argc, char **argv) + case 'd': + dflag = 1; + break; ++ case 'E': ++ Eflag = 1; ++ break; + case 'e': + format = D_EDIT; + break; +@@ -548,7 +550,7 @@ print_status(int val, char *path1, char path1, entry ? entry : "", path2, entry ? entry : ""); break; case D_BINARY: @@ -37,20 +57,30 @@ case D_DIFFER: diff -rupN jhagewood/diff/diff-orig/diff.h jhagewood/diff/diff/diff.h --- jhagewood/diff/diff-orig/diff.h 2012-06-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diff.h 2012-06-12 05:34:04.000000000 -0400 ++++ jhagewood/diff/diff/diff.h 2012-06-13 05:07:22.000000000 -0400 @@ -75,7 +75,7 @@ struct excludes { struct excludes *next; }; -extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, -+extern int aflag, bflag, cflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, ++extern int aflag, bflag, cflag, dflag, Eflag, iflag, lflag, Nflag, Pflag, pflag, rflag, sflag, tflag, Tflag, wflag; 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-10 03:31:05.000000000 -0400 -+++ jhagewood/diff/diff/diffreg.c 2012-06-12 05:38:29.000000000 -0400 -@@ -1551,16 +1551,33 @@ dump_unified_vec(FILE *f1, FILE *f2) ++++ jhagewood/diff/diff/diffreg.c 2012-06-13 05:11:57.000000000 -0400 +@@ -766,7 +766,8 @@ check(char *file1, FILE *f1, char *file2 + ixnew[j] = ctnew += skipline(f2); + j++; + } +- if (bflag || wflag || iflag || Bflag) { ++ /* XXX Implement functionality for Eflag here */ ++ if (bflag || wflag || iflag || Bflag || Eflag) { + for (;;) { + c = getc(f1); + d = getc(f2); +@@ -1551,16 +1552,33 @@ dump_unified_vec(FILE *f1, FILE *f2) static void print_header(const char *file1, const char *file2) { Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Wed Jun 13 04:59:55 2012 (r237592) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Wed Jun 13 05:12:56 2012 (r237593) @@ -11,7 +11,7 @@ .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-10 03:31:05.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-13 03:11:53.000000000 -0400 ++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-13 03:11:59.000000000 -0400 @@ -64,22 +64,31 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ @@ -25,7 +25,7 @@ #endif +#endif /* not lint */ +#include <sys/cdefs.h> -+__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237577 2012-06-13 03:04:35Z jhagewood $"); ++__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237579 2012-06-13 03:11:56Z jhagewood $"); +#include <ctype.h> +#include <err.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120613051257.54F9B106566B>