8 |
|
#include "copyright.h" |
9 |
|
|
10 |
|
#include <signal.h> |
11 |
+ |
#include <time.h> |
12 |
|
|
13 |
|
#include "platform.h" |
14 |
|
#include "ray.h" |
15 |
|
#include "source.h" |
16 |
|
#include "ambient.h" |
17 |
+ |
#include "rpaint.h" |
18 |
|
#include "random.h" |
19 |
|
#include "paths.h" |
20 |
|
#include "view.h" |
43 |
|
extern int psample; /* pixel sample size */ |
44 |
|
extern double maxdiff; /* max. sample difference */ |
45 |
|
|
46 |
< |
void onsig(); |
47 |
< |
void sigdie(); |
48 |
< |
void printdefaults(); |
46 |
> |
static void onsig(int signo); |
47 |
> |
static void sigdie(int signo, char *msg); |
48 |
> |
static void printdefaults(void); |
49 |
|
|
50 |
|
|
51 |
|
int |
52 |
< |
main(argc, argv) |
51 |
< |
int argc; |
52 |
< |
char *argv[]; |
52 |
> |
main(int argc, char *argv[]) |
53 |
|
{ |
54 |
|
#define check(ol,al) if (argv[i][ol] || \ |
55 |
|
badarg(argc-i-1,argv+i+1,al)) \ |
169 |
|
/* initialize object types */ |
170 |
|
initotypes(); |
171 |
|
/* initialize urand */ |
172 |
+ |
srandom(rand_samp ? (long)time(0) : 0L); |
173 |
|
initurand(2048); |
174 |
|
/* set up signal handling */ |
175 |
|
sigdie(SIGINT, "Interrupt"); |
221 |
|
badopt: |
222 |
|
sprintf(errmsg, "command line error at '%s'", argv[i]); |
223 |
|
error(USER, errmsg); |
224 |
+ |
return 1; /* pro forma return */ |
225 |
|
|
226 |
|
#undef check |
227 |
|
#undef bool |
229 |
|
|
230 |
|
|
231 |
|
void |
232 |
< |
wputs(s) /* warning output function */ |
233 |
< |
char *s; |
232 |
> |
wputs( /* warning output function */ |
233 |
> |
char *s |
234 |
> |
) |
235 |
|
{ |
236 |
|
int lasterrno = errno; |
237 |
|
eputs(s); |
240 |
|
|
241 |
|
|
242 |
|
void |
243 |
< |
eputs(s) /* put string to stderr */ |
244 |
< |
register char *s; |
243 |
> |
eputs( /* put string to stderr */ |
244 |
> |
register char *s |
245 |
> |
) |
246 |
|
{ |
247 |
|
static int midline = 0; |
248 |
|
|
260 |
|
} |
261 |
|
|
262 |
|
|
263 |
< |
void |
264 |
< |
onsig(signo) /* fatal signal */ |
265 |
< |
int signo; |
263 |
> |
static void |
264 |
> |
onsig( /* fatal signal */ |
265 |
> |
int signo |
266 |
> |
) |
267 |
|
{ |
268 |
|
static int gotsig = 0; |
269 |
|
|
279 |
|
} |
280 |
|
|
281 |
|
|
282 |
< |
void |
283 |
< |
sigdie(signo, msg) /* set fatal signal */ |
284 |
< |
int signo; |
285 |
< |
char *msg; |
282 |
> |
static void |
283 |
> |
sigdie( /* set fatal signal */ |
284 |
> |
int signo, |
285 |
> |
char *msg |
286 |
> |
) |
287 |
|
{ |
288 |
|
if (signal(signo, onsig) == SIG_IGN) |
289 |
|
signal(signo, SIG_IGN); |
291 |
|
} |
292 |
|
|
293 |
|
|
294 |
< |
void |
295 |
< |
printdefaults() /* print default values to stdout */ |
294 |
> |
static void |
295 |
> |
printdefaults(void) /* print default values to stdout */ |
296 |
|
{ |
291 |
– |
register char *cp; |
292 |
– |
|
297 |
|
printf(greyscale ? "-b+\t\t\t\t# greyscale on\n" : |
298 |
|
"-b-\t\t\t\t# greyscale off\n"); |
299 |
|
printf("-vt%c\t\t\t\t# view type %s\n", ourview.type, |