SCCS-vsn: usr.bin/diff/diff/diffreg.c 4.4
-static char sccsid[] = "@(#)diffreg.c 4.3 %G%";
+static char sccsid[] = "@(#)diffreg.c 4.4 %G%";
- if (!ascii(fileno(f1)) || !ascii(fileno(f2))) {
+ if (!asciifile(f1) || !asciifile(f2)) {
printf("Binary files %s and %s differ\n", file1, file2);
fclose(f1);
fclose(f2);
printf("Binary files %s and %s differ\n", file1, file2);
fclose(f1);
fclose(f2);
register struct line *p;
register j,h;
register struct line *p;
register j,h;
fseek(fd, (long)0, 0);
p = (struct line *)talloc(3*sizeof(line));
for(j=0; h=readhash(fd);) {
fseek(fd, (long)0, 0);
p = (struct line *)talloc(3*sizeof(line));
for(j=0; h=readhash(fd);) {
int jackpot;
long ctold, ctnew;
char c,d;
int jackpot;
long ctold, ctnew;
char c,d;
- input[0] = fopen(file1,"r");
- input[1] = fopen(file2,"r");
+
+ if ((input[0] = fopen(file1,"r")) == NULL) {
+ perror(file1);
+ done();
+ }
+ if ((input[1] = fopen(file2,"r")) == NULL) {
+ perror(file2);
+ done();
+ }
j = 1;
ixold[0] = ixnew[0] = 0;
jackpot = 0;
j = 1;
ixold[0] = ixnew[0] = 0;
jackpot = 0;
skipline(f)
{
register i;
skipline(f)
{
register i;
- for(i=1;getc(input[f])!='\n';i++) ;
+ char c;
+
+ for(i=1;(c=getc(input[f]))!='\n';i++)
+ if (c < 0)
+ return(i);
sum = low(sum) + high(sum);
return((short)low(sum) + (short)high(sum));
}
sum = low(sum) + high(sum);
return((short)low(sum) + (short)high(sum));
}
+
+#include <a.out.h>
+
+asciifile(f)
+ FILE *f;
+{
+ char buf[BUFSIZ];
+ register int cnt;
+ register char *cp;
+
+ fseek(f, (long)0, 0);
+ cnt = fread(buf, BUFSIZ, 1, f);
+ if (cnt >= sizeof (struct exec)) {
+ struct exec hdr;
+ hdr = *(struct exec *)buf;
+ if (!N_BADMAG(hdr))
+ return (0);
+ }
+ cp = buf;
+ while (--cnt >= 0)
+ if (*cp++ & 0200)
+ return (0);
+ return (1);
+}