319 |
|
int nparams = 0; |
320 |
|
int i; |
321 |
|
|
322 |
< |
for ( ; ; ) |
322 |
> |
for ( ; ; ) { |
323 |
|
switch (*cp++) { |
324 |
|
case 'h': |
325 |
|
if (*cp++ != '=') |
342 |
|
break; |
343 |
|
if (!get_direction(p->vup, cp)) |
344 |
|
break; |
345 |
+ |
while (*cp && !isspace(*cp++)) |
346 |
+ |
; |
347 |
|
++nparams; |
348 |
|
continue; |
349 |
|
case 'o': |
362 |
|
case ' ': |
363 |
|
case '\t': |
364 |
|
case '\r': |
363 |
– |
case '\n': |
365 |
|
continue; |
366 |
+ |
case '\n': |
367 |
|
case '\0': |
368 |
|
return(nparams); |
369 |
|
default: |
370 |
|
break; |
371 |
|
} |
372 |
< |
fprintf(stderr, "%s: bad parameter string '%s'\n", progname, pargs); |
372 |
> |
break; |
373 |
> |
} |
374 |
> |
fprintf(stderr, "%s: bad parameter string: %s", progname, pargs); |
375 |
|
exit(1); |
376 |
|
return(-1); /* pro forma return */ |
377 |
|
} |
1190 |
|
int a, i; |
1191 |
|
/* screen rcontrib options */ |
1192 |
|
progname = argv[0]; |
1193 |
< |
for (a = 1; a < argc-2 && argv[a][0] == '-'; a++) { |
1194 |
< |
int na = 1; /* !! Keep consistent !! */ |
1195 |
< |
switch (argv[a][1]) { |
1193 |
> |
for (a = 1; a < argc-2; a++) { |
1194 |
> |
int na; |
1195 |
> |
/* check for argument expansion */ |
1196 |
> |
while ((na = expandarg(&argc, &argv, a)) > 0) |
1197 |
> |
; |
1198 |
> |
if (na < 0) { |
1199 |
> |
fprintf(stderr, "%s: cannot expand '%s'\n", |
1200 |
> |
progname, argv[a]); |
1201 |
> |
return(1); |
1202 |
> |
} |
1203 |
> |
if (argv[a][0] != '-' || !argv[a][1]) |
1204 |
> |
break; |
1205 |
> |
na = 1; |
1206 |
> |
switch (argv[a][1]) { /* !! Keep consistent !! */ |
1207 |
|
case 'v': /* verbose mode */ |
1208 |
|
verbose = !verbose; |
1209 |
|
na = 0; |
1278 |
|
if (!argv[a][2]) goto userr; |
1279 |
|
na = (argv[a][2] == 'e') | (argv[a][2] == 'a') ? 4 : 2; |
1280 |
|
break; |
1266 |
– |
case '\0': /* pass-through mode */ |
1267 |
– |
goto done_opts; |
1281 |
|
default: /* anything else is verbotten */ |
1282 |
|
goto userr; |
1283 |
|
} |
1287 |
|
while (--na) /* + arguments if any */ |
1288 |
|
rcarg[nrcargs++] = argv[++a]; |
1289 |
|
} |
1277 |
– |
done_opts: |
1290 |
|
if (a > argc-2) |
1291 |
|
goto userr; /* check at end of options */ |
1292 |
|
sendfn = argv[a++]; /* assign sender & receiver inputs */ |