| 78 |
|
} |
| 79 |
|
if (isdigit(argv[i][3])) |
| 80 |
|
curbytes *= atoi(argv[i]+3); |
| 81 |
< |
if (abs(curbytes) > MAXLINE) { |
| 81 |
> |
curbytes += (curbytes == -1); |
| 82 |
> |
if (curbytes > MAXLINE) { |
| 83 |
|
fputs(argv[0], stderr); |
| 84 |
|
fputs(": input size too big\n", stderr); |
| 85 |
< |
exit(1); |
| 85 |
> |
return(1); |
| 86 |
|
} |
| 87 |
< |
if (curbytes) { |
| 87 |
> |
if (curbytes > 0) { |
| 88 |
|
curtab = ""; |
| 89 |
< |
binout += (curbytes > 0); |
| 89 |
> |
++binout; |
| 90 |
|
} |
| 91 |
|
break; |
| 92 |
|
case '\0': |
| 94 |
|
input[nfiles] = stdin; |
| 95 |
|
if (curbytes > 0) |
| 96 |
|
SET_FILE_BINARY(input[nfiles]); |
| 96 |
– |
else |
| 97 |
– |
curbytes = -curbytes; |
| 97 |
|
bytsiz[nfiles++] = curbytes; |
| 98 |
|
break; |
| 99 |
|
badopt:; |
| 100 |
|
default: |
| 101 |
|
fputs(argv[0], stderr); |
| 102 |
|
fputs(": bad option\n", stderr); |
| 103 |
< |
exit(1); |
| 103 |
> |
return(1); |
| 104 |
|
} |
| 105 |
|
} else if (argv[i][0] == '!') { |
| 106 |
|
tabc[nfiles] = curtab; |
| 107 |
|
if ((input[nfiles] = popen(argv[i]+1, "r")) == NULL) { |
| 108 |
|
fputs(argv[i], stderr); |
| 109 |
|
fputs(": cannot start command\n", stderr); |
| 110 |
< |
exit(1); |
| 110 |
> |
return(1); |
| 111 |
|
} |
| 112 |
|
if (curbytes > 0) |
| 113 |
|
SET_FILE_BINARY(input[nfiles]); |
| 115 |
– |
else |
| 116 |
– |
curbytes = -curbytes; |
| 114 |
|
bytsiz[nfiles++] = curbytes; |
| 115 |
|
} else { |
| 116 |
|
tabc[nfiles] = curtab; |
| 117 |
|
if ((input[nfiles] = fopen(argv[i], "r")) == NULL) { |
| 118 |
|
fputs(argv[i], stderr); |
| 119 |
|
fputs(": cannot open file\n", stderr); |
| 120 |
< |
exit(1); |
| 120 |
> |
return(1); |
| 121 |
|
} |
| 122 |
|
if (curbytes > 0) |
| 123 |
|
SET_FILE_BINARY(input[nfiles]); |
| 127 |
– |
else |
| 128 |
– |
curbytes = -curbytes; |
| 124 |
|
bytsiz[nfiles++] = curbytes; |
| 125 |
|
} |
| 126 |
|
if (nfiles >= MAXFILE) { |
| 127 |
|
fputs(argv[0], stderr); |
| 128 |
|
fputs(": too many input streams\n", stderr); |
| 129 |
< |
exit(1); |
| 129 |
> |
return(1); |
| 130 |
|
} |
| 131 |
|
} |
| 132 |
+ |
if (!nfiles) { |
| 133 |
+ |
fputs(argv[0], stderr); |
| 134 |
+ |
fputs(": no input streams\n", stderr); |
| 135 |
+ |
return(1); |
| 136 |
+ |
} |
| 137 |
|
if (binout) /* binary output? */ |
| 138 |
|
SET_FILE_BINARY(stdout); |
| 139 |
|
#ifdef getc_unlocked /* avoid lock/unlock overhead */ |
| 143 |
|
#endif |
| 144 |
|
puteol = 0; /* any ASCII output at all? */ |
| 145 |
|
for (i = nfiles; i--; ) |
| 146 |
< |
if (!bytsiz[i] || isprint(tabc[i][0]) || tabc[i][0] == '\t') { |
| 147 |
< |
puteol++; |
| 148 |
< |
break; |
| 149 |
< |
} |
| 146 |
> |
puteol += (bytsiz[i] <= 0); |
| 147 |
|
do { /* main loop */ |
| 148 |
|
for (i = 0; i < nfiles; i++) { |
| 149 |
< |
if (bytsiz[i]) { /* binary/fixed width */ |
| 149 |
> |
if (bytsiz[i] > 0) { /* binary input */ |
| 150 |
|
if (getbinary(buf, bytsiz[i], 1, input[i]) < 1) |
| 151 |
|
break; |
| 152 |
|
if (i) |
| 153 |
|
fputs(tabc[i], stdout); |
| 154 |
|
putbinary(buf, bytsiz[i], 1, stdout); |
| 155 |
< |
} else { |
| 155 |
> |
} else if (bytsiz[i] < 0) { /* multi-line input */ |
| 156 |
> |
int n = -bytsiz[i]; |
| 157 |
> |
while (n--) { |
| 158 |
> |
if (fgets(buf, MAXLINE, input[i]) == NULL) |
| 159 |
> |
break; |
| 160 |
> |
if ((i > 0) | (n < -bytsiz[i]-1)) |
| 161 |
> |
fputs(tabc[i], stdout); |
| 162 |
> |
buf[strlen(buf)-1] = '\0'; |
| 163 |
> |
fputs(buf, stdout); |
| 164 |
> |
} |
| 165 |
> |
if (n >= 0) /* fell short? */ |
| 166 |
> |
break; |
| 167 |
> |
} else { /* single-line input */ |
| 168 |
|
if (fgets(buf, MAXLINE, input[i]) == NULL) |
| 169 |
|
break; |
| 170 |
|
if (i) |
