74 |
|
#define adv_linecnt(htp) (lin1cnt += (htp == &hdr1), \ |
75 |
|
lin2cnt += (htp == &hdr2)) |
76 |
|
|
77 |
+ |
typedef struct { /* dynamic line buffer */ |
78 |
+ |
char *str; |
79 |
+ |
int len; |
80 |
+ |
int siz; |
81 |
+ |
} LINEBUF; |
82 |
+ |
|
83 |
+ |
#define init_line(bp) ((bp)->str = NULL, (bp)->siz = 0) |
84 |
+ |
/* 100 MByte limit on line buffer */ |
85 |
+ |
#define MAXBUF (100L<<20) |
86 |
+ |
|
87 |
|
/* input files */ |
88 |
|
char *progname = NULL; |
89 |
|
const char stdin_name[] = "<stdin>"; |
105 |
|
exit(2); |
106 |
|
} |
107 |
|
|
108 |
+ |
/* Read a text line, increasing buffer size as necessary */ |
109 |
+ |
static int |
110 |
+ |
read_line(LINEBUF *bp, FILE *fp) |
111 |
+ |
{ |
112 |
+ |
bp->len = 0; |
113 |
+ |
if (!bp->str) { |
114 |
+ |
bp->str = (char *)malloc(bp->siz = 512); |
115 |
+ |
if (!bp->str) |
116 |
+ |
goto memerr; |
117 |
+ |
} |
118 |
+ |
while (fgets(bp->str + bp->len, bp->siz - bp->len, fp)) { |
119 |
+ |
bp->len += strlen(bp->str + bp->len); |
120 |
+ |
if (bp->str[bp->len-1] == '\n') |
121 |
+ |
break; /* found EOL */ |
122 |
+ |
if (bp->len < bp->siz - 4) |
123 |
+ |
continue; /* at EOF? */ |
124 |
+ |
if (bp->siz >= MAXBUF) |
125 |
+ |
break; /* don't go to extremes */ |
126 |
+ |
if ((bp->siz += bp->siz/2) > MAXBUF) |
127 |
+ |
bp->siz = MAXBUF; |
128 |
+ |
bp->str = (char *)realloc(bp->str, bp->siz); |
129 |
+ |
if (!bp->str) |
130 |
+ |
goto memerr; |
131 |
+ |
} |
132 |
+ |
return(bp->len); |
133 |
+ |
memerr: |
134 |
+ |
fprintf(stderr, |
135 |
+ |
"%s: out of memory in read_line() allocating %d byte buffer\n", |
136 |
+ |
progname, bp->siz); |
137 |
+ |
exit(2); |
138 |
+ |
} |
139 |
+ |
|
140 |
+ |
/* Free line buffer */ |
141 |
+ |
static void |
142 |
+ |
free_line(LINEBUF *bp) |
143 |
+ |
{ |
144 |
+ |
if (bp->str) free(bp->str); |
145 |
+ |
init_line(bp); |
146 |
+ |
} |
147 |
+ |
|
148 |
|
/* Get type ID from name (or 0 if not found) */ |
149 |
|
static int |
150 |
|
xlate_type(const char *nm) |
341 |
|
|
342 |
|
/* Compare two sets of header variables */ |
343 |
|
static int |
344 |
< |
headers_match(LUTAB *hp1, LUTAB *hp2) |
344 |
> |
headers_match() |
345 |
|
{ |
346 |
< |
int ne = lu_doall(hp1, match_val, hp2); |
346 |
> |
int ne = lu_doall(&hdr1, match_val, &hdr2); |
347 |
|
if (ne < 0) |
348 |
|
return(0); /* something didn't match! */ |
349 |
|
/* non-fatal if second header has extra */ |
350 |
< |
if (report >= REP_WARN && (ne = lu_doall(hp2, NULL, NULL) - ne)) |
350 |
> |
if (report >= REP_WARN && (ne = lu_doall(&hdr2, NULL, NULL) - ne)) |
351 |
|
printf("%s: warning - '%s' has %d extra header setting(s)\n", |
352 |
|
progname, f2name, ne); |
353 |
|
return(1); /* good match */ |
495 |
|
static int |
496 |
|
compare_text() |
497 |
|
{ |
498 |
< |
char l1buf[4096], l2buf[4096]; |
498 |
> |
LINEBUF l1buf, l2buf; |
499 |
|
|
500 |
|
if (report >= REP_VERBOSE) { |
501 |
|
fputs(progname, stdout); |
502 |
|
fputs(": comparing inputs as ASCII text\n", stdout); |
503 |
|
} |
504 |
< |
/* compare a line at a time */ |
505 |
< |
while (fgets(l1buf, sizeof(l1buf), f1in)) { |
504 |
> |
init_line(&l1buf); init_line(&l2buf); /* compare a line at a time */ |
505 |
> |
while (read_line(&l1buf, f1in)) { |
506 |
|
lin1cnt++; |
507 |
< |
if (!*sskip2(l1buf,0)) |
507 |
> |
if (!*sskip2(l1buf.str,0)) |
508 |
|
continue; /* ignore empty lines */ |
509 |
< |
while (fgets(l2buf, sizeof(l2buf), f2in)) { |
509 |
> |
|
510 |
> |
while (read_line(&l2buf, f2in)) { |
511 |
|
lin2cnt++; |
512 |
< |
if (*sskip2(l2buf,0)) |
512 |
> |
if (*sskip2(l2buf.str,0)) |
513 |
|
break; /* found other non-empty line */ |
514 |
|
} |
515 |
< |
if (feof(f2in)) { |
515 |
> |
if (!l2buf.len) { /* input 2 EOF? */ |
516 |
|
if (report != REP_QUIET) { |
517 |
|
fputs(f2name, stdout); |
518 |
|
fputs(": unexpected end-of-file\n", stdout); |
519 |
|
} |
520 |
+ |
free_line(&l1buf); free_line(&l2buf); |
521 |
|
return(0); |
522 |
|
} |
523 |
|
/* compare non-empty lines */ |
524 |
< |
if (!equiv_string(l1buf, l2buf)) { |
524 |
> |
if (!equiv_string(l1buf.str, l2buf.str)) { |
525 |
|
if (report != REP_QUIET) { |
526 |
|
printf("%s: inputs '%s' and '%s' differ at line %d|%d\n", |
527 |
|
progname, f1name, f2name, |
528 |
|
lin1cnt, lin2cnt); |
529 |
< |
if (report >= REP_VERBOSE) { |
529 |
> |
if ( report >= REP_VERBOSE && |
530 |
> |
(l1buf.len < 256) & |
531 |
> |
(l2buf.len < 256) ) { |
532 |
|
fputs("------------- Mismatch -------------\n", stdout); |
533 |
|
printf("%s@%d:\t%s", f1name, |
534 |
< |
lin1cnt, l1buf); |
534 |
> |
lin1cnt, l1buf.str); |
535 |
|
printf("%s@%d:\t%s", f2name, |
536 |
< |
lin2cnt, l2buf); |
536 |
> |
lin2cnt, l2buf.str); |
537 |
|
} |
538 |
|
} |
539 |
+ |
free_line(&l1buf); free_line(&l2buf); |
540 |
|
return(0); |
541 |
|
} |
542 |
|
} |
543 |
< |
/* check for EOF on input 2 */ |
544 |
< |
while (fgets(l2buf, sizeof(l2buf), f2in)) { |
545 |
< |
if (!*sskip2(l2buf,0)) |
543 |
> |
free_line(&l1buf); /* check for EOF on input 2 */ |
544 |
> |
while (read_line(&l2buf, f2in)) { |
545 |
> |
if (!*sskip2(l2buf.str,0)) |
546 |
|
continue; |
547 |
|
if (report != REP_QUIET) { |
548 |
|
fputs(f1name, stdout); |
549 |
|
fputs(": unexpected end-of-file\n", stdout); |
550 |
|
} |
551 |
+ |
free_line(&l2buf); |
552 |
|
return(0); |
553 |
|
} |
554 |
+ |
free_line(&l2buf); |
555 |
|
return(good_RMS()); /* final check for reals */ |
556 |
|
} |
557 |
|
|
766 |
|
return(1); |
767 |
|
} |
768 |
|
ign_header |= !has_header(typ1); /* check headers if indicated */ |
769 |
< |
if (!ign_header && !headers_match(&hdr1, &hdr2)) |
769 |
> |
if (!ign_header && !headers_match()) |
770 |
|
return(1); |
771 |
|
lu_done(&hdr1); lu_done(&hdr2); |
772 |
|
if (!ign_header & (report >= REP_WARN)) { |