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

Comparing ray/src/util/getinfo.c (file contents):
Revision 2.13 by schorsch, Sun Mar 6 01:13:18 2016 UTC vs.
Revision 2.16 by greg, Tue Mar 20 18:18:39 2018 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11   #include  <string.h>
12  
13   #include  "platform.h"
14 + #include  "rtprocess.h"
15   #include  "resolu.h"
16  
17   #ifdef getc_unlocked            /* avoid nasty file-locking overhead */
18 + #undef getc
19   #undef getchar
20   #undef putchar
21 + #define getc            getc_unlocked
22   #define getchar         getchar_unlocked
23   #define putchar         putchar_unlocked
24   #endif
25  
23 #if defined(_WIN32) || defined(_WIN64)
24 #include <process.h>
25 #define execvp  _execvp
26 #endif
27
26   static gethfunc tabstr;
27   static void getdim(FILE *fp);
28   static void copycat(void);
# Line 71 | Line 69 | main(
69                  execvp(argv[2], argv+2);
70                  perror(argv[2]);
71                  return 1;
72 +        } else if (argc > 2 && !strcmp(argv[1], "-a")) {
73 +                SET_FILE_BINARY(stdin);
74 +                SET_FILE_BINARY(stdout);
75 +                getheader(stdin, (gethfunc *)fputs, stdout);
76 +                for (i = 2; i < argc; i++) {
77 +                        int     len = strlen(argv[i]);
78 +                        if (!len) continue;
79 +                        fputs(argv[i], stdout);
80 +                        if (argv[i][len-1] != '\n')
81 +                                fputc('\n', stdout);
82 +                }
83 +                fputc('\n', stdout);
84 +                copycat();
85 +                return 0;
86          } else if (argc == 2 && !strcmp(argv[1], "-")) {
87                  SET_FILE_BINARY(stdin);
88                  SET_FILE_BINARY(stdout);
# Line 151 | Line 163 | copycat(void)                  /* copy input to output */
163  
164          fflush(stdout);
165          while ((n = fread(buf, 1, sizeof(buf), stdin)) > 0)
166 <                if (write(fileno(stdout), buf, n) != n)
166 >                if (writebuf(fileno(stdout), buf, n) != n)
167                          break;
168   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines