--- ray/src/px/pcompos.c 1991/11/12 16:04:44 2.1 +++ ray/src/px/pcompos.c 1992/02/19 17:08:00 2.4 @@ -70,7 +70,6 @@ main(argc, argv) int argc; char *argv[]; { - double atof(); int ncolumns = 0; int autolabel = 0; int curcol = 0, curx = 0, cury = 0; @@ -147,7 +146,8 @@ dofiles: case 'l': if (strcmp(argv[an], "-l")) goto userr; - thislabel = argv[++an]; + thislabel = argv[an+1]; + an += 2; break; case '\0': if (argv[an][0] == '-') @@ -163,10 +163,14 @@ getfile: input[nfile].name = ""; input[nfile].fp = stdin; } else { - input[nfile].name = argv[an]; - if ((input[nfile].fp = argv[an][0] == '!' ? - popen(argv[an]+1, "r") : - fopen(argv[an], "r")) == NULL) { + if (argv[an][0] == '!') { + input[nfile].name = ""; + input[nfile].fp = popen(argv[an]+1, "r"); + } else { + input[nfile].name = argv[an]; + input[nfile].fp = fopen(argv[an], "r"); + } + if (input[nfile].fp == NULL) { perror(argv[an]); quit(1); }