ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rvmain.c
(Generate patch)

Comparing ray/src/rt/rvmain.c (file contents):
Revision 2.9 by greg, Thu Aug 21 07:05:59 2008 UTC vs.
Revision 2.11 by greg, Wed Oct 5 17:20:55 2011 UTC

# Line 196 | Line 196 | main(int argc, char *argv[])
196                  error(USER, err);
197                                                  /* set up signal handling */
198          sigdie(SIGINT, "Interrupt");
199 –        sigdie(SIGHUP, "Hangup");
199          sigdie(SIGTERM, "Terminate");
200 + #ifndef _WIN32
201 +        sigdie(SIGHUP, "Hangup");
202          sigdie(SIGPIPE, "Broken pipe");
203          sigdie(SIGALRM, "Alarm clock");
204 + #endif
205                                          /* open error file */
206          if (errfile != NULL) {
207                  if (freopen(errfile, "a", stderr) == NULL)
# Line 225 | Line 227 | main(int argc, char *argv[])
227                                          /* set up output & start process(es) */
228          SET_FILE_BINARY(stdout);
229          
230 <        ray_pinit(octnm, 0);
230 >        ray_init(octnm);
231  
232          rview();                        /* run interactive viewer */
233  
# Line 285 | Line 287 | onsig(                         /* fatal signal */
287          if (gotsig++)                   /* two signals and we're gone! */
288                  _exit(signo);
289  
290 + #ifndef _WIN32
291          alarm(15);                      /* allow 15 seconds to clean up */
292          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
293 + #endif
294          eputs("signal - ");
295          eputs(sigerr[signo]);
296          eputs("\n");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines