author | Ryan C. Gordon <icculus@icculus.org> |
Mon, 22 Mar 2010 11:12:45 -0400 | |
changeset 1077 | 21166622a4d4 |
parent 1062 | a70235520141 |
child 1079 | c218c384331e |
permissions | -rw-r--r-- |
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
1 |
/* |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
2 |
* Unix support routines for PhysicsFS. |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
3 |
* |
809
116b8fe30371
Renamed LICENSE to LICENSE.txt
Ryan C. Gordon <icculus@icculus.org>
parents:
808
diff
changeset
|
4 |
* Please see the file LICENSE.txt in the source's root directory. |
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
5 |
* |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
6 |
* This file written by Ryan C. Gordon. |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
7 |
*/ |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
8 |
|
818
e36f23f49042
Now compiles everything whether we need it or not, removing whole files with
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
9 |
#define __PHYSICSFS_INTERNAL__ |
e36f23f49042
Now compiles everything whether we need it or not, removing whole files with
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
10 |
#include "physfs_platforms.h" |
e36f23f49042
Now compiles everything whether we need it or not, removing whole files with
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
11 |
|
e36f23f49042
Now compiles everything whether we need it or not, removing whole files with
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
12 |
#ifdef PHYSFS_PLATFORM_UNIX |
310
f8bca4a93fd5
Patched to compile on Cygwin.
Ryan C. Gordon <icculus@icculus.org>
parents:
273
diff
changeset
|
13 |
|
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
14 |
#include <stdio.h> |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
15 |
#include <stdlib.h> |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
16 |
#include <string.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
17 |
#include <ctype.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
18 |
#include <unistd.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
19 |
#include <sys/types.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
20 |
#include <pwd.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
21 |
#include <sys/stat.h> |
39
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
22 |
#include <sys/param.h> |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
23 |
#include <dirent.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
24 |
#include <time.h> |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
25 |
#include <errno.h> |
188 | 26 |
|
1054
57f4af811ffb
THIS is Christoph's PHYSFS_stat() work.
Ryan C. Gordon <icculus@icculus.org>
parents:
1047
diff
changeset
|
27 |
#if (!defined PHYSFS_NO_PTHREADS_SUPPORT) |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
28 |
#include <pthread.h> |
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
29 |
#endif |
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
30 |
|
351
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
31 |
#ifdef PHYSFS_HAVE_SYS_UCRED_H |
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
32 |
# ifdef PHYSFS_HAVE_MNTENT_H |
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
33 |
# undef PHYSFS_HAVE_MNTENT_H /* don't do both... */ |
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
34 |
# endif |
995
de210c7e2b09
I think sys/mount.h is only needed in the ucred.h path.
Ryan C. Gordon <icculus@icculus.org>
parents:
990
diff
changeset
|
35 |
# include <sys/mount.h> |
351
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
36 |
# include <sys/ucred.h> |
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
37 |
#endif |
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
38 |
|
bc4fa7896225
Generalized CD-ROM routine selection.
Ryan C. Gordon <icculus@icculus.org>
parents:
347
diff
changeset
|
39 |
#ifdef PHYSFS_HAVE_MNTENT_H |
63
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
40 |
#include <mntent.h> |
188 | 41 |
#endif |
42 |
||
990
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
43 |
#ifdef PHYSFS_HAVE_SYS_MNTTAB_H |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
44 |
#include <sys/mnttab.h> |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
45 |
#endif |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
46 |
|
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
47 |
#include "physfs_internal.h" |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
48 |
|
1062
a70235520141
Fix for the Hurd, from the debian project.
Ryan C. Gordon <icculus@icculus.org>
parents:
1059
diff
changeset
|
49 |
/* !!! FIXME: we should probably remove MAXPATHLEN entirely, if we can. */ |
a70235520141
Fix for the Hurd, from the debian project.
Ryan C. Gordon <icculus@icculus.org>
parents:
1059
diff
changeset
|
50 |
#ifndef MAXPATHLEN |
a70235520141
Fix for the Hurd, from the debian project.
Ryan C. Gordon <icculus@icculus.org>
parents:
1059
diff
changeset
|
51 |
#define MAXPATHLEN 1024 |
a70235520141
Fix for the Hurd, from the debian project.
Ryan C. Gordon <icculus@icculus.org>
parents:
1059
diff
changeset
|
52 |
#endif |
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
53 |
|
130
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
54 |
int __PHYSFS_platformInit(void) |
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
55 |
{ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
56 |
return 1; /* always succeed. */ |
130
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
57 |
} /* __PHYSFS_platformInit */ |
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
58 |
|
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
59 |
|
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
60 |
int __PHYSFS_platformDeinit(void) |
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
61 |
{ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
62 |
return 1; /* always succeed. */ |
130
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
63 |
} /* __PHYSFS_platformDeinit */ |
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
64 |
|
2deec3eb7430
Added __PHYSFS_platformInit() and __PHYSFS_platformDeinit().
Ryan C. Gordon <icculus@icculus.org>
parents:
117
diff
changeset
|
65 |
|
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
66 |
/* Stub version for platforms without CD-ROM support. */ |
657
dad3b5c307a9
Added callback APIs and ripped up the internals everywhere to use them.
Ryan C. Gordon <icculus@icculus.org>
parents:
570
diff
changeset
|
67 |
void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) |
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
68 |
{ |
987
ae7b616e7d0e
Merge all the Unix __PHYSFS_platformDetectAvailableCDs() funcs into one.
Ryan C. Gordon <icculus@icculus.org>
parents:
972
diff
changeset
|
69 |
#if (defined PHYSFS_NO_CDROM_SUPPORT) |
ae7b616e7d0e
Merge all the Unix __PHYSFS_platformDetectAvailableCDs() funcs into one.
Ryan C. Gordon <icculus@icculus.org>
parents:
972
diff
changeset
|
70 |
/* no-op. */ |
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
71 |
|
570
b331437b9ec0
Rewrote MacOSX/Darwin CD detection to use IOKit, for accurate results.
Ryan C. Gordon <icculus@icculus.org>
parents:
520
diff
changeset
|
72 |
#elif (defined PHYSFS_HAVE_SYS_UCRED_H) |
657
dad3b5c307a9
Added callback APIs and ripped up the internals everywhere to use them.
Ryan C. Gordon <icculus@icculus.org>
parents:
570
diff
changeset
|
73 |
int i; |
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
74 |
struct statfs *mntbufp = NULL; |
657
dad3b5c307a9
Added callback APIs and ripped up the internals everywhere to use them.
Ryan C. Gordon <icculus@icculus.org>
parents:
570
diff
changeset
|
75 |
int mounts = getmntinfo(&mntbufp, MNT_WAIT); |
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
76 |
|
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
77 |
for (i = 0; i < mounts; i++) |
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
78 |
{ |
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
79 |
int add_it = 0; |
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
80 |
|
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
81 |
if (strcmp(mntbufp[i].f_fstypename, "iso9660") == 0) |
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
82 |
add_it = 1; |
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
83 |
else if (strcmp( mntbufp[i].f_fstypename, "cd9660") == 0) |
191 | 84 |
add_it = 1; |
225 | 85 |
|
86 |
/* add other mount types here */ |
|
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
87 |
|
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
88 |
if (add_it) |
657
dad3b5c307a9
Added callback APIs and ripped up the internals everywhere to use them.
Ryan C. Gordon <icculus@icculus.org>
parents:
570
diff
changeset
|
89 |
cb(data, mntbufp[i].f_mntonname); |
381
b65d27fdc8a9
Can now disable CD-ROM code on Unix systems at build time if need be. The
Ryan C. Gordon <icculus@icculus.org>
parents:
351
diff
changeset
|
90 |
} /* for */ |
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
91 |
|
570
b331437b9ec0
Rewrote MacOSX/Darwin CD detection to use IOKit, for accurate results.
Ryan C. Gordon <icculus@icculus.org>
parents:
520
diff
changeset
|
92 |
#elif (defined PHYSFS_HAVE_MNTENT_H) |
63
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
93 |
FILE *mounts = NULL; |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
94 |
struct mntent *ent = NULL; |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
95 |
|
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
96 |
mounts = setmntent("/etc/mtab", "r"); |
678
73a2641375a0
Cleaned up some minor bloat with my new evil GOTO_*_MACRO macros.
Ryan C. Gordon <icculus@icculus.org>
parents:
677
diff
changeset
|
97 |
BAIL_IF_MACRO(mounts == NULL, ERR_IO_ERROR, /*return void*/); |
63
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
98 |
|
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
99 |
while ( (ent = getmntent(mounts)) != NULL ) |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
100 |
{ |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
101 |
int add_it = 0; |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
102 |
if (strcmp(ent->mnt_type, "iso9660") == 0) |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
103 |
add_it = 1; |
1077
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
104 |
else if (strcmp(ent->mnt_type, "udf") == 0) |
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
105 |
add_it = 1; |
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
106 |
|
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
107 |
/* !!! FIXME: these might pick up floppy drives, right? */ |
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
108 |
else if (strcmp(ent->mnt_type, "auto") == 0) |
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
109 |
add_it = 1; |
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
110 |
else if (strcmp(ent->mnt_type, "supermount") == 0) |
21166622a4d4
Add some more filesystem types that might be CDs or DVDs.
Ryan C. Gordon <icculus@icculus.org>
parents:
1062
diff
changeset
|
111 |
add_it = 1; |
225 | 112 |
|
1059 | 113 |
/* !!! FIXME: udf? automount? */ |
114 |
||
225 | 115 |
/* add other mount types here */ |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
116 |
|
63
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
117 |
if (add_it) |
657
dad3b5c307a9
Added callback APIs and ripped up the internals everywhere to use them.
Ryan C. Gordon <icculus@icculus.org>
parents:
570
diff
changeset
|
118 |
cb(data, ent->mnt_dir); |
63
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
119 |
} /* while */ |
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
120 |
|
cb9a4714b844
Added CD-ROM detection code.
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
121 |
endmntent(mounts); |
990
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
122 |
|
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
123 |
#elif (defined PHYSFS_HAVE_SYS_MNTTAB_H) |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
124 |
FILE *mounts = fopen(MNTTAB, "r"); |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
125 |
struct mnttab ent; |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
126 |
|
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
127 |
BAIL_IF_MACRO(mounts == NULL, ERR_IO_ERROR, /*return void*/); |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
128 |
while (getmntent(mounts, &ent) == 0) |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
129 |
{ |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
130 |
int add_it = 0; |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
131 |
if (strcmp(ent.mnt_fstype, "hsfs") == 0) |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
132 |
add_it = 1; |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
133 |
|
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
134 |
/* add other mount types here */ |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
135 |
|
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
136 |
if (add_it) |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
137 |
cb(data, ent.mnt_mountp); |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
138 |
} /* while */ |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
139 |
|
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
140 |
fclose(mounts); |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
141 |
|
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
142 |
#else |
c25717b5c165
Added sys/mnttab.h CD-ROM detection. Fixes missing CD-ROM support on Solaris.
Ryan C. Gordon <icculus@icculus.org>
parents:
987
diff
changeset
|
143 |
#error Unknown platform. Should have defined PHYSFS_NO_CDROM_SUPPORT, perhaps. |
987
ae7b616e7d0e
Merge all the Unix __PHYSFS_platformDetectAvailableCDs() funcs into one.
Ryan C. Gordon <icculus@icculus.org>
parents:
972
diff
changeset
|
144 |
#endif |
117
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
145 |
} /* __PHYSFS_platformDetectAvailableCDs */ |
55ae10d7f2a9
Darwin support by Patrick Stein.
Ryan C. Gordon <icculus@icculus.org>
parents:
115
diff
changeset
|
146 |
|
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
147 |
|
233
1b74a7df1ca6
Split some of the unix.c code out to posix.c for BeOS to use.
Ryan C. Gordon <icculus@icculus.org>
parents:
225
diff
changeset
|
148 |
/* this is in posix.c ... */ |
1b74a7df1ca6
Split some of the unix.c code out to posix.c for BeOS to use.
Ryan C. Gordon <icculus@icculus.org>
parents:
225
diff
changeset
|
149 |
extern char *__PHYSFS_platformCopyEnvironmentVariable(const char *varname); |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
150 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
151 |
|
225 | 152 |
/* |
153 |
* See where program (bin) resides in the $PATH specified by (envr). |
|
154 |
* returns a copy of the first element in envr that contains it, or NULL |
|
155 |
* if it doesn't exist or there were other problems. PHYSFS_SetError() is |
|
156 |
* called if we have a problem. |
|
157 |
* |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
678
diff
changeset
|
158 |
* (envr) will be scribbled over, and you are expected to allocator.Free() the |
225 | 159 |
* return value when you're done with it. |
160 |
*/ |
|
161 |
static char *findBinaryInPath(const char *bin, char *envr) |
|
162 |
{ |
|
163 |
size_t alloc_size = 0; |
|
164 |
char *exe = NULL; |
|
165 |
char *start = envr; |
|
166 |
char *ptr; |
|
167 |
||
168 |
BAIL_IF_MACRO(bin == NULL, ERR_INVALID_ARGUMENT, NULL); |
|
169 |
BAIL_IF_MACRO(envr == NULL, ERR_INVALID_ARGUMENT, NULL); |
|
170 |
||
171 |
do |
|
172 |
{ |
|
173 |
size_t size; |
|
174 |
ptr = strchr(start, ':'); /* find next $PATH separator. */ |
|
175 |
if (ptr) |
|
176 |
*ptr = '\0'; |
|
177 |
||
178 |
size = strlen(start) + strlen(bin) + 2; |
|
179 |
if (size > alloc_size) |
|
180 |
{ |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
678
diff
changeset
|
181 |
char *x = (char *) allocator.Realloc(exe, size); |
225 | 182 |
if (x == NULL) |
183 |
{ |
|
184 |
if (exe != NULL) |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
678
diff
changeset
|
185 |
allocator.Free(exe); |
225 | 186 |
BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); |
187 |
} /* if */ |
|
188 |
||
189 |
alloc_size = size; |
|
190 |
exe = x; |
|
191 |
} /* if */ |
|
192 |
||
193 |
/* build full binary path... */ |
|
194 |
strcpy(exe, start); |
|
505
c7f7f234a156
Minor fix for odd PATH entries.
Ryan C. Gordon <icculus@icculus.org>
parents:
452
diff
changeset
|
195 |
if ((exe[0] == '\0') || (exe[strlen(exe) - 1] != '/')) |
225 | 196 |
strcat(exe, "/"); |
197 |
strcat(exe, bin); |
|
198 |
||
199 |
if (access(exe, X_OK) == 0) /* Exists as executable? We're done. */ |
|
200 |
{ |
|
201 |
strcpy(exe, start); /* i'm lazy. piss off. */ |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
202 |
return exe; |
225 | 203 |
} /* if */ |
204 |
||
205 |
start = ptr + 1; /* start points to beginning of next element. */ |
|
206 |
} while (ptr != NULL); |
|
207 |
||
208 |
if (exe != NULL) |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
678
diff
changeset
|
209 |
allocator.Free(exe); |
225 | 210 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
211 |
return NULL; /* doesn't exist in path. */ |
225 | 212 |
} /* findBinaryInPath */ |
213 |
||
214 |
||
1001
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
215 |
static char *readSymLink(const char *path) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
216 |
{ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
217 |
ssize_t len = 64; |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
218 |
ssize_t rc = -1; |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
219 |
char *retval = NULL; |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
220 |
|
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
221 |
while (1) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
222 |
{ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
223 |
char *ptr = (char *) allocator.Realloc(retval, (size_t) len); |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
224 |
if (ptr == NULL) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
225 |
break; /* out of memory. */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
226 |
retval = ptr; |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
227 |
|
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
228 |
rc = readlink(path, retval, len); |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
229 |
if (rc == -1) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
230 |
break; /* not a symlink, i/o error, etc. */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
231 |
|
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
232 |
else if (rc < len) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
233 |
{ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
234 |
retval[rc] = '\0'; /* readlink doesn't null-terminate. */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
235 |
return retval; /* we're good to go. */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
236 |
} /* else if */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
237 |
|
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
238 |
len *= 2; /* grow buffer, try again. */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
239 |
} /* while */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
240 |
|
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
241 |
if (retval != NULL) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
242 |
allocator.Free(retval); |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
243 |
return NULL; |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
244 |
} /* readSymLink */ |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
245 |
|
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
246 |
|
23
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
247 |
char *__PHYSFS_platformCalcBaseDir(const char *argv0) |
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
248 |
{ |
840
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
249 |
char *retval = NULL; |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
250 |
char *envr = NULL; |
23
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
251 |
|
840
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
252 |
/* fast path: default behaviour can handle this. */ |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
253 |
if ( (argv0 != NULL) && (strchr(argv0, '/') != NULL) ) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
254 |
return NULL; /* higher level will parse out real path from argv0. */ |
23
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
255 |
|
840
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
256 |
/* |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
257 |
* Try to avoid using argv0 unless forced to. If there's a Linux-like |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
258 |
* /proc filesystem, you can get the full path to the current process from |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
259 |
* the /proc/self/exe symlink. |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
260 |
*/ |
1001
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
261 |
retval = readSymLink("/proc/self/exe"); |
1003
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
262 |
if (retval == NULL) |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
263 |
{ |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
264 |
/* older kernels don't have /proc/self ... try PID version... */ |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
265 |
const unsigned long long pid = (unsigned long long) getpid(); |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
266 |
char path[64]; |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
267 |
const int rc = (int) snprintf(path,sizeof(path),"/proc/%llu/exe",pid); |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
268 |
if ( (rc > 0) && (rc < sizeof(path)) ) |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
269 |
retval = readSymLink(path); |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
270 |
} /* if */ |
a28d30d275e2
Try /proc/$PID/exe if /proc/self/exe doesn't work out.
Ryan C. Gordon <icculus@icculus.org>
parents:
1002
diff
changeset
|
271 |
|
1001
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
272 |
if (retval != NULL) /* chop off filename. */ |
840
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
273 |
{ |
1001
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
274 |
char *ptr = strrchr(retval, '/'); |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
275 |
if (ptr != NULL) |
b0c6f2f4f361
Fixed wrong readlink() usage (lstat() doesn't report dest link size!).
Ryan C. Gordon <icculus@icculus.org>
parents:
995
diff
changeset
|
276 |
*ptr = '\0'; |
840
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
277 |
} /* if */ |
23
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
278 |
|
840
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
279 |
if ((retval == NULL) && (argv0 != NULL)) |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
280 |
{ |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
281 |
/* If there's no dirsep on argv0, then look through $PATH for it. */ |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
282 |
envr = __PHYSFS_platformCopyEnvironmentVariable("PATH"); |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
283 |
BAIL_IF_MACRO(!envr, NULL, NULL); |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
284 |
retval = findBinaryInPath(argv0, envr); |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
285 |
allocator.Free(envr); |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
286 |
} /* if */ |
7f071b3b121e
Try to use /proc/self/exe to determine the base dir. This lets systems with a
Ryan C. Gordon <icculus@icculus.org>
parents:
823
diff
changeset
|
287 |
|
1002
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
288 |
if (retval != NULL) |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
289 |
{ |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
290 |
/* try to shrink buffer... */ |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
291 |
char *ptr = (char *) allocator.Realloc(retval, strlen(retval) + 1); |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
292 |
if (ptr != NULL) |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
293 |
retval = ptr; /* oh well if it failed. */ |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
294 |
} /* if */ |
001380a457a0
Try to shrink returned buffer's allocation.
Ryan C. Gordon <icculus@icculus.org>
parents:
1001
diff
changeset
|
295 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
296 |
return retval; |
23
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
297 |
} /* __PHYSFS_platformCalcBaseDir */ |
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
298 |
|
bd6ba9c8717c
Initial debugging: dropped PhysicsFS routines into the Build engine,
Ryan C. Gordon <icculus@icculus.org>
parents:
20
diff
changeset
|
299 |
|
39
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
300 |
char *__PHYSFS_platformRealPath(const char *path) |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
301 |
{ |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
302 |
char resolved_path[MAXPATHLEN]; |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
303 |
char *retval = NULL; |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
304 |
|
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
305 |
errno = 0; |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
306 |
BAIL_IF_MACRO(!realpath(path, resolved_path), strerror(errno), NULL); |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
678
diff
changeset
|
307 |
retval = (char *) allocator.Malloc(strlen(resolved_path) + 1); |
39
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
308 |
BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
309 |
strcpy(retval, resolved_path); |
520
a72bbf255074
Added hack for OSX bundles, from Eric Wing.
Ryan C. Gordon <icculus@icculus.org>
parents:
505
diff
changeset
|
310 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
311 |
return retval; |
39
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
312 |
} /* __PHYSFS_platformRealPath */ |
bc29e1ee7ef6
Lots of bugfixes, enhancements, and corrections due to the work on
Ryan C. Gordon <icculus@icculus.org>
parents:
28
diff
changeset
|
313 |
|
69
546a95cc5591
Updates, corrections and enhancements to get this ported to win32.
Ryan C. Gordon <icculus@icculus.org>
parents:
67
diff
changeset
|
314 |
|
847
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
315 |
char *__PHYSFS_platformCurrentDir(void) |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
316 |
{ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
317 |
/* |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
318 |
* This can't just do platformRealPath("."), since that would eventually |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
319 |
* just end up calling back into here. |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
320 |
*/ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
321 |
|
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
322 |
int allocSize = 0; |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
323 |
char *retval = NULL; |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
324 |
char *ptr; |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
325 |
|
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
326 |
do |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
327 |
{ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
328 |
allocSize += 100; |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
329 |
ptr = (char *) allocator.Realloc(retval, allocSize); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
330 |
if (ptr == NULL) |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
331 |
{ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
332 |
if (retval != NULL) |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
333 |
allocator.Free(retval); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
334 |
BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
335 |
} /* if */ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
336 |
|
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
337 |
retval = ptr; |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
338 |
ptr = getcwd(retval, allocSize); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
339 |
} while (ptr == NULL && errno == ERANGE); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
340 |
|
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
341 |
if (ptr == NULL && errno) |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
342 |
{ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
343 |
/* |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
344 |
* getcwd() failed for some reason, for example current |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
345 |
* directory not existing. |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
346 |
*/ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
347 |
if (retval != NULL) |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
348 |
allocator.Free(retval); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
349 |
BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
350 |
} /* if */ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
351 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
352 |
return retval; |
847
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
353 |
} /* __PHYSFS_platformCurrentDir */ |
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
354 |
|
5e5e6c067413
Split out Mac OS X code from unix.c and added some Carbon-specific code...
Ryan C. Gordon <icculus@icculus.org>
parents:
846
diff
changeset
|
355 |
|
845
3f150ffcf50c
Since all the platform layers were using the same cut-and-paste of the
Ryan C. Gordon <icculus@icculus.org>
parents:
844
diff
changeset
|
356 |
int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) |
3f150ffcf50c
Since all the platform layers were using the same cut-and-paste of the
Ryan C. Gordon <icculus@icculus.org>
parents:
844
diff
changeset
|
357 |
{ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
358 |
return 0; /* just use malloc() and friends. */ |
845
3f150ffcf50c
Since all the platform layers were using the same cut-and-paste of the
Ryan C. Gordon <icculus@icculus.org>
parents:
844
diff
changeset
|
359 |
} /* __PHYSFS_platformSetDefaultAllocator */ |
3f150ffcf50c
Since all the platform layers were using the same cut-and-paste of the
Ryan C. Gordon <icculus@icculus.org>
parents:
844
diff
changeset
|
360 |
|
3f150ffcf50c
Since all the platform layers were using the same cut-and-paste of the
Ryan C. Gordon <icculus@icculus.org>
parents:
844
diff
changeset
|
361 |
|
1054
57f4af811ffb
THIS is Christoph's PHYSFS_stat() work.
Ryan C. Gordon <icculus@icculus.org>
parents:
1047
diff
changeset
|
362 |
#if (defined PHYSFS_NO_PTHREADS_SUPPORT) |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
363 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
364 |
void *__PHYSFS_platformGetThreadID(void) { return ((void *) 0x0001); } |
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
365 |
void *__PHYSFS_platformCreateMutex(void) { return ((void *) 0x0001); } |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
366 |
void __PHYSFS_platformDestroyMutex(void *mutex) {} |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
367 |
int __PHYSFS_platformGrabMutex(void *mutex) { return 1; } |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
368 |
void __PHYSFS_platformReleaseMutex(void *mutex) {} |
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
369 |
|
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
370 |
#else |
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
371 |
|
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
372 |
typedef struct |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
373 |
{ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
374 |
pthread_mutex_t mutex; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
375 |
pthread_t owner; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
376 |
PHYSFS_uint32 count; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
377 |
} PthreadMutex; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
378 |
|
452
89578e99ba6e
Attempt to fix pthread-to-ui64 cast issue.
Ryan C. Gordon <icculus@icculus.org>
parents:
396
diff
changeset
|
379 |
|
1012
f254870dd7dd
Attempt to clean up the thread ID mess in platform_unix ...
Ryan C. Gordon <icculus@icculus.org>
parents:
1003
diff
changeset
|
380 |
void *__PHYSFS_platformGetThreadID(void) |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
381 |
{ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
382 |
return ( (void *) ((size_t) pthread_self()) ); |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
383 |
} /* __PHYSFS_platformGetThreadID */ |
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
384 |
|
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
385 |
|
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
386 |
void *__PHYSFS_platformCreateMutex(void) |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
387 |
{ |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
388 |
int rc; |
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
389 |
PthreadMutex *m = (PthreadMutex *) allocator.Malloc(sizeof (PthreadMutex)); |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
390 |
BAIL_IF_MACRO(m == NULL, ERR_OUT_OF_MEMORY, NULL); |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
391 |
rc = pthread_mutex_init(&m->mutex, NULL); |
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
392 |
if (rc != 0) |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
393 |
{ |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
678
diff
changeset
|
394 |
allocator.Free(m); |
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
395 |
BAIL_MACRO(strerror(rc), NULL); |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
396 |
} /* if */ |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
397 |
|
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
398 |
m->count = 0; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
399 |
m->owner = (pthread_t) 0xDEADBEEF; |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
400 |
return ((void *) m); |
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
401 |
} /* __PHYSFS_platformCreateMutex */ |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
402 |
|
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
403 |
|
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
404 |
void __PHYSFS_platformDestroyMutex(void *mutex) |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
405 |
{ |
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
406 |
PthreadMutex *m = (PthreadMutex *) mutex; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
407 |
|
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
408 |
/* Destroying a locked mutex is a bug, but we'll try to be helpful. */ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
409 |
if ((m->owner == pthread_self()) && (m->count > 0)) |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
410 |
pthread_mutex_unlock(&m->mutex); |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
411 |
|
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
412 |
pthread_mutex_destroy(&m->mutex); |
757
50e6457e78be
Made unix mutexes recursive.
Ryan C. Gordon <icculus@icculus.org>
parents:
691
diff
changeset
|
413 |
allocator.Free(m); |
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
414 |
} /* __PHYSFS_platformDestroyMutex */ |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
415 |
|
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
416 |
|
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
417 |
int __PHYSFS_platformGrabMutex(void *mutex) |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
418 |
{ |
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
419 |
PthreadMutex *m = (PthreadMutex *) mutex; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
420 |
pthread_t tid = pthread_self(); |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
421 |
if (m->owner != tid) |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
422 |
{ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
423 |
if (pthread_mutex_lock(&m->mutex) != 0) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
424 |
return 0; |
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
425 |
m->owner = tid; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
426 |
} /* if */ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
427 |
|
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
428 |
m->count++; |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1012
diff
changeset
|
429 |
return 1; |
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
430 |
} /* __PHYSFS_platformGrabMutex */ |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
431 |
|
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
432 |
|
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
433 |
void __PHYSFS_platformReleaseMutex(void *mutex) |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
434 |
{ |
889
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
435 |
PthreadMutex *m = (PthreadMutex *) mutex; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
436 |
if (m->owner == pthread_self()) |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
437 |
{ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
438 |
if (--m->count == 0) |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
439 |
{ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
440 |
m->owner = (pthread_t) 0xDEADBEEF; |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
441 |
pthread_mutex_unlock(&m->mutex); |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
442 |
} /* if */ |
0364fa566f29
Reverted change r857:858...recursive mutex APIs sort of suck for portability.
Ryan C. Gordon <icculus@icculus.org>
parents:
847
diff
changeset
|
443 |
} /* if */ |
145
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
444 |
} /* __PHYSFS_platformReleaseMutex */ |
d6385584f6c4
First shot at thread-safety.
Ryan C. Gordon <icculus@icculus.org>
parents:
137
diff
changeset
|
445 |
|
1054
57f4af811ffb
THIS is Christoph's PHYSFS_stat() work.
Ryan C. Gordon <icculus@icculus.org>
parents:
1047
diff
changeset
|
446 |
#endif /* !PHYSFS_NO_PTHREADS_SUPPORT */ |
390
6649d6caecf2
Stub code for platforms without functional pthreads.
Ryan C. Gordon <icculus@icculus.org>
parents:
381
diff
changeset
|
447 |
|
818
e36f23f49042
Now compiles everything whether we need it or not, removing whole files with
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
448 |
#endif /* PHYSFS_PLATFORM_UNIX */ |
233
1b74a7df1ca6
Split some of the unix.c code out to posix.c for BeOS to use.
Ryan C. Gordon <icculus@icculus.org>
parents:
225
diff
changeset
|
449 |
|
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
450 |
/* end of unix.c ... */ |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
451 |