Module Name: othersrc
Committed By: agc
Date: Thu Sep 18 02:35:32 UTC 2014
Modified Files:
othersrc/external/bsd/netdiff/dist: mem.c qdiff.c
Log Message:
use the correct variable to push a file to exclude onto the stack.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/netdiff/dist/mem.c
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/netdiff/dist/qdiff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/netdiff/dist/mem.c
diff -u othersrc/external/bsd/netdiff/dist/mem.c:1.3 othersrc/external/bsd/netdiff/dist/mem.c:1.4
--- othersrc/external/bsd/netdiff/dist/mem.c:1.3 Thu Sep 18 01:47:13 2014
+++ othersrc/external/bsd/netdiff/dist/mem.c Thu Sep 18 02:35:32 2014
@@ -276,10 +276,9 @@ static int
read_excludes_file(diff_t *diff, char *file)
{
FILE *fp;
- char *buf, *pattern;
+ char *buf;
size_t len;
- pattern = NULL;
if (strcmp(file, "-") == 0) {
fp = stdin;
} else if ((fp = fopen(file, "r")) == NULL) {
@@ -290,7 +289,7 @@ read_excludes_file(diff_t *diff, char *f
if (buf[len - 1] == '\n') {
len--;
}
- if (!push_excludes(diff, pattern, len)) {
+ if (!push_excludes(diff, buf, len)) {
return 0;
}
}
Index: othersrc/external/bsd/netdiff/dist/qdiff.c
diff -u othersrc/external/bsd/netdiff/dist/qdiff.c:1.4 othersrc/external/bsd/netdiff/dist/qdiff.c:1.5
--- othersrc/external/bsd/netdiff/dist/qdiff.c:1.4 Thu Sep 18 01:47:13 2014
+++ othersrc/external/bsd/netdiff/dist/qdiff.c Thu Sep 18 02:35:32 2014
@@ -275,10 +275,9 @@ static void
read_excludes_file(diff_t *diff, char *file)
{
FILE *fp;
- char *buf, *pattern;
+ char *buf;
size_t len;
- pattern = NULL;
if (strcmp(file, "-") == 0) {
fp = stdin;
} else if ((fp = fopen(file, "r")) == NULL) {
@@ -288,7 +287,7 @@ read_excludes_file(diff_t *diff, char *f
if (buf[len - 1] == '\n') {
len--;
}
- push_excludes(diff, pattern, len);
+ push_excludes(diff, buf, len);
}
if (strcmp(file, "-") != 0) {
fclose(fp);
