diff options
Diffstat (limited to 'src/shell.c')
| -rw-r--r-- | src/shell.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/shell.c b/src/shell.c index 801ad2ca2..baedcceb5 100644 --- a/src/shell.c +++ b/src/shell.c @@ -36,7 +36,7 @@ #include <ctype.h> #include <stdarg.h> -#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(WIN32) # include <signal.h> # if !defined(__RTP__) && !defined(_WRS_KERNEL) # include <pwd.h> @@ -45,10 +45,6 @@ # include <sys/types.h> #endif -#ifdef __OS2__ -# include <unistd.h> -#endif - #ifdef HAVE_EDITLINE # include <editline/editline.h> #endif @@ -92,7 +88,7 @@ static int enableTimer = 0; #define IsDigit(X) isdigit((unsigned char)X) #define ToLower(X) (char)tolower((unsigned char)X) -#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(__RTP__) && !defined(_WRS_KERNEL) +#if !defined(_WIN32) && !defined(WIN32) && !defined(_WRS_KERNEL) #include <sys/time.h> #include <sys/resource.h> @@ -1453,6 +1449,7 @@ static int process_input(struct callback_data *p, FILE *in); */ static void open_db(struct callback_data *p){ if( p->db==0 ){ + sqlite3_initialize(); sqlite3_open(p->zDbFilename, &p->db); db = p->db; if( db && sqlite3_errcode(db)==SQLITE_OK ){ @@ -2468,7 +2465,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ open_db(p); output_file_close(p->traceOut); p->traceOut = output_file_open(azArg[1]); -#ifndef SQLITE_OMIT_TRACE +#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT) if( p->traceOut==0 ){ sqlite3_trace(p->db, 0, 0); }else{ @@ -2696,11 +2693,13 @@ static char *find_home_dir(void){ static char *home_dir = NULL; if( home_dir ) return home_dir; -#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL) - struct passwd *pwent; - uid_t uid = getuid(); - if( (pwent=getpwuid(uid)) != NULL) { - home_dir = pwent->pw_dir; +#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL) + { + struct passwd *pwent; + uid_t uid = getuid(); + if( (pwent=getpwuid(uid)) != NULL) { + home_dir = pwent->pw_dir; + } } #endif @@ -2710,7 +2709,7 @@ static char *find_home_dir(void){ home_dir = "/"; #else -#if defined(_WIN32) || defined(WIN32) || defined(__OS2__) +#if defined(_WIN32) || defined(WIN32) if (!home_dir) { home_dir = getenv("USERPROFILE"); } @@ -2720,7 +2719,7 @@ static char *find_home_dir(void){ home_dir = getenv("HOME"); } -#if defined(_WIN32) || defined(WIN32) || defined(__OS2__) +#if defined(_WIN32) || defined(WIN32) if (!home_dir) { char *zDrive, *zPath; int n; @@ -2773,6 +2772,7 @@ static int process_sqliterc( #endif return 1; } + sqlite3_initialize(); zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir); sqliterc = zBuf; } @@ -2936,11 +2936,7 @@ int main(int argc, char **argv){ } } if( i<argc ){ -#if defined(SQLITE_OS_OS2) && SQLITE_OS_OS2 - data.zDbFilename = (const char *)convertCpPathToUtf8( argv[i++] ); -#else data.zDbFilename = argv[i++]; -#endif }else{ #ifndef SQLITE_OMIT_MEMORYDB data.zDbFilename = ":memory:"; |