ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/ranimate.c
(Generate patch)

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.38 by greg, Fri Jun 6 20:04:06 2003 UTC vs.
Revision 2.42 by schorsch, Tue Oct 21 19:19:29 2003 UTC

# Line 15 | Line 15 | static const char RCSid[] = "$Id$";
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"
# Line 26 | Line 28 | static const char RCSid[] = "$Id$";
28   #define DEF_NBLUR       5
29   #endif
30                                  /* default remote shell */
29 – #ifdef _AUX_SOURCE
30 – #define REMSH           "remsh"
31 – #else
31   #define REMSH           "rsh"
33 – #endif
32                                  /* input variables (alphabetical by name) */
33   #define ANIMATE         0               /* animation command */
34   #define ARCHIVE         1               /* archiving command */
# Line 480 | Line 478 | char   *rfargs;
478                          pippt = NULL;
479                  }
480          if (pippt != NULL)
481 <                strcpy(pippt, "> /dev/null");   /* nothing to match */
481 >                strcpy(pippt, "> " NULL_DEVICE);        /* nothing to match */
482          else {
483                  sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
484                  cp += 11;               /* point to file name */
# Line 886 | Line 884 | int    rvr;
884                  quit(1);
885          }
886          usepinterp = (nblur > 1);
887 <        usepfilt = pfiltalways | ep==NULL;
887 >        usepfilt = pfiltalways | (ep==NULL);
888          if (ep != NULL && !strcmp(ep, "1"))
889                  ep = "+0";
890          nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL ||
# Line 1033 | Line 1031 | int    n;
1031                          fclose(viewfp);
1032                          viewfp = NULL;
1033                          viewnum = 0;
1034 <                        copystruct(&curview, &stdview);
1034 >                        curview = stdview;
1035                  }
1036                  return(NULL);
1037          }
# Line 1049 | Line 1047 | int    n;
1047                          perror(vval(VIEWFILE));
1048                          quit(1);
1049                  }
1050 <                copystruct(&curview, &stdview);
1050 >                curview = stdview;
1051                  viewnum = 0;
1052          }
1053          if (n < 0) {                            /* get next view */
# Line 1393 | Line 1391 | register char  *path;
1391          for (i = 0, psep = -1; path[i]; i++)
1392                  if (path[i] == '/')
1393                          psep = i;
1394 <        if (df != NULL)
1394 >        if (df != NULL) {
1395                  if (psep == 0) {
1396                          df[0] = '/';
1397                          df[1] = '\0';
# Line 1402 | Line 1400 | register char  *path;
1400                          df[psep] = '\0';
1401                  } else
1402                          df[0] = '\0';
1403 +        }
1404          return(path+psep+1);
1405   }
1406  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)