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

Comparing ray/src/rt/rpmain.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.7 by schorsch, Mon Jul 21 22:30:19 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rpmain.c - main for rpict batch rendering program
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 < #include  "ray.h"
10 > #include  <sys/types.h>
11 > #include  <signal.h>
12  
13 + #include  "platform.h"
14 + #include  "rtprocess.h" /* getpid() */
15 + #include  "ray.h"
16   #include  "source.h"
68
17   #include  "ambient.h"
70
18   #include  "random.h"
72
19   #include  "paths.h"
74
75 #include  <sys/types.h>
76
77 #include  <signal.h>
78
20   #include  "view.h"
21  
81 #include  "paths.h"
22                                          /* persistent processes define */
23   #ifdef  F_SETLKW
24   #define  PERSIST        1               /* normal persist */
# Line 289 | Line 229 | char  *argv[];
229          initurand(2048);
230                                          /* set up signal handling */
231          sigdie(SIGINT, "Interrupt");
232 + #ifdef SIGHUP
233          sigdie(SIGHUP, "Hangup");
234 + #endif
235          sigdie(SIGTERM, "Terminate");
236 + #ifdef SIGPIPE
237          sigdie(SIGPIPE, "Broken pipe");
238 + #endif
239 + #ifdef SIGALRM
240          sigdie(SIGALRM, "Alarm clock");
241 + #endif
242   #ifdef  SIGXCPU
243          sigdie(SIGXCPU, "CPU limit exceeded");
244          sigdie(SIGXFSZ, "File size exceeded");
# Line 333 | Line 279 | char  *argv[];
279   #endif
280          if (outfile != NULL)
281                  openheader();
282 < #ifdef  MSDOS
283 <        setmode(fileno(stdout), O_BINARY);
282 > #ifdef  _WIN32
283 >        SET_FILE_BINARY(stdout);
284          if (octname == NULL)
285 <                setmode(fileno(stdin), O_BINARY);
285 >                SET_FILE_BINARY(stdin);
286   #endif
287          readoct(octname, loadflags, &thescene, NULL);
288          nsceneobjs = nobjects;
# Line 344 | Line 290 | char  *argv[];
290          if (loadflags & IO_INFO) {      /* print header */
291                  printargs(i, argv, stdout);
292                  printf("SOFTWARE= %s\n", VersionID);
347                fputnow(stdout);
293          }
294  
295          marksources();                  /* find and mark sources */
# Line 373 | Line 318 | char  *argv[];
318                  }
319          }
320   runagain:
321 <        if (persist)
321 >        if (persist) {
322                  if (outfile == NULL)                    /* if out to stdout */
323                          dupheader();                    /* send header */
324                  else                                    /* if out to file */
325                          duped1 = dup(fileno(stdout));   /* hang onto pipe */
326 +        }
327   #endif
328                                          /* batch render picture(s) */
329          rpict(seqstart, outfile, zfile, recover);
# Line 453 | Line 399 | int  signo;
399          if (gotsig++)                   /* two signals and we're gone! */
400                  _exit(signo);
401  
402 + #ifdef SIGALRM /* XXX how critical is this? */
403          alarm(15);                      /* allow 15 seconds to clean up */
404          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
405 + #endif
406          eputs("signal - ");
407          eputs(sigerr[signo]);
408          eputs("\n");
# Line 476 | Line 424 | char  *msg;
424   void
425   printdefaults()                 /* print default values to stdout */
426   {
479        register char  *cp;
480
427          printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
428                          ourview.type==VT_PER ? "perspective" :
429                          ourview.type==VT_PAR ? "parallel" :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines