9 |
|
|
10 |
|
#include <ctype.h> |
11 |
|
#include <time.h> |
12 |
+ |
#include <signal.h> |
13 |
|
|
14 |
|
#include "platform.h" |
15 |
|
#include "rtprocess.h" |
645 |
|
for (cp = combuf; *cp; cp++) |
646 |
|
; |
647 |
|
mkpmapopts(cp); |
648 |
+ |
/* force file overwrite */ |
649 |
+ |
cp = addarg(cp, "-fo+"); |
650 |
|
if (vdef(REPORT)) { |
651 |
|
char errfile[256]; |
652 |
|
int n; |
675 |
|
if (runcom(combuf)) { |
676 |
|
fprintf(stderr, "%s: error running %s\n", |
677 |
|
progname, c_mkpmap); |
678 |
< |
if (pgmapname != NULL) |
678 |
> |
if (pgmapname != NULL && pgmapdate < oct1date) |
679 |
|
unlink(pgmapname); |
680 |
< |
if (pcmapname != NULL) |
680 |
> |
if (pcmapname != NULL && pcmapdate < oct1date) |
681 |
|
unlink(pcmapname); |
682 |
|
quit(1); |
683 |
|
} |
832 |
|
if (vdef(RENDER)) |
833 |
|
op = addarg(op, vval(RENDER)); |
834 |
|
if (rvdevice != NULL) { |
835 |
< |
if (vdef(RVU)) |
835 |
> |
if (vdef(RVU)) { |
836 |
|
if (vval(RVU)[0] != '-') { |
837 |
|
atos(c_rvu, sizeof(c_rvu), vval(RVU)); |
838 |
|
po = addarg(po, sskip2(vval(RVU), 1)); |
839 |
|
} else |
840 |
|
po = addarg(po, vval(RVU)); |
841 |
+ |
} |
842 |
|
} else { |
843 |
< |
if (vdef(RPICT)) |
843 |
> |
if (vdef(RPICT)) { |
844 |
|
if (vval(RPICT)[0] != '-') { |
845 |
|
atos(c_rpict, sizeof(c_rpict), vval(RPICT)); |
846 |
|
po = addarg(po, sskip2(vval(RPICT), 1)); |
847 |
|
} else |
848 |
|
po = addarg(po, vval(RPICT)); |
849 |
+ |
} |
850 |
|
} |
851 |
|
} |
852 |
|
|
1147 |
|
po = addarg(po, "-m .25"); |
1148 |
|
break; |
1149 |
|
} |
1150 |
< |
if (vdef(PFILT)) |
1150 |
> |
if (vdef(PFILT)) { |
1151 |
|
if (vval(PFILT)[0] != '-') { |
1152 |
|
atos(c_pfilt, sizeof(c_pfilt), vval(PFILT)); |
1153 |
|
po = addarg(po, sskip2(vval(PFILT), 1)); |
1154 |
|
} else |
1155 |
|
po = addarg(po, vval(PFILT)); |
1156 |
+ |
} |
1157 |
|
} |
1158 |
|
|
1159 |
|
|