socsvn commit: r238439 - in soc2012/jhagewood/diff: . diff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Thu Jun 28 02:53:22 UTC 2012
Author: jhagewood
Date: Thu Jun 28 02:53:19 2012
New Revision: 238439
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238439
Log:
Modified:
soc2012/jhagewood/diff/diff-test.sh
soc2012/jhagewood/diff/diff/diff.c
soc2012/jhagewood/diff/hagewood-diff.patch
Modified: soc2012/jhagewood/diff/diff-test.sh
==============================================================================
--- soc2012/jhagewood/diff/diff-test.sh Thu Jun 28 02:47:58 2012 (r238438)
+++ soc2012/jhagewood/diff/diff-test.sh Thu Jun 28 02:53:19 2012 (r238439)
@@ -80,7 +80,6 @@
$1 -y --suppress-common-lines 1.txt 2.txt >> $2/scl.txt
$1 --side-by-side --suppress-common-lines 1.txt 2.txt >> $2/scl.txt
-
# --line-format
$1 --line-format="%l %% %c'T'" 1.txt 2.txt >> $2/lf.txt
Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c Thu Jun 28 02:47:58 2012 (r238438)
+++ soc2012/jhagewood/diff/diff/diff.c Thu Jun 28 02:53:19 2012 (r238439)
@@ -93,7 +93,7 @@
*/
{ "brief", no_argument, NULL, 'q' },
- { "changed-group-format", required_Argument, NULL, OPT_CHGD_GF},
+ { "changed-group-format", required_argument, NULL, OPT_CHGD_GF},
{ "context", optional_argument, NULL, 'C' },
{ "ed", no_argument, NULL, 'e' },
{ "exclude", required_argument, NULL, 'x' },
@@ -122,7 +122,7 @@
{ "no-ignore-file-name-case", no_argument, NULL, OPT_NIGN_FN_CASE },
{ "normal", no_argument, NULL, OPT_NORMAL },
{ "old-line-format", required_argument, NULL, OPT_OLD_LF},
- { "old-group-format", required_argument, NULL OPT_OLD_GF},
+ { "old-group-format", required_argument, NULL, OPT_OLD_GF},
{ "paginate", no_argument, NULL, 'l' },
{ "recursive", no_argument, NULL, 'r' },
{ "report-identical-files", no_argument, NULL, 's' },
@@ -419,7 +419,8 @@
}
if (yflag) {
/* remove y flag from args and call sdiff */
- for (argv = oargv; argv && strcmp(*argv, "-y") != 0; argv++);
+ for (argv = oargv; argv && strcmp(*argv, "-y") != 0 &&
+ strcmp(*argv, "--side-by-side") != 0; argv++);
while(argv != &oargv[oargc]){
*argv= *(argv+1);
argv++;
Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch Thu Jun 28 02:47:58 2012 (r238438)
+++ soc2012/jhagewood/diff/hagewood-diff.patch Thu Jun 28 02:53:19 2012 (r238439)
@@ -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 02:16:56.000000000 -0400
-+++ jhagewood/diff/diff/diff.c 2012-06-28 02:16:56.000000000 -0400
++++ jhagewood/diff/diff/diff.c 2012-06-28 02:52:20.000000000 -0400
@@ -1,4 +1,4 @@
-/*-
+/*
@@ -111,7 +111,7 @@
+ */
+
+ { "brief", no_argument, NULL, 'q' },
-+ { "changed-group-format", required_Argument, NULL, OPT_CHGD_GF},
++ { "changed-group-format", required_argument, NULL, OPT_CHGD_GF},
{ "context", optional_argument, NULL, 'C' },
- { "ifdef", required_argument, NULL, 'D' },
- { "minimal", no_argument, NULL, 'd' },
@@ -152,7 +152,7 @@
+ { "no-ignore-file-name-case", no_argument, NULL, OPT_NIGN_FN_CASE },
+ { "normal", no_argument, NULL, OPT_NORMAL },
+ { "old-line-format", required_argument, NULL, OPT_OLD_LF},
-+ { "old-group-format", required_argument, NULL OPT_OLD_GF},
++ { "old-group-format", required_argument, NULL, OPT_OLD_GF},
+ { "paginate", no_argument, NULL, 'l' },
{ "recursive", no_argument, NULL, 'r' },
- { "starting-file", required_argument, NULL, 'S' },
@@ -283,7 +283,7 @@
case OPT_STRIPCR:
strip_cr=1;
break;
-@@ -328,20 +375,57 @@ main(int argc, char **argv)
+@@ -328,20 +375,58 @@ main(int argc, char **argv)
lastch = ch;
newarg = optind != prevoptind;
prevoptind = optind;
@@ -334,7 +334,8 @@
+ if (yflag) {
/* remove y flag from args and call sdiff */
- for(argv=oargv; argv && strcmp(*argv, "-y") != 0; argv++);
-+ for (argv = oargv; argv && strcmp(*argv, "-y") != 0; argv++);
++ for (argv = oargv; argv && strcmp(*argv, "-y") != 0 &&
++ strcmp(*argv, "--side-by-side") != 0; argv++);
while(argv != &oargv[oargc]){
- *argv=*(argv+1);
+ *argv= *(argv+1);
@@ -346,7 +347,7 @@
execv(_PATH_SDIFF, oargv);
_exit(127);
}
-@@ -380,7 +464,10 @@ main(int argc, char **argv)
+@@ -380,7 +465,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)
@@ -358,7 +359,7 @@
diffdir(argv[0], argv[1]);
} else {
if (S_ISDIR(stb1.st_mode)) {
-@@ -402,11 +489,10 @@ main(int argc, char **argv)
+@@ -402,11 +490,10 @@ main(int argc, char **argv)
void *
emalloc(size_t n)
{
@@ -371,7 +372,7 @@
if ((p = malloc(n)) == NULL)
errx(2, NULL);
return (p);
-@@ -415,7 +501,7 @@ emalloc(size_t n)
+@@ -415,7 +502,7 @@ emalloc(size_t n)
void *
erealloc(void *p, size_t n)
{
@@ -380,7 +381,7 @@
if (n == 0)
errx(2, NULL);
-@@ -431,13 +517,12 @@ erealloc(void *p, size_t n)
+@@ -431,13 +518,12 @@ erealloc(void *p, size_t n)
int
easprintf(char **ret, const char *fmt, ...)
{
@@ -396,7 +397,7 @@
if (len < 0 || *ret == NULL)
errx(2, NULL);
return (len);
-@@ -446,11 +531,12 @@ easprintf(char **ret, const char *fmt, .
+@@ -446,11 +532,12 @@ easprintf(char **ret, const char *fmt, .
char *
estrdup(const char *str)
{
@@ -411,7 +412,7 @@
strlcpy(cp, str, len);
return (cp);
}
-@@ -531,6 +617,7 @@ push_ignore_pats(char *pattern)
+@@ -531,6 +618,7 @@ push_ignore_pats(char *pattern)
void
print_only(const char *path, size_t dirlen, const char *entry)
{
@@ -419,7 +420,7 @@
if (dirlen > 1)
dirlen--;
printf("Only in %.*s: %s\n", (int)dirlen, path, entry);
-@@ -539,45 +626,46 @@ print_only(const char *path, size_t dirl
+@@ -539,45 +627,46 @@ print_only(const char *path, size_t dirl
void
print_status(int val, char *path1, char *path2, char *entry)
{
@@ -477,7 +478,7 @@
break;
}
}
-@@ -585,6 +673,7 @@ print_status(int val, char *path1, char
+@@ -585,6 +674,7 @@ print_status(int val, char *path1, char
void
usage(void)
{
More information about the svn-soc-all
mailing list