===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sqlite3/Attic/shell.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.4
diff -c -r1.1.1.3 -r1.1.1.4
*** src/usr.bin/sqlite3/Attic/shell.c	2012/06/04 09:03:22	1.1.1.3
--- src/usr.bin/sqlite3/Attic/shell.c	2012/11/29 05:14:10	1.1.1.4
***************
*** 36,42 ****
  #include <ctype.h>
  #include <stdarg.h>
  
! #if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__)
  # include <signal.h>
  # if !defined(__RTP__) && !defined(_WRS_KERNEL)
  #  include <pwd.h>
--- 36,42 ----
  #include <ctype.h>
  #include <stdarg.h>
  
! #if !defined(_WIN32) && !defined(WIN32)
  # include <signal.h>
  # if !defined(__RTP__) && !defined(_WRS_KERNEL)
  #  include <pwd.h>
***************
*** 45,54 ****
  # include <sys/types.h>
  #endif
  
- #ifdef __OS2__
- # include <unistd.h>
- #endif
- 
  #ifdef HAVE_EDITLINE
  # include <editline/editline.h>
  #endif
--- 45,50 ----
***************
*** 68,74 ****
--- 64,72 ----
  # include <io.h>
  #define isatty(h) _isatty(h)
  #define access(f,m) _access((f),(m))
+ #undef popen
  #define popen(a,b) _popen((a),(b))
+ #undef pclose
  #define pclose(x) _pclose(x)
  #else
  /* Make sure isatty() has a prototype.
***************
*** 92,98 ****
  #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)
  #include <sys/time.h>
  #include <sys/resource.h>
  
--- 90,96 ----
  #define IsDigit(X)  isdigit((unsigned char)X)
  #define ToLower(X)  (char)tolower((unsigned char)X)
  
! #if !defined(_WIN32) && !defined(WIN32) && !defined(_WRS_KERNEL)
  #include <sys/time.h>
  #include <sys/resource.h>
  
***************
*** 1453,1458 ****
--- 1451,1457 ----
  */
  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,2474 ****
      open_db(p);
      output_file_close(p->traceOut);
      p->traceOut = output_file_open(azArg[1]);
! #ifndef SQLITE_OMIT_TRACE
      if( p->traceOut==0 ){
        sqlite3_trace(p->db, 0, 0);
      }else{
--- 2467,2473 ----
      open_db(p);
      output_file_close(p->traceOut);
      p->traceOut = output_file_open(azArg[1]);
! #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
      if( p->traceOut==0 ){
        sqlite3_trace(p->db, 0, 0);
      }else{
***************
*** 2696,2706 ****
    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;
    }
  #endif
  
--- 2695,2707 ----
    static char *home_dir = NULL;
    if( home_dir ) return home_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,2716 ****
    home_dir = "/";
  #else
  
! #if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
    if (!home_dir) {
      home_dir = getenv("USERPROFILE");
    }
--- 2711,2717 ----
    home_dir = "/";
  #else
  
! #if defined(_WIN32) || defined(WIN32)
    if (!home_dir) {
      home_dir = getenv("USERPROFILE");
    }
***************
*** 2720,2726 ****
      home_dir = getenv("HOME");
    }
  
! #if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
    if (!home_dir) {
      char *zDrive, *zPath;
      int n;
--- 2721,2727 ----
      home_dir = getenv("HOME");
    }
  
! #if defined(_WIN32) || defined(WIN32)
    if (!home_dir) {
      char *zDrive, *zPath;
      int n;
***************
*** 2773,2778 ****
--- 2774,2780 ----
  #endif
        return 1;
      }
+     sqlite3_initialize();
      zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
      sqliterc = zBuf;
    }
***************
*** 2936,2946 ****
      }
    }
    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:";
--- 2938,2944 ----