socsvn commit: r240505 - in soc2012/jhagewood: diff sdiff
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Sat Aug 18 22:04:54 UTC 2012
Author: jhagewood
Date: Sat Aug 18 22:04:52 2012
New Revision: 240505
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240505
Log:
Modified:
soc2012/jhagewood/diff/decompress.c
soc2012/jhagewood/diff/diffreg.c
soc2012/jhagewood/sdiff/decompress.c
Modified: soc2012/jhagewood/diff/decompress.c
==============================================================================
--- soc2012/jhagewood/diff/decompress.c Sat Aug 18 20:26:49 2012 (r240504)
+++ soc2012/jhagewood/diff/decompress.c Sat Aug 18 22:04:52 2012 (r240505)
@@ -74,10 +74,11 @@
if (comprfile == Z_NULL)
err(1, "Could not open compressed file.");
- for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) {
+ for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) {
buf[i] = ch;
i++;
}
+ buf[i] = '\0';
for (i = 0; buf[i] != EOF; i++) {
fputc(buf[i], file);
Modified: soc2012/jhagewood/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diffreg.c Sat Aug 18 20:26:49 2012 (r240504)
+++ soc2012/jhagewood/diff/diffreg.c Sat Aug 18 22:04:52 2012 (r240505)
@@ -396,9 +396,11 @@
}
if (!istextfile(f1) || !istextfile(f2)) {
- rval = D_BINARY;
- status |= 1;
- goto CLOSEM;
+ if (filebehave == FILE_NORMAL) {
+ rval = D_BINARY;
+ status |= 1;
+ goto CLOSEM;
+ }
}
if (lflag) {
/* redirect stdout to pr */
Modified: soc2012/jhagewood/sdiff/decompress.c
==============================================================================
--- soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 20:26:49 2012 (r240504)
+++ soc2012/jhagewood/sdiff/decompress.c Sat Aug 18 22:04:52 2012 (r240505)
@@ -73,10 +73,11 @@
if (comprfile == Z_NULL)
err(1, "Could not open compressed file.");
- for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) {
+ for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) {
buf[i] = ch;
i++;
}
+ buf[i] = '\0';
for (i = 0; buf[i] != EOF; i++) {
fputc(buf[i], file);
More information about the svn-soc-all
mailing list