database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Fix for ticket #21 (I think): Do not return an "out of memory" error if we

Browse Source 
can not find the users home directory. Instead, just report that we could
not find the home directory. (CVS 540)

FossilOrigin-Name: 8a50c57cc3342de9c6eca6c2567d3aa42b407f10
This commit is contained in:
drh
2002-04-21 19:06:22 +00:00
parent 77155c480a
commit e98d4fafe4
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shell.c
View File

@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.55 2002/04/19 12:34:06 drh Exp $
** $Id: shell.c,v 1.56 2002/04/21 19:06:22 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@ -998,11 +998,18 @@ static char *find_home_dir(void){
}
}
#if defined(_WIN32) || defined(WIN32)
if (!home_dir) {
home_dir = "c:";
}
#endif
if( home_dir ){
char *z = malloc( strlen(home_dir)+1 );
if( z ) strcpy(z, home_dir);
home_dir = z;
}
return home_dir;
}
@ -1017,7 +1024,11 @@ static void process_sqliterc(struct callback_data *p, char *sqliterc_override){
if (sqliterc == NULL) {
home_dir = find_home_dir();
sqliterc = home_dir ? malloc(strlen(home_dir) + 15) : 0;
if( home_dir==0 ){
fprintf(stderr,"%s: cannot locate your home directory!\n", Argv0);
return;
}
sqliterc = malloc(strlen(home_dir) + 15);
if( sqliterc==0 ){
fprintf(stderr,"%s: out of memory!\n", Argv0);
exit(1);