Module Name: othersrc
Committed By: agc
Date: Tue Jan 15 01:57:56 UTC 2013
Modified Files:
othersrc/external/bsd/netdiff/dist: cmp.c diff_subr.c diffreg.c
netdiff.h
Log Message:
No need for a flags argument to the cmp_file() function.
Check that fp isn't NULL before trying to close it in diff_fini().
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/netdiff/dist/cmp.c
cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/netdiff/dist/diff_subr.c
cvs rdiff -u -r1.7 -r1.8 othersrc/external/bsd/netdiff/dist/diffreg.c
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/netdiff/dist/netdiff.h
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/cmp.c
diff -u othersrc/external/bsd/netdiff/dist/cmp.c:1.1 othersrc/external/bsd/netdiff/dist/cmp.c:1.2
--- othersrc/external/bsd/netdiff/dist/cmp.c:1.1 Tue Jan 15 01:49:23 2013
+++ othersrc/external/bsd/netdiff/dist/cmp.c Tue Jan 15 01:57:56 2013
@@ -51,7 +51,7 @@ main(int argc, char **argv)
break;
}
}
- cmp_file(&diff, argv[optind], argv[optind + 1], 0);
+ cmp_file(&diff, argv[optind], argv[optind + 1]);
if (diff_get_diffs(&diff, &s, &cc)) {
printf("%.*s", (int)cc, s);
}
Index: othersrc/external/bsd/netdiff/dist/diff_subr.c
diff -u othersrc/external/bsd/netdiff/dist/diff_subr.c:1.6 othersrc/external/bsd/netdiff/dist/diff_subr.c:1.7
--- othersrc/external/bsd/netdiff/dist/diff_subr.c:1.6 Tue Jan 15 01:46:03 2013
+++ othersrc/external/bsd/netdiff/dist/diff_subr.c Tue Jan 15 01:57:56 2013
@@ -382,16 +382,10 @@ diff_fini(diff_t *diff)
if (diff->start) {
free(diff->start);
}
- if (diff->label[0]) {
- free(diff->label[0]);
- }
- if (diff->label[1]) {
- free(diff->label[1]);
- }
if (diff->ignore) {
regfree(diff->ignore);
}
- if (diff->fp != stdout) {
+ if (diff->fp && diff->fp != stdout) {
fclose(diff->fp);
}
if (diff->exclc > 0) {
@@ -401,6 +395,9 @@ diff_fini(diff_t *diff)
free(diff->excludes);
}
for (i = 0 ; i < 2 ; i++) {
+ if (diff->label[i]) {
+ free(diff->label[i]);
+ }
if (diff->insertregion[i]) {
free(diff->insertregion[i]);
}
Index: othersrc/external/bsd/netdiff/dist/diffreg.c
diff -u othersrc/external/bsd/netdiff/dist/diffreg.c:1.7 othersrc/external/bsd/netdiff/dist/diffreg.c:1.8
--- othersrc/external/bsd/netdiff/dist/diffreg.c:1.7 Tue Jan 15 01:46:03 2013
+++ othersrc/external/bsd/netdiff/dist/diffreg.c Tue Jan 15 01:57:56 2013
@@ -1928,7 +1928,7 @@ closem:
/* byte by byte comparison a la cmp(1) */
static int
-cmp(diff_t *diff, file_t *f, int flags)
+cmp(diff_t *diff, file_t *f)
{
size_t diffc;
size_t line;
@@ -2336,7 +2336,7 @@ wdiff_mem(diff_t *diff, const char *m1,
/* compare two regular files byte by byte */
int
-cmp_file(diff_t *diff, const char *ofile1, const char *ofile2, int flags)
+cmp_file(diff_t *diff, const char *ofile1, const char *ofile2)
{
stone_t s;
file_t f[2];
@@ -2373,15 +2373,15 @@ cmp_file(diff_t *diff, const char *ofile
diff->status |= 2;
return D_MISMATCH1;
}
- if ((f[0].fp = openfile(diff, f[0].name, 0, flags)) == NULL) {
+ if ((f[0].fp = openfile(diff, f[0].name, 0, 0)) == NULL) {
warn("%s", f[0].name);
diff->status |= 2;
return D_MISMATCH1;
}
- if ((f[1].fp = openfile(diff, f[1].name, 1, flags)) == NULL) {
+ if ((f[1].fp = openfile(diff, f[1].name, 1, 0)) == NULL) {
warn("%s", f[1].name);
diff->status |= 2;
return D_MISMATCH1;
}
- return cmp(diff, f, flags);
+ return cmp(diff, f);
}
Index: othersrc/external/bsd/netdiff/dist/netdiff.h
diff -u othersrc/external/bsd/netdiff/dist/netdiff.h:1.4 othersrc/external/bsd/netdiff/dist/netdiff.h:1.5
--- othersrc/external/bsd/netdiff/dist/netdiff.h:1.4 Tue Jan 15 01:46:04 2013
+++ othersrc/external/bsd/netdiff/dist/netdiff.h Tue Jan 15 01:57:56 2013
@@ -75,6 +75,6 @@ int difference(diff_t */*diff*/, char */
int wdiff_file(diff_t */*diff*/, const char */*f1*/, const char */*f2*/);
int wdiff_mem(diff_t */*diff*/, const char */*m1*/, size_t /*size1*/, const char */*m2*/, size_t /*size2*/);
-int cmp_file(diff_t */*diff*/, const char */*file1*/, const char */*file2*/, int /*flags*/);
+int cmp_file(diff_t */*diff*/, const char */*file1*/, const char */*file2*/);
#endif
