31 |
|
|
32 |
|
int invert = 0; /* boolean true to invert surfaces */ |
33 |
|
|
34 |
< |
int expand = 0; /* boolean true to expand commands */ |
34 |
> |
int expand = 1; /* boolean true to expand commands */ |
35 |
|
|
36 |
|
char *newmod = NULL; /* new modifier for surfaces */ |
37 |
|
|
47 |
|
|
48 |
|
int nrept = 1; /* number of array repetitions */ |
49 |
|
|
50 |
< |
extern char *malloc(), *fgetword(); |
50 |
> |
int stdinused = 0; /* stdin has been used by -f option? */ |
51 |
|
|
52 |
< |
char *mainfn[MAXPATH]; /* main file name */ |
52 |
> |
extern char *malloc(), *fgets(), *fgetword(); |
53 |
> |
|
54 |
> |
char mainfn[MAXPATH]; /* main file name */ |
55 |
|
FILE *mainfp = NULL; /* main file pointer */ |
56 |
|
|
57 |
|
#define progname (xav[0]) |
63 |
|
{ |
64 |
|
char *fname; |
65 |
|
int a; |
66 |
< |
/* check for array */ |
66 |
> |
/* check for argument list file */ |
67 |
|
for (a = 1; a < argc; a++) |
68 |
+ |
if (!strcmp(argv[a], "-f")) |
69 |
+ |
return(doargf(argc, argv, a)); |
70 |
+ |
/* check for regular array */ |
71 |
+ |
for (a = 1; a < argc; a++) |
72 |
|
if (!strcmp(argv[a], "-a")) |
73 |
|
return(doarray(argc, argv, a)); |
74 |
|
|
87 |
|
break; |
88 |
|
idprefix = argv[++a]; |
89 |
|
continue; |
90 |
+ |
case 'c': |
91 |
+ |
if (argv[a][2]) |
92 |
+ |
break; |
93 |
+ |
expand = 0; |
94 |
+ |
continue; |
95 |
|
case 'e': |
96 |
|
if (argv[a][2]) |
97 |
|
break; |
130 |
|
putchar('\n'); |
131 |
|
/* transform input */ |
132 |
|
if (xac == argc) { |
133 |
+ |
if (stdinused) { |
134 |
+ |
fprintf(stderr, "%s: cannot use stdin more than once\n", |
135 |
+ |
argv[0]); |
136 |
+ |
exit(1); |
137 |
+ |
} |
138 |
|
openmain(NULL); |
139 |
|
xform(mainfn, mainfp); |
140 |
|
} else |
147 |
|
} |
148 |
|
|
149 |
|
|
150 |
+ |
doargf(ac, av, fi) /* take argument list from file */ |
151 |
+ |
char **av; |
152 |
+ |
int ac, fi; |
153 |
+ |
{ |
154 |
+ |
char *newav[256], **avp; |
155 |
+ |
char argbuf[2048]; |
156 |
+ |
char newid[128]; |
157 |
+ |
char *oldid; |
158 |
+ |
register char *cp; |
159 |
+ |
FILE *argfp; |
160 |
+ |
int n, i, k, newac, err; |
161 |
+ |
|
162 |
+ |
if (fi >= ac-1 || (av[fi+1][0] == '-' && av[fi+1][1] != '\0')) { |
163 |
+ |
fprintf(stderr, "%s: missing file for -f option\n", av[0]); |
164 |
+ |
exit(1); |
165 |
+ |
} |
166 |
+ |
if (av[fi+1][0] == '-' && av[fi+1][1] == '\0') { |
167 |
+ |
if (stdinused++) { |
168 |
+ |
fprintf(stderr, "%s: cannot use stdin more than once\n", |
169 |
+ |
av[0]); |
170 |
+ |
exit(1); |
171 |
+ |
} |
172 |
+ |
argfp = stdin; |
173 |
+ |
n = 100; /* we just don't know! */ |
174 |
+ |
} else { |
175 |
+ |
if ((argfp = fopen(av[fi+1], "r")) == NULL) { |
176 |
+ |
fprintf(stderr, "%s: cannot open argument file \"%s\"\n", |
177 |
+ |
av[0], av[fi+1]); |
178 |
+ |
exit(1); |
179 |
+ |
} |
180 |
+ |
n = 0; /* count number of lines in file */ |
181 |
+ |
while (fgets(argbuf,sizeof(argbuf),argfp) != NULL) |
182 |
+ |
n += argbuf[0] != '\n' & argbuf[0] != '#'; |
183 |
+ |
if (!n) { |
184 |
+ |
fprintf(stderr, "%s: empty argument file \"%s\"\n", |
185 |
+ |
av[0], av[fi+1]); |
186 |
+ |
exit(1); |
187 |
+ |
} |
188 |
+ |
nrept *= n; |
189 |
+ |
rewind(argfp); |
190 |
+ |
} |
191 |
+ |
err = 0; k = 0; /* read each arg list and call main */ |
192 |
+ |
while (fgets(argbuf,sizeof(argbuf),argfp) != NULL) { |
193 |
+ |
if (argbuf[0] == '\n' | argbuf[0] == '#') |
194 |
+ |
continue; |
195 |
+ |
avp = newav+2; |
196 |
+ |
avp[0] = av[0]; |
197 |
+ |
for (i = 1; i < fi; i++) |
198 |
+ |
avp[i] = av[i]; |
199 |
+ |
newac = i; |
200 |
+ |
cp = argbuf; /* parse new words */ |
201 |
+ |
if (*cp == '!') cp++; |
202 |
+ |
if (!strncmp(cp, "xform ", 6)) cp += 6; |
203 |
+ |
for ( ; ; ) { |
204 |
+ |
while (isspace(*cp)) /* nullify spaces */ |
205 |
+ |
*cp++ = '\0'; |
206 |
+ |
if (!*cp) /* all done? */ |
207 |
+ |
break; |
208 |
+ |
avp[newac++] = cp; /* add argument to list */ |
209 |
+ |
while (*++cp && !isspace(*cp)) |
210 |
+ |
; |
211 |
+ |
} |
212 |
+ |
for (i = fi+2; i < ac; i++) |
213 |
+ |
avp[newac++] = av[i]; |
214 |
+ |
avp[newac] = NULL; |
215 |
+ |
oldid = NULL; |
216 |
+ |
for (i = 2; i < newac; i++) |
217 |
+ |
if (!strcmp(avp[i-1], "-n")) { |
218 |
+ |
oldid = avp[i]; |
219 |
+ |
avp[i] = newid; |
220 |
+ |
break; |
221 |
+ |
} |
222 |
+ |
if (oldid == NULL) { |
223 |
+ |
newav[0] = av[0]; |
224 |
+ |
newav[1] = "-n"; |
225 |
+ |
newav[2] = newid; |
226 |
+ |
avp = newav; |
227 |
+ |
newac += 2; |
228 |
+ |
} |
229 |
+ |
if (oldid == NULL) |
230 |
+ |
sprintf(newid, "i%d", k); |
231 |
+ |
else |
232 |
+ |
sprintf(newid, "%s.%d", oldid, k); |
233 |
+ |
err |= main(newac, avp); |
234 |
+ |
k++; |
235 |
+ |
} |
236 |
+ |
fclose(argfp); |
237 |
+ |
return(err); |
238 |
+ |
} |
239 |
+ |
|
240 |
+ |
|
241 |
|
doarray(ac, av, ai) /* make array */ |
242 |
|
char **av; |
243 |
|
int ac, ai; |
247 |
|
char *oldid = NULL; |
248 |
|
int n, i, err; |
249 |
|
|
250 |
+ |
if (ai >= ac-1 || (n = atoi(av[ai+1])) <= 0) { |
251 |
+ |
fprintf(stderr, "%s: missing count for -a option\n", av[0]); |
252 |
+ |
exit(1); |
253 |
+ |
} |
254 |
+ |
nrept *= n; |
255 |
|
avp = newav+2; |
256 |
|
avp[0] = av[0]; |
257 |
|
for (i = 1; i < ac; i++) |
270 |
|
avp = newav; |
271 |
|
ac += 2; |
272 |
|
} |
161 |
– |
nrept *= n = atoi(av[ai+1]); |
273 |
|
err = 0; |
274 |
|
for (i = 0; i < n; i++) { |
275 |
|
if (oldid == NULL) |
338 |
|
} else { |
339 |
|
printf("\n%s", buf); |
340 |
|
if (xac > 1) { |
341 |
< |
printf(" | %s -e", xav[0]); |
341 |
> |
printf(" | %s", xav[0]); |
342 |
|
for (i = 1; i < xac; i++) |
343 |
|
printf(" %s", xav[i]); |
344 |
|
} |
526 |
|
|
527 |
|
if (readfargs(&fa, fin) != 1) |
528 |
|
return(-1); |
529 |
< |
if (fa.nfargs > 5) |
529 |
> |
if (fa.nfargs > 7) |
530 |
|
return(-1); |
531 |
|
printf("%d", fa.nsargs); |
532 |
|
if (idprefix == NULL) |
552 |
|
if (fa.nfargs > 2) |
553 |
|
printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca, |
554 |
|
fa.farg[1]/tot.sca, fa.farg[2]/tot.sca); |
555 |
< |
if (fa.nfargs > 3) |
556 |
< |
printf(" %12.6g", fa.farg[3]); |
446 |
< |
if (fa.nfargs > 4) |
447 |
< |
printf(" %12.6g", fa.farg[4]); |
555 |
> |
for (i = 3; i < fa.nfargs; i++) |
556 |
> |
printf(" %12.6g", fa.farg[i]); |
557 |
|
printf("\n"); |
558 |
|
freefargs(&fa); |
559 |
|
return(0); |
873 |
|
extern FILE *tmpfile(); |
874 |
|
extern char *getlibpath(), *getpath(); |
875 |
|
static char origdir[MAXPATH]; |
876 |
< |
static char curdir[MAXPATH]; |
877 |
< |
char newdir[MAXPATH], *cp; |
876 |
> |
static char curfn[MAXPATH]; |
877 |
> |
static int diffdir; |
878 |
> |
register char *fpath; |
879 |
|
|
880 |
|
if (fname == NULL) { /* standard input */ |
881 |
|
if (mainfp == NULL) { |
899 |
|
rewind(mainfp); /* rewind copy */ |
900 |
|
return; |
901 |
|
} |
792 |
– |
/* get full path */ |
793 |
– |
if ((cp = getpath(fname, getlibpath(), R_OK)) == NULL) { |
794 |
– |
fprintf(stderr, "%s: cannot find file \"%s\"\n", |
795 |
– |
progname, fname); |
796 |
– |
exit(1); |
797 |
– |
} |
798 |
– |
if (cp[0] == '.' && ISDIRSEP(cp[1])) /* remove leading ./ */ |
799 |
– |
cp += 2; |
902 |
|
if (mainfp == NULL) { /* first call, initialize */ |
903 |
|
getwd(origdir); |
904 |
< |
strcpy(curdir, origdir); |
803 |
< |
} else if (!strcmp(cp, mainfn)) { /* just need to rewind? */ |
904 |
> |
} else if (!strcmp(fname, curfn)) { /* just need to rewind? */ |
905 |
|
rewind(mainfp); |
906 |
|
return; |
907 |
< |
} else /* else close old stream */ |
907 |
> |
} else { /* else close old stream */ |
908 |
|
fclose(mainfp); |
909 |
+ |
if (diffdir) { |
910 |
+ |
chdir(origdir); |
911 |
+ |
diffdir = 0; |
912 |
+ |
} |
913 |
+ |
} |
914 |
+ |
strcpy(curfn, fname); /* remember file name */ |
915 |
+ |
/* get full path */ |
916 |
+ |
if ((fpath = getpath(fname, getlibpath(), R_OK)) == NULL) { |
917 |
+ |
fprintf(stderr, "%s: cannot find file \"%s\"\n", |
918 |
+ |
progname, fname); |
919 |
+ |
exit(1); |
920 |
+ |
} |
921 |
+ |
if (fpath[0] == '.' && ISDIRSEP(fpath[1])) /* remove leading ./ */ |
922 |
+ |
fpath += 2; |
923 |
|
/* record path name */ |
924 |
< |
strcpy(mainfn, cp); |
925 |
< |
if (expand) { /* get directory component */ |
926 |
< |
if (ISDIRSEP(cp[0])) |
927 |
< |
strcpy(newdir, cp); |
928 |
< |
else |
929 |
< |
sprintf(newdir, "%s%c%s", origdir, DIRSEP, cp); |
930 |
< |
for (cp = newdir+strlen(newdir); !ISDIRSEP(cp[-1]); cp--) |
931 |
< |
; |
924 |
> |
strcpy(mainfn, fpath); |
925 |
> |
if (expand) { /* change to local directory */ |
926 |
> |
register char *cp = fpath + strlen(fpath); /* get dir. */ |
927 |
> |
while (cp > fpath) { |
928 |
> |
cp--; |
929 |
> |
if (ISDIRSEP(*cp)) { |
930 |
> |
if (cp == fpath) |
931 |
> |
cp++; /* root special case */ |
932 |
> |
break; |
933 |
> |
} |
934 |
> |
} |
935 |
|
*cp = '\0'; |
936 |
< |
if (strcmp(newdir, curdir)) { /* change to new directory? */ |
937 |
< |
if (chdir(newdir) < 0) { |
936 |
> |
if (fpath[0]) { /* change to new directory? */ |
937 |
> |
if (chdir(fpath) < 0) { |
938 |
|
fprintf(stderr, |
939 |
|
"%s: cannot change directory to \"%s\"\n", |
940 |
< |
progname, newdir); |
940 |
> |
progname, fpath); |
941 |
|
exit(1); |
942 |
|
} |
943 |
< |
strcpy(curdir, newdir); |
943 |
> |
diffdir++; |
944 |
|
} |
945 |
|
/* get final path component */ |
946 |
< |
for (cp = fname+strlen(fname); |
947 |
< |
cp > fname && !ISDIRSEP(cp[-1]); cp--) |
946 |
> |
for (fpath = fname+strlen(fname); |
947 |
> |
fpath > fname && !ISDIRSEP(fpath[-1]); fpath--) |
948 |
|
; |
949 |
|
} |
950 |
|
/* open the file */ |
951 |
< |
if ((mainfp = fopen(cp, "r")) == NULL) { |
951 |
> |
if ((mainfp = fopen(fpath, "r")) == NULL) { |
952 |
|
fprintf(stderr, "%s: cannot open file \"%s\"\n", |
953 |
|
progname, mainfn); |
954 |
|
exit(1); |