socsvn commit: r238519 - in soc2012/jhagewood/diff: . diff

jhagewood at FreeBSD.org jhagewood at FreeBSD.org
Fri Jun 29 02:31:04 UTC 2012


Author: jhagewood
Date: Fri Jun 29 02:31:03 2012
New Revision: 238519
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238519

Log:

Modified:
  soc2012/jhagewood/diff/diff/diff.c
  soc2012/jhagewood/diff/hagewood-diff.patch

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Fri Jun 29 02:26:58 2012	(r238518)
+++ soc2012/jhagewood/diff/diff/diff.c	Fri Jun 29 02:31:03 2012	(r238519)
@@ -172,7 +172,12 @@
 "\t-t --expand-tabs  Expand tabs to spaces in output",
 "\t-U -u NUM --unified=NUM  Show NUM lines of unified context",
 "\t-v --version  Show diff version",
-"\t-w --width=NUM Output at most NUM (default 130) print columns"
+"\t-w --width=NUM Output at most NUM (default 130) print columns",
+"\t-X --exclude-from=FILE  Start with FILE when comparing directories",
+"\t-x --exclude=PAT  Exclude files that match PAT",
+"\t-y --side-by-side  Output difference in two columns",
+"\t--GTYPE-group-format=GFMT  Format GTYPE input groups with GFMT",
+"\t--LTYPE-line-format=LFMT  Format LTYPE input lines with LFMT",
 NULL,
 };
 char **help_strs = (char **)help_msg;

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Fri Jun 29 02:26:58 2012	(r238518)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Fri Jun 29 02:31:03 2012	(r238519)
@@ -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-28 18:13:23.287983517 -0400
-+++ jhagewood/diff/diff/diff.c	2012-06-28 22:26:40.173964963 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-28 22:30:55.077962845 -0400
 @@ -1,4 +1,4 @@
 -/*-
 +/*
@@ -56,7 +56,7 @@
  
  
  /* Options which exceed manageable alphanumeric assignments */ 
-@@ -69,84 +67,112 @@ enum
+@@ -69,84 +67,117 @@ enum
    OPT_STRIPCR,
    OPT_NORMAL,
    OPT_LEFTC,
@@ -217,11 +217,16 @@
 +"\t-t --expand-tabs  Expand tabs to spaces in output",
 +"\t-U -u NUM --unified=NUM  Show NUM lines of unified context",
 +"\t-v --version  Show diff version",
-+"\t-w --width=NUM Output at most NUM (default 130) print columns"
++"\t-w --width=NUM Output at most NUM (default 130) print columns",
++"\t-X --exclude-from=FILE  Start with FILE when comparing directories",
++"\t-x --exclude=PAT  Exclude files that match PAT",
++"\t-y --side-by-side  Output difference in two columns",
++"\t--GTYPE-group-format=GFMT  Format GTYPE input groups with GFMT",
++"\t--LTYPE-line-format=LFMT  Format LTYPE input lines with LFMT",
  NULL,
  };
  char **help_strs = (char **)help_msg;
-@@ -162,11 +188,12 @@ void read_excludes_file(char *);
+@@ -162,11 +193,12 @@ void read_excludes_file(char *);
  int
  main(int argc, char **argv)
  {
@@ -239,7 +244,7 @@
  	oargv = argv;
  	oargc = argc;
  	gotstdin = 0;
-@@ -197,6 +224,7 @@ main(int argc, char **argv)
+@@ -197,6 +229,7 @@ main(int argc, char **argv)
  			break;
  		case 'C':
  		case 'c':
@@ -247,7 +252,7 @@
  			format = D_CONTEXT;
  			if (optarg != NULL) {
  				l = strtol(optarg, &ep, 10);
-@@ -213,6 +241,9 @@ main(int argc, char **argv)
+@@ -213,6 +246,9 @@ main(int argc, char **argv)
  		case 'd':
  			dflag = 1;
  			break;
@@ -257,7 +262,7 @@
  		case 'e':
  			format = D_EDIT;
  			break;
-@@ -296,15 +327,52 @@ main(int argc, char **argv)
+@@ -296,15 +332,52 @@ main(int argc, char **argv)
  		case 'y':
  			yflag = 1;
  			break;
@@ -318,7 +323,7 @@
  		case OPT_STRIPCR:
  			strip_cr=1;
  			break;
-@@ -328,20 +396,58 @@ main(int argc, char **argv)
+@@ -328,20 +401,58 @@ main(int argc, char **argv)
  		lastch = ch;
  		newarg = optind != prevoptind;
  		prevoptind = optind;
@@ -382,7 +387,7 @@
  		execv(_PATH_SDIFF, oargv);
  		_exit(127);
  	}
-@@ -380,7 +486,10 @@ main(int argc, char **argv)
+@@ -380,7 +491,10 @@ main(int argc, char **argv)
  	set_argstr(oargv, argv);
  	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
  		if (format == D_IFDEF)
@@ -394,7 +399,7 @@
  		diffdir(argv[0], argv[1]);
  	} else {
  		if (S_ISDIR(stb1.st_mode)) {
-@@ -402,11 +511,10 @@ main(int argc, char **argv)
+@@ -402,11 +516,10 @@ main(int argc, char **argv)
  void *
  emalloc(size_t n)
  {
@@ -407,7 +412,7 @@
  	if ((p = malloc(n)) == NULL)
  		errx(2, NULL);
  	return (p);
-@@ -415,7 +523,7 @@ emalloc(size_t n)
+@@ -415,7 +528,7 @@ emalloc(size_t n)
  void *
  erealloc(void *p, size_t n)
  {
@@ -416,7 +421,7 @@
  
  	if (n == 0)
  		errx(2, NULL);
-@@ -431,13 +539,12 @@ erealloc(void *p, size_t n)
+@@ -431,13 +544,12 @@ erealloc(void *p, size_t n)
  int
  easprintf(char **ret, const char *fmt, ...)
  {
@@ -432,7 +437,7 @@
  	if (len < 0 || *ret == NULL)
  		errx(2, NULL);
  	return (len);
-@@ -446,11 +553,12 @@ easprintf(char **ret, const char *fmt, .
+@@ -446,11 +558,12 @@ easprintf(char **ret, const char *fmt, .
  char *
  estrdup(const char *str)
  {
@@ -447,7 +452,7 @@
  	strlcpy(cp, str, len);
  	return (cp);
  }
-@@ -531,6 +639,7 @@ push_ignore_pats(char *pattern)
+@@ -531,6 +644,7 @@ push_ignore_pats(char *pattern)
  void
  print_only(const char *path, size_t dirlen, const char *entry)
  {
@@ -455,7 +460,7 @@
  	if (dirlen > 1)
  		dirlen--;
  	printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
-@@ -539,45 +648,46 @@ print_only(const char *path, size_t dirl
+@@ -539,45 +653,46 @@ print_only(const char *path, size_t dirl
  void
  print_status(int val, char *path1, char *path2, char *entry)
  {
@@ -513,7 +518,7 @@
  		break;
  	}
  }
-@@ -585,6 +695,7 @@ print_status(int val, char *path1, char
+@@ -585,6 +700,7 @@ print_status(int val, char *path1, char
  void
  usage(void)
  {


More information about the svn-soc-all mailing list