11 |
|
#include <string.h> |
12 |
|
|
13 |
|
#include "platform.h" |
14 |
+ |
#include "rtprocess.h" |
15 |
|
#include "resolu.h" |
16 |
|
|
17 |
|
#ifdef getc_unlocked /* avoid nasty file-locking overhead */ |
18 |
+ |
#undef getc |
19 |
|
#undef getchar |
20 |
|
#undef putchar |
21 |
+ |
#define getc getc_unlocked |
22 |
|
#define getchar getchar_unlocked |
23 |
|
#define putchar putchar_unlocked |
24 |
|
#endif |
25 |
|
|
23 |
– |
#ifdef _WIN32 |
24 |
– |
#include <process.h> |
25 |
– |
#define execvp _execvp |
26 |
– |
#endif |
27 |
– |
|
26 |
|
static gethfunc tabstr; |
27 |
|
static void getdim(FILE *fp); |
28 |
|
static void copycat(void); |
62 |
|
SET_FILE_BINARY(stdin); |
63 |
|
SET_FILE_BINARY(stdout); |
64 |
|
setvbuf(stdin, NULL, _IONBF, 2); |
65 |
< |
getheader(stdin, (gethfunc *)fputs, stdout); |
65 |
> |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) |
66 |
> |
return 1; |
67 |
|
printargs(argc-2, argv+2, stdout); |
68 |
|
fputc('\n', stdout); |
69 |
|
fflush(stdout); |
70 |
|
execvp(argv[2], argv+2); |
71 |
|
perror(argv[2]); |
72 |
|
return 1; |
73 |
+ |
} else if (argc > 2 && !strcmp(argv[1], "-a")) { |
74 |
+ |
SET_FILE_BINARY(stdin); |
75 |
+ |
SET_FILE_BINARY(stdout); |
76 |
+ |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) |
77 |
+ |
return 1; |
78 |
+ |
for (i = 2; i < argc; i++) { |
79 |
+ |
int len = strlen(argv[i]); |
80 |
+ |
if (!len) continue; |
81 |
+ |
fputs(argv[i], stdout); |
82 |
+ |
if (argv[i][len-1] != '\n') |
83 |
+ |
fputc('\n', stdout); |
84 |
+ |
} |
85 |
+ |
fputc('\n', stdout); |
86 |
+ |
copycat(); |
87 |
+ |
return 0; |
88 |
|
} else if (argc == 2 && !strcmp(argv[1], "-")) { |
89 |
|
SET_FILE_BINARY(stdin); |
90 |
|
SET_FILE_BINARY(stdout); |
91 |
< |
getheader(stdin, NULL, NULL); |
91 |
> |
if (getheader(stdin, NULL, NULL) < 0) |
92 |
> |
return 1; |
93 |
|
copycat(); |
94 |
|
return 0; |
95 |
|
} |
113 |
|
if (dim) { |
114 |
|
getdim(stdin); |
115 |
|
} else { |
116 |
< |
getheader(stdin, (gethfunc *)fputs, stdout); |
116 |
> |
if (getheader(stdin, (gethfunc *)fputs, stdout) < 0) |
117 |
> |
return 1; |
118 |
|
fputc('\n', stdout); |
119 |
|
} |
120 |
|
} |
129 |
|
{ |
130 |
|
int j; |
131 |
|
int c; |
132 |
< |
|
133 |
< |
getheader(fp, NULL, NULL); /* skip header */ |
134 |
< |
|
132 |
> |
/* skip header */ |
133 |
> |
if (getheader(fp, NULL, NULL) < 0) { |
134 |
> |
fputs("bad header\n", stdout); |
135 |
> |
return; |
136 |
> |
} |
137 |
|
switch (c = getc(fp)) { |
138 |
|
case '+': /* picture */ |
139 |
|
case '-': |
169 |
|
|
170 |
|
fflush(stdout); |
171 |
|
while ((n = fread(buf, 1, sizeof(buf), stdin)) > 0) |
172 |
< |
if (write(fileno(stdout), buf, n) != n) |
172 |
> |
if (writebuf(fileno(stdout), buf, n) != n) |
173 |
|
break; |
174 |
|
} |