15 |
|
|
16 |
|
#include "copyright.h" |
17 |
|
|
18 |
– |
#include "standard.h" |
18 |
|
#include <ctype.h> |
19 |
|
#include <sys/stat.h> |
20 |
+ |
|
21 |
+ |
#include "standard.h" |
22 |
+ |
#include "paths.h" |
23 |
|
#include "view.h" |
24 |
|
#include "vars.h" |
25 |
|
#include "netproc.h" |
482 |
|
pippt = NULL; |
483 |
|
} |
484 |
|
if (pippt != NULL) |
485 |
< |
strcpy(pippt, "> /dev/null"); /* nothing to match */ |
485 |
> |
strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */ |
486 |
|
else { |
487 |
|
sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY)); |
488 |
|
cp += 11; /* point to file name */ |
888 |
|
quit(1); |
889 |
|
} |
890 |
|
usepinterp = (nblur > 1); |
891 |
< |
usepfilt = pfiltalways | ep==NULL; |
891 |
> |
usepfilt = pfiltalways | (ep==NULL); |
892 |
|
if (ep != NULL && !strcmp(ep, "1")) |
893 |
|
ep = "+0"; |
894 |
|
nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL || |
1035 |
|
fclose(viewfp); |
1036 |
|
viewfp = NULL; |
1037 |
|
viewnum = 0; |
1038 |
< |
copystruct(&curview, &stdview); |
1038 |
> |
curview = stdview; |
1039 |
|
} |
1040 |
|
return(NULL); |
1041 |
|
} |
1051 |
|
perror(vval(VIEWFILE)); |
1052 |
|
quit(1); |
1053 |
|
} |
1054 |
< |
copystruct(&curview, &stdview); |
1054 |
> |
curview = stdview; |
1055 |
|
viewnum = 0; |
1056 |
|
} |
1057 |
|
if (n < 0) { /* get next view */ |
1395 |
|
for (i = 0, psep = -1; path[i]; i++) |
1396 |
|
if (path[i] == '/') |
1397 |
|
psep = i; |
1398 |
< |
if (df != NULL) |
1398 |
> |
if (df != NULL) { |
1399 |
|
if (psep == 0) { |
1400 |
|
df[0] = '/'; |
1401 |
|
df[1] = '\0'; |
1404 |
|
df[psep] = '\0'; |
1405 |
|
} else |
1406 |
|
df[0] = '\0'; |
1407 |
+ |
} |
1408 |
|
return(path+psep+1); |
1409 |
|
} |
1410 |
|
|