64 |
|
if (argc > 2 && !strcmp(argv[1], "-c")) { |
65 |
|
SET_FILE_BINARY(stdout); |
66 |
|
setvbuf(stdin, NULL, _IONBF, 2); |
67 |
< |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) |
67 |
> |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) { |
68 |
> |
fputs("Bad header!\n", stderr); |
69 |
|
return 1; |
70 |
+ |
} |
71 |
|
printargs(argc-2, argv+2, stdout); |
72 |
|
fputc('\n', stdout); |
73 |
|
if (dim) { /* copy resolution string? */ |
74 |
|
RESOLU rs; |
75 |
|
if (!fgetsresolu(&rs, stdin)) { |
76 |
< |
fputs("No resolution string\n", stderr); |
76 |
> |
fputs("No resolution string!\n", stderr); |
77 |
|
return 1; |
78 |
|
} |
79 |
|
if (dim > 0) |
85 |
|
return 1; |
86 |
|
} else if (argc > 2 && !strcmp(argv[1], "-a")) { |
87 |
|
SET_FILE_BINARY(stdout); |
88 |
< |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) |
88 |
> |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) { |
89 |
> |
fputs("Bad header!\n", stderr); |
90 |
|
return 1; |
91 |
+ |
} |
92 |
|
for (i = 2; i < argc; i++) { |
93 |
|
int len = strlen(argv[i]); |
94 |
|
if (!len) continue; |
101 |
|
return 0; |
102 |
|
} else if (argc == 2 && !strcmp(argv[1], "-")) { |
103 |
|
SET_FILE_BINARY(stdout); |
104 |
< |
if (getheader(stdin, NULL, NULL) < 0) |
104 |
> |
if (getheader(stdin, NULL, NULL) < 0) { |
105 |
> |
fputs("Bad header!\n", stderr); |
106 |
|
return 1; |
107 |
+ |
} |
108 |
|
if (dim < 0) { /* skip resolution string? */ |
109 |
|
RESOLU rs; |
110 |
|
if (!fgetsresolu(&rs, stdin)) { |
111 |
< |
fputs("No resolution string\n", stderr); |
111 |
> |
fputs("No resolution string!\n", stderr); |
112 |
|
return 1; |
113 |
|
} |
114 |
|
} |
122 |
|
else { |
123 |
|
if (dim < 0) { /* dimensions only */ |
124 |
|
if (getheader(fp, NULL, NULL) < 0) { |
125 |
< |
fputs("bad header\n", stdout); |
125 |
> |
fputs("bad header!\n", stdout); |
126 |
|
continue; |
127 |
|
} |
128 |
|
fputs(": ", stdout); |
129 |
|
getdim(fp); |
130 |
|
} else { |
131 |
|
tabstr(":\n", NULL); |
132 |
< |
if (getheader(fp, tabstr, NULL) < 0) |
132 |
> |
if (getheader(fp, tabstr, NULL) < 0) { |
133 |
> |
fputs(argv[i], stderr); |
134 |
> |
fputs(": bad header!\n", stderr); |
135 |
|
return 1; |
136 |
+ |
} |
137 |
|
fputc('\n', stdout); |
138 |
|
if (dim > 0) { |
139 |
|
fputc('\t', stdout); |
145 |
|
} |
146 |
|
if (argc == 1) { |
147 |
|
if (dim < 0) { |
148 |
< |
if (getheader(stdin, NULL, NULL) < 0) |
148 |
> |
if (getheader(stdin, NULL, NULL) < 0) { |
149 |
> |
fputs("Bad header!\n", stderr); |
150 |
|
return 1; |
151 |
+ |
} |
152 |
|
getdim(stdin); |
153 |
|
} else { |
154 |
< |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) |
154 |
> |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) { |
155 |
> |
fputs("Bad header!\n", stderr); |
156 |
|
return 1; |
157 |
+ |
} |
158 |
|
fputc('\n', stdout); |
159 |
|
if (dim > 0) |
160 |
|
getdim(stdin); |