1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
diff -ru sqlite-3.5.9/Makefile.in sqlite-3.5.9+iPhone/Makefile.in
--- sqlite-3.5.9/Makefile.in 2008-05-12 17:10:26.000000000 +0000
+++ sqlite-3.5.9+iPhone/Makefile.in 2008-08-01 08:21:45.000000000 +0000
@@ -413,10 +413,12 @@
libsqlite3.la: $(LIBOBJ)
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
+ -framework CoreFoundation -framework Foundation \
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite.lo \
+ -framework CoreFoundation -framework Foundation \
$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-rpath "$(libdir)/sqlite" \
-version-info "8:6:8"
diff -ru sqlite-3.5.9/src/os_unix.c sqlite-3.5.9+iPhone/src/os_unix.c
--- sqlite-3.5.9/src/os_unix.c 2008-05-13 12:51:29.000000000 +0000
+++ sqlite-3.5.9+iPhone/src/os_unix.c 2008-08-01 08:18:14.000000000 +0000
@@ -75,6 +75,10 @@
*/
#define MAX_PATHNAME 512
+#ifdef __APPLE__
+#import <CoreServices/CoreServices.h>
+#endif
+
/*
** The unixFile structure is subclass of sqlite3_file specific for the unix
@@ -2497,6 +2501,7 @@
static int unixGetTempname(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
static const char *azDirs[] = {
0,
+ 0,
"/var/tmp",
"/usr/tmp",
"/tmp",
@@ -2509,6 +2514,12 @@
int i, j;
struct stat buf;
const char *zDir = ".";
+#ifdef __APPLE__
+ void *pool;
+ CFStringRef cfstr;
+ CFIndex maxsize;
+ char *cstr;
+#endif
/* It's odd to simulate an io-error here, but really this is just
** using the io-error infrastructure to test that SQLite handles this
@@ -2516,6 +2526,18 @@
*/
SimulateIOError( return SQLITE_ERROR );
+#ifdef __APPLE__
+ if (azDirs[1] == NULL) {
+ pool = NSPushAutoreleasePool(0);
+ cfstr = (CFStringRef) NSTemporaryDirectory();
+ maxsize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr), kCFStringEncodingUTF8) + 1;
+ cstr = malloc(maxsize);
+ CFStringGetCString(cfstr, cstr, maxsize, kCFStringEncodingUTF8);
+ azDirs[1] = cstr;
+ NSPopAutoreleasePool(pool);
+ }
+#endif
+
azDirs[0] = sqlite3_temp_directory;
for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); i++){
if( azDirs[i]==0 ) continue;
|
