Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Patches to get things working better for OS2. Ticket #1836. (CVS 3217) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
65c6e5e117b9194015e382b1ad9bb9c8 |
| User & Date: | drh 2006-06-12 12:57:46 |
Context
|
2006-06-12
| ||
| 16:01 | Add code to invoke the xDestroy method of a virtual table when it is dropped. (CVS 3218) check-in: f0c7c8d1 user: danielk1977 tags: trunk | |
| 12:57 | Patches to get things working better for OS2. Ticket #1836. (CVS 3217) check-in: 65c6e5e1 user: drh tags: trunk | |
| 12:50 | Fixes so that builds work with SQLITE_OMIT_VIRTUALTABLE=1. (CVS 3216) check-in: 54b30fe1 user: drh tags: trunk | |
Changes
Changes to src/os.h.
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#if !defined(OS_UNIX) && !defined(OS_OTHER) # define OS_OTHER 0 # ifndef OS_WIN # if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) # define OS_WIN 1 # define OS_UNIX 0 # define OS_OS2 0 # elif defined(_EMX_) || defined(_OS2) || defined(OS2) || defined(OS_OS2) # define OS_WIN 0 # define OS_UNIX 0 # define OS_OS2 1 # else # define OS_WIN 0 # define OS_UNIX 1 # define OS_OS2 0 |
| |
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#if !defined(OS_UNIX) && !defined(OS_OTHER)
# define OS_OTHER 0
# ifndef OS_WIN
# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
# define OS_WIN 1
# define OS_UNIX 0
# define OS_OS2 0
# elif defined(_EMX_) || defined(_OS2) || defined(OS2) || defined(OS_OS2) || defined(__OS2__)
# define OS_WIN 0
# define OS_UNIX 0
# define OS_OS2 1
# else
# define OS_WIN 0
# define OS_UNIX 1
# define OS_OS2 0
|
Changes to src/shell.c.
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 .... 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 .... 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** 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 $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include <assert.h> #include "sqlite3.h" #include <ctype.h> #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) # include <signal.h> # include <pwd.h> # include <unistd.h> # include <sys/types.h> #endif #ifdef __MACOS__ ................................................................................ # include <console.h> # include <signal.h> # include <unistd.h> # include <extras.h> # include <Files.h> # include <Folders.h> #endif #if defined(HAVE_READLINE) && HAVE_READLINE==1 # include <readline/readline.h> # include <readline/history.h> #else # define readline(p) local_getline(p,stdin) # define add_history(X) ................................................................................ ** 0 return indicates an error of some kind. Space to hold the ** resulting string is obtained from malloc(). The calling ** function should free the result. */ static char *find_home_dir(void){ char *home_dir = NULL; #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) struct passwd *pwent; uid_t uid = getuid(); if( (pwent=getpwuid(uid)) != NULL) { home_dir = pwent->pw_dir; } #endif ................................................................................ if (!home_dir) { home_dir = getenv("HOME"); if (!home_dir) { home_dir = getenv("HOMEPATH"); /* Windows? */ } } #if defined(_WIN32) || defined(WIN32) if (!home_dir) { home_dir = "c:"; } #endif if( home_dir ){ char *z = malloc( strlen(home_dir)+1 ); |
| | > > > > | | |
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 .... 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 .... 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.141 2006/06/12 12:57:46 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include <assert.h> #include "sqlite3.h" #include <ctype.h> #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) && !defined(__OS2__) # include <signal.h> # include <pwd.h> # include <unistd.h> # include <sys/types.h> #endif #ifdef __MACOS__ ................................................................................ # include <console.h> # include <signal.h> # include <unistd.h> # include <extras.h> # include <Files.h> # 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> #else # define readline(p) local_getline(p,stdin) # define add_history(X) ................................................................................ ** 0 return indicates an error of some kind. Space to hold the ** resulting string is obtained from malloc(). The calling ** function should free the result. */ static char *find_home_dir(void){ char *home_dir = NULL; #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) && !defined(__OS2__) struct passwd *pwent; uid_t uid = getuid(); if( (pwent=getpwuid(uid)) != NULL) { home_dir = pwent->pw_dir; } #endif ................................................................................ if (!home_dir) { home_dir = getenv("HOME"); if (!home_dir) { home_dir = getenv("HOMEPATH"); /* Windows? */ } } #if defined(_WIN32) || defined(WIN32) || defined(__OS2__) if (!home_dir) { home_dir = "c:"; } #endif if( home_dir ){ char *z = malloc( strlen(home_dir)+1 ); |