--- ray/src/px/pcompos.c 1992/02/11 08:51:50 2.3 +++ ray/src/px/pcompos.c 1992/07/07 18:36:09 2.7 @@ -119,10 +119,7 @@ dofiles: for (nfile = 0; an < argc; nfile++) { if (nfile >= MAXFILE) goto toomany; - if (autolabel) - thislabel = argv[an]; - else - thislabel = NULL; + thislabel = NULL; input[nfile].hasmin = input[nfile].hasmax = 0; while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+')) switch (argv[an][1]) { @@ -159,14 +156,20 @@ dofiles: getfile: if (argc-an < (ncolumns ? 1 : 3)) goto userr; + if (autolabel && thislabel == NULL) + thislabel = argv[an]; if (!strcmp(argv[an], "-")) { 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); } @@ -214,6 +217,8 @@ getfile: goto toomany; input[nfile].name = "