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

Comparing src/common/getpath.c (file contents):
Revision 2.11 by schorsch, Thu Jun 26 00:58:09 2003 UTC vs.
Revision 2.13 by schorsch, Thu Jul 3 20:59:00 2003 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11  
12   #include  <string.h>
13   #include  <ctype.h>
14 < #ifndef  _WIN32 /* XXX was NIX, do we still compile on Amiga? */
14 > #ifdef   RHAS_GETPWNAM
15    #include  <pwd.h>
16    #include  <sys/types.h>
17   #endif
# Line 33 | Line 33 | register char  *searchpath,
33   int  mode
34   )
35   {
36 < #ifndef  _WIN32 /* XXX was NIX, do we still compile on Amiga? */
36 > #ifdef   RHAS_GETPWNAM
37          struct passwd  *pwent;
38   #endif
39          static char  pname[PATH_MAX];
# Line 64 | Line 64 | int  mode
64                                          strncat(pname, fname, sizeof(pname)-strlen(pname)-1);
65                                          break;
66                                  }
67 < #ifndef _WIN32 /* XXX was NIX, do we still compile on Amiga? */
67 > #ifdef RHAS_GETPWNAM
68                                  /* XXX Should we request our own home directory from the
69                                     XXX system as well if the above fails? */
70                                  /* XXX In any case, we need do the same thing on Windows... */
# Line 171 | Line 171 | int main()
171          unsetenv("HOMEDIR");
172          fp = getpath("~", getenv("PATH"), F_OK);
173          printf(fmt,  "~",        "PATH", "F_OK", fp);
174 < #ifndef _WIN32 /* XXX was NIX, do we still compile on Amiga? */
174 > #ifndef RHAS_GETPWNAM
175          fp = getpath("~lp", getenv("PATH"), F_OK);
176          printf(fmt, "~lp",         "PATH", "F_OK", fp);
177   #endif

Diff Legend

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