sdl-ios-xcode: src/loadso/macosx/SDL

annotate src/loadso/macosx/SDL_sysloadso.c @ 1768:814f9f2c7a33

Fixed bug #80 Date: 21 Apr 2003 17:20:20 +0100 From: Alan Swanson <swanson@uklinux.net> Subject: [SDL] New XFree 4.3 Video Mode Patch If you look at the unsorted list of modes returned by X, here's mine; 1280 x 1024 @ 85.0 > 1024 x 768 @ 100.3 > USER 800 x 600 @ 125.5 > SET 640 x 480 @ 124.9 > 1280 x 1024 @ 75.0 ] 1280 x 1024 @ 60.0 ] 1280 x 960 @ 85.0 ] X11 1280 x 960 @ 60.0 ] AUTO 1152 x 864 @ 75.0 ]=20 1152 x 768 @ 54.8 ] 960 x 720 @ 120.0 ] ... 640 x 400 @ 85.1 ] 256k 576 x 432 @ 150.0 ] 249k PIXEL 640 x 350 @ 85.1 ] 224k COUNT 576 x 384 @ 109.6 ] 221k ... The user set modes come first followed by X set modes which are ordered by decreasing number of pixels and refresh. The reason why every other library or program not using SDL working is due to SDL scanning the modes in reverse getting X11 provided modes modes with the lowest refresh.

author	Sam Lantinga <slouken@libsdl.org>
date	Fri, 05 May 2006 05:50:26 +0000
parents	9f59d4c5aaea
children	828a17e05192

rev	line source
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	3 Copyright (C) 1997-2006 Sam Lantinga
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1379 diff changeset	22 #include "SDL_config.h"
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
1635 92947e3a18db Make sure code is only compiled if the appropriate subsystem is enabled Sam Lantinga <slouken@libsdl.org> parents: 1479 diff changeset	24 #ifdef SDL_LOADSO_DLCOMPAT
92947e3a18db Make sure code is only compiled if the appropriate subsystem is enabled Sam Lantinga <slouken@libsdl.org> parents: 1479 diff changeset	25
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 /* Please note that dlcompat apparently ships in current Mac OS X versions
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 * as a system library that provides compatibility with the Unix "dlopen"
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 * interface. In order to allow SDL to work on older OS X releases and also
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 * not conflict with the system lib on newer versions, we include dlcompat
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 * in SDL and change the symbols to prevent symbol clash with any existing
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 * system libraries. --ryan.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 /* here is the dlcompat license: */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 Copyright (c) 2002 Jorge Acereda <jacereda@users.sourceforge.net> &
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 Peter O'Gorman <ogorman@users.sourceforge.net>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 Portions may be copyright others, see the AUTHORS file included with this
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 distribution.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 Maintained by Peter O'Gorman <ogorman@users.sourceforge.net>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 Bug Reports and other queries should go to <ogorman@users.sourceforge.net>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 Permission is hereby granted, free of charge, to any person obtaining
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 a copy of this software and associated documentation files (the
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 "Software"), to deal in the Software without restriction, including
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 without limitation the rights to use, copy, modify, merge, publish,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 distribute, sublicense, and/or sell copies of the Software, and to
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 permit persons to whom the Software is furnished to do so, subject to
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 the following conditions:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 The above copyright notice and this permission notice shall be
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 included in all copies or substantial portions of the Software.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 #include <pthread.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 #include <sys/types.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 #include <sys/stat.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 #include <stdarg.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 #include <limits.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 #include <mach-o/dyld.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 #include <mach-o/nlist.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 #include <mach-o/getsect.h>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 #include "SDL_stdinc.h"
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 /* Just playing to see if it would compile with the freebsd headers, it does,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 * but because of the different values for RTLD_LOCAL etc, it would break binary
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 * compat... oh well
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 #ifndef __BSD_VISIBLE
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 #define __BSD_VISIBLE 1
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 /include "dlfcn.h"/
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 #ifdef __cplusplus
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 extern "C" {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 #if defined (__GNUC__) && __GNUC__ > 3
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 #define dl_restrict __restrict
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93 #else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 #define dl_restrict
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 #ifndef _POSIX_SOURCE
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 * Structure filled in by dladdr().
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 typedef struct SDL_OSX_dl_info {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 const char dli_fname; / Pathname of shared object */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 void dli_fbase; / Base address of shared object */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 const char dli_sname; / Name of nearest symbol */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 void dli_saddr; / Address of nearest symbol */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 } SDL_OSX_Dl_info;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 static int SDL_OSX_dladdr(const void * dl_restrict, SDL_OSX_Dl_info * dl_restrict);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 #endif /* ! _POSIX_SOURCE */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 static int SDL_OSX_dlclose(void * handle);
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	112 static const char * SDL_OSX_dlerror(void);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 static void * SDL_OSX_dlopen(const char *path, int mode);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 static void * SDL_OSX_dlsym(void * dl_restrict handle, const char * dl_restrict symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 #define RTLD_LAZY 0x1
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 #define RTLD_NOW 0x2
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 #define RTLD_LOCAL 0x4
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 #define RTLD_GLOBAL 0x8
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 #ifndef _POSIX_SOURCE
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 #define RTLD_NOLOAD 0x10
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 #define RTLD_NODELETE 0x80
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 * Special handle arguments for SDL_OSX_dlsym().
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 #define RTLD_NEXT ((void ) -1) / Search subsequent objects. */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 #define RTLD_DEFAULT ((void ) -2) / Use default search algorithm. */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 #endif /* ! _POSIX_SOURCE */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 #ifdef __cplusplus
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 #ifndef dl_restrict
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 #define dl_restrict __restrict
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 /* This is not available on 10.1 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 #ifndef LC_LOAD_WEAK_DYLIB
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 #define LC_LOAD_WEAK_DYLIB (0x18 \| LC_REQ_DYLD)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 /* With this stuff here, this thing may actually compile/run on 10.0 systems
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 * Not that I have a 10.0 system to test it on anylonger
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 #ifndef LC_REQ_DYLD
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 #define LC_REQ_DYLD 0x80000000
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150 #ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 #define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 #ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 #define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 #ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157 #define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 #ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 #define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162 /* These symbols will be looked for in dyld */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163 static const struct mach_header (dyld_NSAddImage) (const char *, unsigned long) = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 static int (dyld_NSIsSymbolNameDefinedInImage) (const struct mach_header , const char *) = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 static NSSymbol(*dyld_NSLookupSymbolInImage)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 (const struct mach_header , const char , unsigned long) = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168 /* Define this to make dlcompat reuse data block. This way in theory we save
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 * a little bit of overhead. However we then couldn't correctly catch excess
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170 * calls to SDL_OSX_dlclose(). Hence we don't use this feature
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 #undef REUSE_STATUS
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174 /* Size of the internal error message buffer (used by dlerror()) */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 #define ERR_STR_LEN 251
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 /* Maximum number of search paths supported by getSearchPath */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 #define MAX_SEARCH_PATHS 32
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 #define MAGIC_DYLIB_OFI ((NSObjectFileImage) 'DYOF')
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 #define MAGIC_DYLIB_MOD ((NSModule) 'DYMO')
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 /* internal flags */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 #define DL_IN_LIST 0x01
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 /* our mutex */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188 static pthread_mutex_t dlcompat_mutex;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	189 /* Our thread specific storage
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	190 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	191 static pthread_key_t dlerror_key;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193 struct dlthread
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 int lockcnt;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	196 unsigned char errset;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	197 char errstr[ERR_STR_LEN];
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198 };
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 /* This is our central data structure. Whenever a module is loaded via
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201 * SDL_OSX_dlopen(), we create such a struct.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	203 struct dlstatus
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	204 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	205 struct dlstatus next; / pointer to next element in the linked list */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206 NSModule module;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	207 const struct mach_header *lib;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	208 int refs; /* reference count */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 int mode; /* mode in which this module was loaded */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	210 dev_t device;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211 ino_t inode;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 int flags; /* Any internal flags we may need */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213 };
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	214
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215 /* Head node of the dlstatus list */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 static struct dlstatus mainStatus = { 0, MAGIC_DYLIB_MOD, NULL, -1, RTLD_GLOBAL, 0, 0, 0 };
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 static struct dlstatus *stqueue = &mainStatus;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 /* Storage for the last error message (used by dlerror()) */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 /* static char err_str[ERR_STR_LEN]; */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 /* static int err_filled = 0; */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 /* Prototypes to internal functions */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 static void debug(const char *fmt, ...);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 static void error(const char *str, ...);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 static const char safegetenv(const char s);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 static const char *searchList(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 static const char *getSearchPath(int i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 static const char getFullPath(int i, const char file);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 static const struct stat findFile(const char file, const char **fullPath);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 static int isValidStatus(struct dlstatus *status);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 static inline int isFlagSet(int mode, int flag);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 static struct dlstatus lookupStatus(const struct stat sbuf);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 static void insertStatus(struct dlstatus dls, const struct stat sbuf);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 static int promoteLocalToGlobal(struct dlstatus *dls);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 static void reference(struct dlstatus dls, int mode);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 static void dlsymIntern(struct dlstatus dls, const char *symbol, int canSetError);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 static struct dlstatus *allocStatus(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 static struct dlstatus loadModule(const char path, const struct stat *sbuf, int mode);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 static NSSymbol search_linked_libs(const struct mach_header mh, const char *symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 static const char get_lib_name(const struct mach_header mh);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 static const struct mach_header get_mach_header_from_NSModule(NSModule mod);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 static void dlcompat_init_func(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 static inline void dlcompat_init_check(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246 static inline void dolock(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 static inline void dounlock(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248 static void dlerrorfree(void *data);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249 static void resetdlerror(void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 static const struct mach_header my_find_image(const char name);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 static const struct mach_header image_for_address(const void address);
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	252 static inline char *dyld_error_str(void);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 #if FINK_BUILD
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 /* Two Global Functions */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 static void dlsym_prepend_underscore(void handle, const char *symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 static void dlsym_auto_underscore(void handle, const char *symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 /* And their _intern counterparts */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 static void dlsym_prepend_underscore_intern(void handle, const char *symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 static void dlsym_auto_underscore_intern(void handle, const char *symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264 /* Functions */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 static void debug(const char *fmt, ...)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 #if DEBUG > 1
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269 va_list arg;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 va_start(arg, fmt);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 fprintf(stderr, "DLDEBUG: ");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 vfprintf(stderr, fmt, arg);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 fprintf(stderr, "\n");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 fflush(stderr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275 va_end(arg);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	279 static void error(const char *str, ...)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	280 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 va_list arg;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282 struct dlthread *tss;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 char * err_str;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	284 va_start(arg, str);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	285 tss = pthread_getspecific(dlerror_key);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	286 err_str = tss->errstr;
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	287 SDL_strlcpy(err_str, "dlcompat: ", ERR_STR_LEN);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288 vsnprintf(err_str + 10, ERR_STR_LEN - 10, str, arg);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	289 va_end(arg);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290 debug("ERROR: %s\n", err_str);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	291 tss->errset = 1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	292 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	293
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	294 static void warning(const char *str)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296 #if DEBUG > 0
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297 fprintf(stderr, "WARNING: dlcompat: %s\n", str);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	298 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	299 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	300
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301 static const char safegetenv(const char s)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	302 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	303 const char *ss = SDL_getenv(s);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	304 return ss ? ss : "";
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	306
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	307 /* because this is only used for debugging and error reporting functions, we
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	308 * don't really care about how elegant it is... it could use the load
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	309 * commands to find the install name of the library, but...
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	310 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311 static const char get_lib_name(const struct mach_header mh)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	312 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	313 unsigned long count = _dyld_image_count();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	314 unsigned long i;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	315 const char *val = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	316 if (mh)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	317 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 for (i = 0; i < count; i++)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	320 if (mh == _dyld_get_image_header(i))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	321 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	322 val = _dyld_get_image_name(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	323 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	325 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 return val;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	329
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	330 /* Returns the mach_header for the module bu going through all the loaded images
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	331 * and finding the one with the same name as the module. There really ought to be
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332 * an api for doing this, would be faster, but there isn't one right now
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334 static const struct mach_header get_mach_header_from_NSModule(NSModule mod)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	335 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	336 const char *mod_name = NSNameOfModule(mod);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	337 struct mach_header *mh = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	338 unsigned long count = _dyld_image_count();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	339 unsigned long i;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	340 debug("Module name: %s", mod_name);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	341 for (i = 0; i < count; i++)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 if (!SDL_strcmp(mod_name, _dyld_get_image_name(i)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 mh = _dyld_get_image_header(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349 return mh;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	352
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 /* Compute and return a list of all directories that we should search when
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 * trying to locate a module. We first look at the values of LD_LIBRARY_PATH
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 * and DYLD_LIBRARY_PATH, and then finally fall back to looking into
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 * /usr/lib and /lib. Since both of the environments variables can contain a
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 * list of colon seperated paths, we simply concat them and the two other paths
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	358 * into one big string, which we then can easily parse.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 * Splitting this string into the actual path list is done by getSearchPath()
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 static const char *searchList()
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363 size_t buf_size;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364 static char *buf=NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 const char *ldlp = safegetenv("LD_LIBRARY_PATH");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 const char *dyldlp = safegetenv("DYLD_LIBRARY_PATH");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 const char *stdpath = SDL_getenv("DYLD_FALLBACK_LIBRARY_PATH");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 if (!stdpath)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 stdpath = "/usr/local/lib:/lib:/usr/lib";
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 if (!buf)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 buf_size = SDL_strlen(ldlp) + SDL_strlen(dyldlp) + SDL_strlen(stdpath) + 4;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	373 buf = SDL_malloc(buf_size);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 SDL_snprintf(buf, buf_size, "%s%s%s%s%s%c", dyldlp, (dyldlp[0] ? ":" : ""), ldlp, (ldlp[0] ? ":" : ""),
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	375 stdpath, '\0');
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	376 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	377 return buf;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	380 /* Returns the ith search path from the list as computed by searchList() */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381 static const char *getSearchPath(int i)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	382 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 static const char *list = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	384 static char path = (char )0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	385 static int end = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	386 static int numsize = MAX_SEARCH_PATHS;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	387 static char **tmp;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	388 /* So we can call SDL_free() in the "destructor" we use i=-1 to return the alloc'd array */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	389 if (i == -1)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	390 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	391 return (const char*)path;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	392 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	393 if (!path)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	394 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	395 path = (char )SDL_calloc(MAX_SEARCH_PATHS, sizeof(char ));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	396 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	397 if (!list && !end)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	398 list = searchList();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	399 if (i >= (numsize))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	400 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	401 debug("Increasing size for long PATH");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	402 tmp = (char )SDL_calloc((MAX_SEARCH_PATHS + numsize), sizeof(char ));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	403 if (tmp)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	404 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	405 SDL_memcpy(tmp, path, sizeof(char *) numsize);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	406 SDL_free(path);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	407 path = tmp;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	408 numsize += MAX_SEARCH_PATHS;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	410 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	411 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	412 return 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	413 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	414 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	415
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	416 while (!path[i] && !end)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	417 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	418 path[i] = strsep((char **)&list, ":");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	419
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	420 if (path[i][0] == 0)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	421 path[i] = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	422 end = (list == 0);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	423 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	424 return path[i];
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	425 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	426
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	427 static const char getFullPath(int i, const char file)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	428 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	429 static char buf[PATH_MAX];
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	430 const char *path = getSearchPath(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	431 if (path)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	432 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	433 SDL_snprintf(buf, PATH_MAX, "%s/%s", path, file);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	434 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	435 return path ? buf : 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	436 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	437
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	438 /* Given a file name, try to determine the full path for that file. Starts
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	439 * its search in the current directory, and then tries all paths in the
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	440 * search list in the order they are specified there.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442 static const struct stat findFile(const char file, const char **fullPath)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	444 int i = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	445 static struct stat sbuf;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	446 char *fileName;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	447 debug("finding file %s", file);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	448 *fullPath = file;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	449 if (0 == stat(file, &sbuf))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	450 return &sbuf;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	451 if (SDL_strchr(file, '/'))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	452 return 0; /* If the path had a / we don't look in env var places */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453 fileName = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454 if (!fileName)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 fileName = (char *)file;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 while ((*fullPath = getFullPath(i++, fileName)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	457 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 if (0 == stat(*fullPath, &sbuf))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459 return &sbuf;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 ;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	462 return 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	463 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465 /* Determine whether a given dlstatus is valid or not */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466 static int isValidStatus(struct dlstatus *status)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	468 /* Walk the list to verify status is contained in it */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	469 struct dlstatus *dls = stqueue;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470 while (dls && status != dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 dls = dls->next;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 if (dls == 0)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473 error("invalid handle");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 else if ((dls->module == 0) \|\| (dls->refs == 0))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	475 error("handle to closed library");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 return TRUE;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478 return FALSE;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481 static inline int isFlagSet(int mode, int flag)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483 return (mode & flag) == flag;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	485
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	486 static struct dlstatus lookupStatus(const struct stat sbuf)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	487 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	488 struct dlstatus *dls = stqueue;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	489 debug("looking for status");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	490 while (dls && ( /* isFlagSet(dls->mode, RTLD_UNSHARED) */ 0
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	491 \|\| sbuf->st_dev != dls->device \|\| sbuf->st_ino != dls->inode))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	492 dls = dls->next;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	493 return dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	494 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	495
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496 static void insertStatus(struct dlstatus dls, const struct stat sbuf)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	497 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498 debug("inserting status");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 dls->inode = sbuf->st_ino;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	500 dls->device = sbuf->st_dev;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 dls->refs = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	502 dls->mode = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	503 if ((dls->flags & DL_IN_LIST) == 0)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	505 dls->next = stqueue;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 stqueue = dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	507 dls->flags \|= DL_IN_LIST;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	508 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	509 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511 static struct dlstatus *allocStatus()
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 struct dlstatus *dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 #ifdef REUSE_STATUS
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 dls = stqueue;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 while (dls && dls->module)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 dls = dls->next;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518 if (!dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 dls = SDL_calloc(sizeof(*dls),1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	521 return dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	524 static int promoteLocalToGlobal(struct dlstatus *dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	525 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	526 static int (*p) (NSModule module) = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	527 debug("promoting");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	528 if (!p)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	529 _dyld_func_lookup("__dyld_NSMakePrivateModulePublic", (unsigned long *)&p);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	530 return (dls->module == MAGIC_DYLIB_MOD) \|\| (p && p(dls->module));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	531 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	533 static void reference(struct dlstatus dls, int mode)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	534 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	535 if (dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	536 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	537 if (dls->module == MAGIC_DYLIB_MOD && isFlagSet(mode, RTLD_LOCAL))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	538 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	539 warning("trying to open a .dylib with RTLD_LOCAL");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	540 error("unable to open a .dylib with RTLD_LOCAL");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	541 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	543 if (isFlagSet(mode, RTLD_GLOBAL) &&
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	544 !isFlagSet(dls->mode, RTLD_GLOBAL) && !promoteLocalToGlobal(dls))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	545 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546 error("unable to promote local module to global");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	549 dls->mode \|= mode;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 dls->refs++;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 debug("reference called with NULL argument");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555 return dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 static const struct mach_header my_find_image(const char name)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	560 const struct mach_header *mh = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561 const char *id = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 int i = _dyld_image_count();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	563 int j;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	564 mh = (struct mach_header *)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	565 dyld_NSAddImage(name, NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED \|
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	566 NSADDIMAGE_OPTION_RETURN_ON_ERROR);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	567 if (!mh)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	568 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	569 for (j = 0; j < i; j++)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	570 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 id = _dyld_get_image_name(j);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572 if (!SDL_strcmp(id, name))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	573 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	574 mh = _dyld_get_image_header(j);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	575 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	576 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	577 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	578 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	579 return mh;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	580 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	581
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583 * dyld adds libraries by first adding the directly dependant libraries in link order, and
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	584 * then adding the dependencies for those libraries, so we should do the same... but we don't
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	585 * bother adding the extra dependencies, if the symbols are neither in the loaded image nor
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 * any of it's direct dependencies, then it probably isn't there.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 static NSSymbol search_linked_libs(const struct mach_header mh, const char *symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	590 unsigned int n;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	591 struct load_command *lc = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 struct mach_header *wh;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593 NSSymbol *nssym = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 if (dyld_NSAddImage && dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 lc = (struct load_command )((char )mh + sizeof(struct mach_header));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597 for (n = 0; n < mh->ncmds; n++, lc = (struct load_command )((char )lc + lc->cmdsize))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	598 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	599 if ((LC_LOAD_DYLIB == lc->cmd) \|\| (LC_LOAD_WEAK_DYLIB == lc->cmd))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	601 if ((wh = (struct mach_header *)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	602 my_find_image((char )(((struct dylib_command )lc)->dylib.name.offset +
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	603 (char *)lc))))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	604 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	605 if (dyld_NSIsSymbolNameDefinedInImage(wh, symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	606 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	607 nssym = dyld_NSLookupSymbolInImage(wh,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	608 symbol,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	609 NSLOOKUPSYMBOLINIMAGE_OPTION_BIND \|
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	610 NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	611 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	612 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	613 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	614 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	615 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	616 if ((!nssym) && NSIsSymbolNameDefined(symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	617 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 /* I've never seen this debug message...*/
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 debug("Symbol \"%s\" is defined but was not found", symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 return nssym;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625 /* Up to the caller to SDL_free() returned string */
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	626 static inline char *dyld_error_str()
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	628 NSLinkEditErrors dylder;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	629 int dylderno;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	630 const char *dylderrstr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631 const char *dyldfile;
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	632 char* retStr = NULL;
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633 NSLinkEditError(&dylder, &dylderno, &dyldfile, &dylderrstr);
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	634 if (dylderrstr && *dylderrstr)
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	635 {
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	636 retStr = SDL_strdup(dylderrstr);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638 return retStr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	640
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	641 static void dlsymIntern(struct dlstatus dls, const char *symbol, int canSetError)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	643 NSSymbol *nssym = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	644 #ifdef __GCC__
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	645 void caller = __builtin_return_address(1); / Be very careful about inlining */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	646 #else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	647 void *caller = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	648 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	649 const struct mach_header *caller_mh = 0;
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	650 char *savedErrorStr = NULL;
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	651 resetdlerror();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	652 #ifndef RTLD_SELF
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 #define RTLD_SELF ((void *) -3)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	655 if (NULL == dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	656 dls = RTLD_SELF;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	657 if ((RTLD_NEXT == dls) \|\| (RTLD_SELF == dls))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	658 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	659 if (dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage && caller)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	660 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	661 caller_mh = image_for_address(caller);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	662 if (RTLD_SELF == dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	663 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	664 /* FIXME: We should be using the NSModule api, if SELF is an MH_BUNDLE
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	665 * But it appears to work anyway, and looking at the code in dyld_libfuncs.c
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	666 * this is acceptable.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	667 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	668 if (dyld_NSIsSymbolNameDefinedInImage(caller_mh, symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	669 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	670 nssym = dyld_NSLookupSymbolInImage(caller_mh,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	671 symbol,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	672 NSLOOKUPSYMBOLINIMAGE_OPTION_BIND \|
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	673 NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	675 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	676 if (!nssym)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	677 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	678 if (RTLD_SELF == dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	679 savedErrorStr = dyld_error_str();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	680 nssym = search_linked_libs(caller_mh, symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	683 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	685 if (canSetError)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	686 error("RTLD_SELF and RTLD_NEXT are not supported");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	688 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	689 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690 if (!nssym)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	691 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	692
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	693 if (RTLD_DEFAULT == dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	694 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	695 dls = &mainStatus;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	696 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	697 if (!isValidStatus(dls))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	698 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	699
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	700 if (dls->module != MAGIC_DYLIB_MOD)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	701 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	702 nssym = NSLookupSymbolInModule(dls->module, symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	703 if (!nssym && NSIsSymbolNameDefined(symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	704 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	705 debug("Searching dependencies");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	706 savedErrorStr = dyld_error_str();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	707 nssym = search_linked_libs(get_mach_header_from_NSModule(dls->module), symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	708 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	709 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	710 else if (dls->lib && dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	711 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	712 if (dyld_NSIsSymbolNameDefinedInImage(dls->lib, symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	713 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	714 nssym = dyld_NSLookupSymbolInImage(dls->lib,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	715 symbol,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	716 NSLOOKUPSYMBOLINIMAGE_OPTION_BIND \|
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	717 NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	718 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	719 else if (NSIsSymbolNameDefined(symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	720 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	721 debug("Searching dependencies");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	722 savedErrorStr = dyld_error_str();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	723 nssym = search_linked_libs(dls->lib, symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	724 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	725 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	726 else if (dls->module == MAGIC_DYLIB_MOD)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	727 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	728 /* Global context, use NSLookupAndBindSymbol */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	729 if (NSIsSymbolNameDefined(symbol))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	730 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	731 /* There doesn't seem to be a return on error option for this call???
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	732 this is potentially broken, if binding fails, it will improperly
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	733 exit the application. */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	734 nssym = NSLookupAndBindSymbol(symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	735 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	736 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	737 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	738 if (savedErrorStr)
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	739 SDL_free(savedErrorStr);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	740 savedErrorStr = SDL_malloc(256);
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	741 SDL_snprintf(savedErrorStr, 256, "Symbol \"%s\" not in global context",symbol);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	742 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	743 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	744 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	745 /* Error reporting */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	746 if (!nssym)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	747 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	748 if (!savedErrorStr \|\| !SDL_strlen(savedErrorStr))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	749 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	750 if (savedErrorStr)
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	751 SDL_free(savedErrorStr);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	752 savedErrorStr = SDL_malloc(256);
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	753 SDL_snprintf(savedErrorStr, 256,"Symbol \"%s\" not found",symbol);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	754 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	755 if (canSetError)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	756 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	757 error(savedErrorStr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	758 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	759 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	760 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	761 debug(savedErrorStr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	762 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	763 if (savedErrorStr)
1379 c0a74f199ecf Use only safe string functions Sam Lantinga <slouken@libsdl.org> parents: 1375 diff changeset	764 SDL_free(savedErrorStr);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	765 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	766 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	767 return NSAddressOfSymbol(nssym);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	768 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	769
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	770 static struct dlstatus loadModule(const char path, const struct stat *sbuf, int mode)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	771 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	772 NSObjectFileImage ofi = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	773 NSObjectFileImageReturnCode ofirc;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	774 struct dlstatus *dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	775 NSLinkEditErrors ler;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	776 int lerno;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	777 const char *errstr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	778 const char *file;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	779 void (*init) (void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	780
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	781 ofirc = NSCreateObjectFileImageFromFile(path, &ofi);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	782 switch (ofirc)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	783 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	784 case NSObjectFileImageSuccess:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	785 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	786 case NSObjectFileImageInappropriateFile:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	787 if (dyld_NSAddImage && dyld_NSIsSymbolNameDefinedInImage && dyld_NSLookupSymbolInImage)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	788 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	789 if (isFlagSet(mode, RTLD_LOCAL))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	790 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	791 warning("trying to open a .dylib with RTLD_LOCAL");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	792 error("unable to open this file with RTLD_LOCAL");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	793 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	794 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	795 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	796 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	797 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	798 error("opening this file is unsupported on this system");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	799 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	800 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	801 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	802 case NSObjectFileImageFailure:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	803 error("object file setup failure");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	804 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	805 case NSObjectFileImageArch:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	806 error("no object for this architecture");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	807 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	808 case NSObjectFileImageFormat:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	809 error("bad object file format");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	810 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	811 case NSObjectFileImageAccess:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	812 error("can't read object file");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	813 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	814 default:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	815 error("unknown error from NSCreateObjectFileImageFromFile()");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	816 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	817 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	818 dls = lookupStatus(sbuf);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	819 if (!dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	820 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	821 dls = allocStatus();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	822 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	823 if (!dls)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	824 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	825 error("unable to allocate memory");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	826 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	827 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	828 // dls->lib = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	829 if (ofirc == NSObjectFileImageInappropriateFile)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	830 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	831 if ((dls->lib = dyld_NSAddImage(path, NSADDIMAGE_OPTION_RETURN_ON_ERROR)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	832 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	833 debug("Dynamic lib loaded at %ld", dls->lib);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	834 ofi = MAGIC_DYLIB_OFI;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	835 dls->module = MAGIC_DYLIB_MOD;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	836 ofirc = NSObjectFileImageSuccess;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	837 /* Although it is possible with a bit of work to modify this so it works and
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	838 functions with RTLD_NOW, I don't deem it necessary at the moment */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	839 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	840 if (!(dls->module))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	841 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	842 NSLinkEditError(&ler, &lerno, &file, &errstr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	843 if (!errstr \|\| (!SDL_strlen(errstr)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	844 error("Can't open this file type");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	845 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	846 error(errstr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	847 if ((dls->flags & DL_IN_LIST) == 0)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	848 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	849 SDL_free(dls);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	850 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	851 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	852 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	853 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	854 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	855 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	856 dls->module = NSLinkModule(ofi, path,
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	857 NSLINKMODULE_OPTION_RETURN_ON_ERROR \|
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	858 NSLINKMODULE_OPTION_PRIVATE \|
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	859 (isFlagSet(mode, RTLD_NOW) ? NSLINKMODULE_OPTION_BINDNOW : 0));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	860 NSDestroyObjectFileImage(ofi);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	861 if (dls->module)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	862 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	863 dls->lib = get_mach_header_from_NSModule(dls->module);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	864 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	865 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	866 if (!dls->module)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	867 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	868 NSLinkEditError(&ler, &lerno, &file, &errstr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	869 if ((dls->flags & DL_IN_LIST) == 0)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	870 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	871 SDL_free(dls);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	872 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	873 error(errstr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	874 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	875 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	876
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	877 insertStatus(dls, sbuf);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	878 dls = reference(dls, mode);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	879 if ((init = dlsymIntern(dls, "__init", 0)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	880 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	881 debug("calling _init()");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	882 init();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	883 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	884 return dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	885 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	886
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	887 inline static void dlcompat_init_check(void)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	888 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	889 static pthread_mutex_t l = PTHREAD_MUTEX_INITIALIZER;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	890 static int init_done = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	891
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	892 pthread_mutex_lock(&l);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	893 if (!init_done) {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	894 dlcompat_init_func();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	895 init_done = 1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	896 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	897 pthread_mutex_unlock(&l);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	898 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	899
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	900 static void dlcompat_init_func(void)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	901 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	902 _dyld_func_lookup("__dyld_NSAddImage", (unsigned long *)&dyld_NSAddImage);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	903 _dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	904 (unsigned long *)&dyld_NSIsSymbolNameDefinedInImage);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	905 _dyld_func_lookup("__dyld_NSLookupSymbolInImage", (unsigned long *)&dyld_NSLookupSymbolInImage);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	906 if (pthread_mutex_init(&dlcompat_mutex, NULL))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	907 exit(1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	908 if (pthread_key_create(&dlerror_key, &dlerrorfree))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	909 exit(1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	910 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	911
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	912 static void resetdlerror()
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	913 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	914 struct dlthread *tss;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	915 tss = pthread_getspecific(dlerror_key);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	916 tss->errset = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	917 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	918
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	919 static void dlerrorfree(void *data)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	920 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	921 SDL_free(data);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	922 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	923
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	924 /* We kind of want a recursive lock here, but meet a little trouble
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	925 * because they are not available pre OS X 10.2, so we fake it
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	926 * using thread specific storage to keep a lock count
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	927 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	928 static inline void dolock(void)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	929 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	930 int err = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	931 struct dlthread *tss;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	932 dlcompat_init_check();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	933 tss = pthread_getspecific(dlerror_key);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	934 if (!tss)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	935 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	936 tss = SDL_malloc(sizeof(struct dlthread));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	937 tss->lockcnt = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	938 tss->errset = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	939 if (pthread_setspecific(dlerror_key, tss))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	940 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	941 fprintf(stderr,"dlcompat: pthread_setspecific failed\n");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	942 exit(1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	943 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	944 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	945 if (!tss->lockcnt)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	946 err = pthread_mutex_lock(&dlcompat_mutex);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	947 tss->lockcnt = tss->lockcnt +1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	948 if (err)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	949 exit(err);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	950 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	951
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	952 static inline void dounlock(void)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	953 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	954 int err = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	955 struct dlthread *tss;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	956 tss = pthread_getspecific(dlerror_key);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	957 tss->lockcnt = tss->lockcnt -1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	958 if (!tss->lockcnt)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	959 err = pthread_mutex_unlock(&dlcompat_mutex);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	960 if (err)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	961 exit(err);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	962 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	963
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	964 static void SDL_OSX_dlopen(const char path, int mode)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	965 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	966 const struct stat *sbuf;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	967 struct dlstatus *dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	968 const char *fullPath;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	969
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	970 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	971 resetdlerror();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	972 if (!path)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	973 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	974 dls = &mainStatus;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	975 goto dlopenok;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	976 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	977 if (!(sbuf = findFile(path, &fullPath)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	978 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	979 error("file \"%s\" not found", path);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	980 goto dlopenerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	981 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	982 /* Now checks that it hasn't been closed already */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	983 if ((dls = lookupStatus(sbuf)) && (dls->refs > 0))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	984 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	985 /* debug("status found"); */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	986 dls = reference(dls, mode);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	987 goto dlopenok;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	988 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	989 #ifdef RTLD_NOLOAD
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	990 if (isFlagSet(mode, RTLD_NOLOAD))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	991 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	992 error("no existing handle and RTLD_NOLOAD specified");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	993 goto dlopenerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	994 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	995 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	996 if (isFlagSet(mode, RTLD_LAZY) && isFlagSet(mode, RTLD_NOW))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	997 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	998 error("how can I load something both RTLD_LAZY and RTLD_NOW?");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	999 goto dlopenerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1000 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1001 dls = loadModule(fullPath, sbuf, mode);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1002
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1003 dlopenok:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1004 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1005 return (void *)dls;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1006 dlopenerror:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1007 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1008 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1009 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1010
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1011 #if !FINK_BUILD
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1012 static void SDL_OSX_dlsym(void dl_restrict handle, const char * dl_restrict symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1013 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1014 int sym_len = SDL_strlen(symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1015 void *value = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1016 char *malloc_sym = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1017 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1018 malloc_sym = SDL_malloc(sym_len + 2);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1019 if (malloc_sym)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1020 {
1375 3793c4b34a92 sprintf should have been snprintf Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	1021 SDL_snprintf(malloc_sym, sym_len+2, "_%s", symbol);
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1022 value = dlsymIntern(handle, malloc_sym, 1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1023 SDL_free(malloc_sym);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1024 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1025 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1026 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1027 error("Unable to allocate memory");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1028 goto dlsymerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1029 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1030 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1031 return value;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1032 dlsymerror:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1033 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1034 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1035 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1036 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1037
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1038 #if FINK_BUILD
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1039
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1040 static void dlsym_prepend_underscore(void handle, const char *symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1041 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1042 void *answer;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1043 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1044 answer = dlsym_prepend_underscore_intern(handle, symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1045 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1046 return answer;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1047 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1048
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1049 static void dlsym_prepend_underscore_intern(void handle, const char *symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1050 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1051 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1052 * A quick and easy way for porting packages which call dlsym(handle,"sym")
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1053 * If the porter adds -Ddlsym=dlsym_prepend_underscore to the CFLAGS then
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1054 * this function will be called, and will add the required underscore.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1055 *
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1056 * Note that I haven't figured out yet which should be "standard", prepend
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1057 * the underscore always, or not at all. These global functions need to go away
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1058 * for opendarwin.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1059 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1060 int sym_len = SDL_strlen(symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1061 void *value = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1062 char *malloc_sym = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1063 malloc_sym = SDL_malloc(sym_len + 2);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1064 if (malloc_sym)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1065 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1066 SDL_snprintf(malloc_sym, sym_len+2, "_%s", symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1067 value = dlsymIntern(handle, malloc_sym, 1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1068 SDL_free(malloc_sym);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1069 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1070 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1071 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1072 error("Unable to allocate memory");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1073 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1074 return value;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1075 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1076
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1077 static void dlsym_auto_underscore(void handle, const char *symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1078 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1079 void *answer;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1080 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1081 answer = dlsym_auto_underscore_intern(handle, symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1082 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1083 return answer;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1084
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1085 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1086 static void dlsym_auto_underscore_intern(void handle, const char *symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1087 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1088 struct dlstatus *dls = handle;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1089 void *addr = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1090 addr = dlsymIntern(dls, symbol, 0);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1091 if (!addr)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1092 addr = dlsym_prepend_underscore_intern(handle, symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1093 return addr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1094 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1095
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1096
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1097 static void SDL_OSX_dlsym(void dl_restrict handle, const char * dl_restrict symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1098 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1099 struct dlstatus *dls = handle;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1100 void *addr = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1101 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1102 addr = dlsymIntern(dls, symbol, 1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1103 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1104 return addr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1105 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1106 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1107
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1108 static int SDL_OSX_dlclose(void *handle)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1109 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1110 struct dlstatus *dls = handle;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1111 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1112 resetdlerror();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1113 if (!isValidStatus(dls))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1114 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1115 goto dlcloseerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1116 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1117 if (dls->module == MAGIC_DYLIB_MOD)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1118 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1119 const char *name;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1120 if (!dls->lib)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1121 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1122 name = "global context";
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1123 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1124 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1125 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1126 name = get_lib_name(dls->lib);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1127 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1128 warning("trying to close a .dylib!");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1129 error("Not closing \"%s\" - dynamic libraries cannot be closed", name);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1130 goto dlcloseerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1131 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1132 if (!dls->module)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1133 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1134 error("module already closed");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1135 goto dlcloseerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1136 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1137
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1138 if (dls->refs == 1)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1139 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1140 unsigned long options = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1141 void (*fini) (void);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1142 if ((fini = dlsymIntern(dls, "__fini", 0)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1143 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1144 debug("calling _fini()");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1145 fini();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1146 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1147 options \|= NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1148 #ifdef RTLD_NODELETE
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1149 if (isFlagSet(dls->mode, RTLD_NODELETE))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1150 options \|= NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1151 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1152 if (!NSUnLinkModule(dls->module, options))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1153 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1154 error("unable to unlink module");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1155 goto dlcloseerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1156 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1157 dls->refs--;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1158 dls->module = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1159 /* Note: the dlstatus struct dls is neither removed from the list
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1160 * nor is the memory it occupies freed. This shouldn't pose a
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1161 * problem in mostly all cases, though.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1162 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1163 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1164 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1165 return 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1166 dlcloseerror:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1167 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1168 return 1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1169 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1170
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	1171 static const char *SDL_OSX_dlerror(void)
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1172 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1173 struct dlthread *tss;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1174 const char * err_str = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1175 dlcompat_init_check();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1176 tss = pthread_getspecific(dlerror_key);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1177 if (tss != NULL && tss->errset != 0) {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1178 tss->errset = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1179 err_str = tss->errstr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1180 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1181 return (err_str);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1182 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1183
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1184 /* Given an address, return the mach_header for the image containing it
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1185 * or zero if the given address is not contained in any loaded images.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1186 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1187 static const struct mach_header image_for_address(const void address)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1188 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1189 unsigned long i;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1190 unsigned long j;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1191 unsigned long count = _dyld_image_count();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1192 struct mach_header *mh = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1193 struct load_command *lc = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1194 unsigned long addr = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1195 for (i = 0; i < count; i++)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1196 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1197 addr = (unsigned long)address - _dyld_get_image_vmaddr_slide(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1198 mh = _dyld_get_image_header(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1199 if (mh)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1200 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1201 lc = (struct load_command )((char )mh + sizeof(struct mach_header));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1202 for (j = 0; j < mh->ncmds; j++, lc = (struct load_command )((char )lc + lc->cmdsize))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1203 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1204 if (LC_SEGMENT == lc->cmd &&
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1205 addr >= ((struct segment_command *)lc)->vmaddr &&
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1206 addr <
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1207 ((struct segment_command )lc)->vmaddr + ((struct segment_command )lc)->vmsize)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1208 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1209 goto image_found;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1210 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1211 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1212 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1213 mh = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1214 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1215 image_found:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1216 return mh;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1217 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1218
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1219 static int SDL_OSX_dladdr(const void * dl_restrict p, SDL_OSX_Dl_info * dl_restrict info)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1220 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1221 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1222 FIXME: USe the routine image_for_address.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1223 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1224 unsigned long i;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1225 unsigned long j;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1226 unsigned long count = _dyld_image_count();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1227 struct mach_header *mh = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1228 struct load_command *lc = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1229 unsigned long addr = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1230 unsigned long table_off = (unsigned long)0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1231 int found = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1232 if (!info)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1233 return 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1234 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1235 resetdlerror();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1236 info->dli_fname = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1237 info->dli_fbase = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1238 info->dli_sname = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1239 info->dli_saddr = 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1240 /* Some of this was swiped from code posted by Douglas Davidson <ddavidso AT apple DOT com>
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1241 * to darwin-development AT lists DOT apple DOT com and slightly modified
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1242 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1243 for (i = 0; i < count; i++)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1244 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1245 addr = (unsigned long)p - _dyld_get_image_vmaddr_slide(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1246 mh = _dyld_get_image_header(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1247 if (mh)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1248 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1249 lc = (struct load_command )((char )mh + sizeof(struct mach_header));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1250 for (j = 0; j < mh->ncmds; j++, lc = (struct load_command )((char )lc + lc->cmdsize))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1251 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1252 if (LC_SEGMENT == lc->cmd &&
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1253 addr >= ((struct segment_command *)lc)->vmaddr &&
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1254 addr <
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1255 ((struct segment_command )lc)->vmaddr + ((struct segment_command )lc)->vmsize)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1256 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1257 info->dli_fname = _dyld_get_image_name(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1258 info->dli_fbase = (void *)mh;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1259 found = 1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1260 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1261 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1262 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1263 if (found)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1264 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1265 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1266 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1267 if (!found)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1268 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1269 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1270 return 0;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1271 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1272 lc = (struct load_command )((char )mh + sizeof(struct mach_header));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1273 for (j = 0; j < mh->ncmds; j++, lc = (struct load_command )((char )lc + lc->cmdsize))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1274 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1275 if (LC_SEGMENT == lc->cmd)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1276 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1277 if (!SDL_strcmp(((struct segment_command *)lc)->segname, "__LINKEDIT"))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1278 break;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1279 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1280 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1281 table_off =
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1282 ((unsigned long)((struct segment_command *)lc)->vmaddr) -
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1283 ((unsigned long)((struct segment_command *)lc)->fileoff) + _dyld_get_image_vmaddr_slide(i);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1284 debug("table off %x", table_off);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1285
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1286 lc = (struct load_command )((char )mh + sizeof(struct mach_header));
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1287 for (j = 0; j < mh->ncmds; j++, lc = (struct load_command )((char )lc + lc->cmdsize))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1288 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1289 if (LC_SYMTAB == lc->cmd)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1290 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1291
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1292 struct nlist symtable = (struct nlist )(((struct symtab_command *)lc)->symoff + table_off);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1293 unsigned long numsyms = ((struct symtab_command *)lc)->nsyms;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1294 struct nlist *nearest = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1295 unsigned long diff = 0xffffffff;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1296 unsigned long strtable = (unsigned long)(((struct symtab_command *)lc)->stroff + table_off);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1297 debug("symtable %x", symtable);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1298 for (i = 0; i < numsyms; i++)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1299 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1300 /* Ignore the following kinds of Symbols */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1301 if ((!symtable->n_value) /* Undefined */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1302 \|\| (symtable->n_type >= N_PEXT) /* Debug symbol */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1303 \|\| (!(symtable->n_type & N_EXT)) /* Local Symbol */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1304 )
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1305 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1306 symtable++;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1307 continue;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1308 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1309 if ((addr >= symtable->n_value) && (diff >= (symtable->n_value - addr)))
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1310 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1311 diff = (unsigned long)symtable->n_value - addr;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1312 nearest = symtable;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1313 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1314 symtable++;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1315 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1316 if (nearest)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1317 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1318 info->dli_saddr = nearest->n_value + ((void *)p - addr);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1319 info->dli_sname = (char *)(strtable + nearest->n_un.n_strx);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1320 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1321 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1322 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1323 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1324 return 1;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1325 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1326
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1327
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1328 /*
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1329 * Implement the dlfunc() interface, which behaves exactly the same as
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1330 * dlsym() except that it returns a function pointer instead of a data
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1331 * pointer. This can be used by applications to avoid compiler warnings
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1332 * about undefined behavior, and is intended as prior art for future
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1333 * POSIX standardization. This function requires that all pointer types
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1334 * have the same representation, which is true on all platforms FreeBSD
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1335 * runs on, but is not guaranteed by the C standard.
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1336 */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1337 #if 0
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1338 static dlfunc_t SDL_OSX_dlfunc(void * dl_restrict handle, const char * dl_restrict symbol)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1339 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1340 union
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1341 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1342 void *d;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1343 dlfunc_t f;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1344 } rv;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1345 int sym_len = SDL_strlen(symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1346 char *malloc_sym = NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1347 dolock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1348 malloc_sym = SDL_malloc(sym_len + 2);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1349 if (malloc_sym)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1350 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1351 SDL_snprintf(malloc_sym, sym_len+2, "_%s", symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1352 rv.d = dlsymIntern(handle, malloc_sym, 1);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1353 SDL_free(malloc_sym);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1354 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1355 else
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1356 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1357 error("Unable to allocate memory");
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1358 goto dlfuncerror;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1359 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1360 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1361 return rv.f;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1362 dlfuncerror:
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1363 dounlock();
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1364 return NULL;
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1365 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1366 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1367
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1368
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1369
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1370 /* dlcompat ends, here's the SDL interface... --ryan. */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1371
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1372
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1373 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1374 /* System dependent library loading routines */
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1375
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1376 #include "SDL_loadso.h"
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1377
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1378 void SDL_LoadObject(const char sofile)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1379 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1380 void *handle = SDL_OSX_dlopen(sofile, RTLD_NOW);
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	1381 const char *loaderror = SDL_OSX_dlerror();
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1382 if ( handle == NULL ) {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1383 SDL_SetError("Failed loading %s: %s", sofile, loaderror);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1384 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1385 return(handle);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1386 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1387
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1388 void SDL_LoadFunction(void handle, const char *name)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1389 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1390 void *symbol = SDL_OSX_dlsym(handle, name);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1391 if ( symbol == NULL ) {
1648 9f59d4c5aaea Mac OS X fat build works! :) Sam Lantinga <slouken@libsdl.org> parents: 1635 diff changeset	1392 SDL_SetError("Failed loading %s: %s", name, SDL_OSX_dlerror());
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1393 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1394 return(symbol);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1395 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1396
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1397 void SDL_UnloadObject(void *handle)
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1398 {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1399 if ( handle != NULL ) {
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1400 SDL_OSX_dlclose(handle);
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1401 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1402 }
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1403
1635 92947e3a18db Make sure code is only compiled if the appropriate subsystem is enabled Sam Lantinga <slouken@libsdl.org> parents: 1479 diff changeset	1404 #endif /* SDL_LOADSO_DLCOMPAT */

Mercurial > sdl-ios-xcode

annotate src/loadso/macosx/SDL_sysloadso.c @ 1768:814f9f2c7a33