Patches to get things working better for OS2. Ticket #1836. (CVS 3217)

FossilOrigin-Name: 65c6e5e117b9194015e382b1ad9bb9c88704eeb7

diff --git a/manifest b/manifest
index 6af0e70f34d537ecea7ae8833f8e90eec834cc22..a7ee3b1481793654052a0bd81c490d03bd87b444 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sso\sthat\sbuilds\swork\swith\sSQLITE_OMIT_VIRTUALTABLE=1.\s(CVS\s3216)
-D 2006-06-12T12:50:23
+C Patches\sto\sget\sthings\sworking\sbetter\sfor\sOS2.\s\sTicket\s#1836.\s(CVS\s3217)
+D 2006-06-12T12:57:46
 F Makefile.in 56fd6261e83f60724e6dcd764e06ab68cbd53909
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -52,7 +52,7 @@ F src/loadext.c d0fadf55c55144334a879a32e346c0204658e882
 F src/main.c f4397bf95216496e49db2153789788f4b1207b91
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235
-F src/os.h 46fad85c707ad8643622bab9d894a642940850aa
+F src/os.h ac2ccb4f48902c1611a7e1f171eb81d17e3b8eb2
 F src/os_common.h 108cd719c96a2b714b64e02aeabbd40684274e6a
 F src/os_os2.c 123cb394c069bc8c6a305830ffa2bc5f72e5b83a
 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
@@ -71,7 +71,7 @@ F src/printf.c 7029e5f7344a478394a02c52837ff296ee1ab240
 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
 F src/select.c 38eda11d950ed5e631ea9054f84a4a8b9e9b39d8
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
-F src/shell.c b9eb3ed4d3ab41fbf630eabb602f3c9d20fc737a
+F src/shell.c 55bf6335dae7146f7a300039f5d6bb35010f1996
 F src/sqlite.h.in cad97e59cfad8337f9f43ea9662714a256ca80b2
 F src/sqlite3ext.h 127bd394c8eea481f2ac9b754bf399dbfc818b75
 F src/sqliteInt.h b77822681ec59f3ec57b921a1d8c1b47a8c3e18f
@@ -363,7 +363,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 89ead80129ec934d2cb5f2447598a7253172f704
-R d19fd823944ee45b941b2a4308dc64bb
+P 54b30fe1bdf0c9e690e12f07dcce4382e863bf02
+R c82c985d39a094d0be35353a73bbb871
 U drh
-Z a3f2f6fbf2203daf548b4cc344da9855
+Z d677de0ba67b5d1d1c7872ed912e52cc

diff --git a/manifest.uuid b/manifest.uuid
index bdcd84a2a613dda85e4ebb30f6c61f61f15655cd..e4370632df496103b470ebea9451f9677399f810 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54b30fe1bdf0c9e690e12f07dcce4382e863bf02
\ No newline at end of file
+65c6e5e117b9194015e382b1ad9bb9c88704eeb7
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index 8f7c650efc30c1157c07fa08576680d662de335f..686250ea0c32d9e88bb9f80a3d9aec670cb4d01e 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -28,7 +28,7 @@
 #     define OS_WIN 1
 #     define OS_UNIX 0
 #     define OS_OS2 0
-#   elif defined(_EMX_) || defined(_OS2) || defined(OS2) || defined(OS_OS2)
+#   elif defined(_EMX_) || defined(_OS2) || defined(OS2) || defined(OS_OS2) || defined(__OS2__)
 #     define OS_WIN 0
 #     define OS_UNIX 0
 #     define OS_OS2 1

diff --git a/src/shell.c b/src/shell.c
index dd83e8e2bdbecb78a096a056068094d91fc533c5..68fa9190778cf1a73eb2e7383c744e24053651b4 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.140 2006/06/08 16:10:15 drh Exp $
+** $Id: shell.c,v 1.141 2006/06/12 12:57:46 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -21,7 +21,7 @@
 #include "sqlite3.h"
 #include <ctype.h>
 
-#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__)
+#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) && !defined(__OS2__)
 # include <signal.h>
 # include <pwd.h>
 # include <unistd.h>
@@ -37,6 +37,10 @@
 # include <Folders.h>
 #endif
 
+#ifdef __OS2__
+# include <unistd.h>
+#endif
+
 #if defined(HAVE_READLINE) && HAVE_READLINE==1
 # include <readline/readline.h>
 # include <readline/history.h>
@@ -1539,7 +1543,7 @@ static void process_input(struct callback_data *p, FILE *in){
 static char *find_home_dir(void){
   char *home_dir = NULL;
 
-#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__)
+#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) && !defined(__OS2__)
   struct passwd *pwent;
   uid_t uid = getuid();
   if( (pwent=getpwuid(uid)) != NULL) {
@@ -1559,7 +1563,7 @@ static char *find_home_dir(void){
     }
   }
 
-#if defined(_WIN32) || defined(WIN32)
+#if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
   if (!home_dir) {
     home_dir = "c:";
   }