613 |
|
int n; |
614 |
|
|
615 |
|
if (formatval(fmt, s)) { |
616 |
+ |
if (fmtid == fmt) return(0); |
617 |
|
if (fmtid == NULL) { |
618 |
|
fmtid = fmt; |
619 |
|
return(0); |
620 |
|
} |
621 |
+ |
if ((comp_size == 1) & (n_comp > 1)) |
622 |
+ |
return(0); /* byte exception - skip check */ |
623 |
|
if (!strcmp(fmt, fmtid)) |
624 |
|
return(0); |
625 |
|
fprintf(stderr, "Input format '%s' != '%s'\n", fmt, fmtid); |
644 |
|
return(0); |
645 |
|
} |
646 |
|
if (!strncmp(s, "NCOMP=", 6)) { |
647 |
+ |
if ((comp_size == 1) & (n_comp > 1)) |
648 |
+ |
return(0); /* byte exception - ignore */ |
649 |
|
n = atoi(s+6); |
650 |
|
if ((n_comp > 0) & (n != n_comp)) { |
651 |
|
fputs("Incorrect number of components\n", stderr); |