-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/db.cc | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3ca0b4e..fbf373b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,24 +1,28 @@ | |||
1 | AC_INIT([napkin], [0.0], [napkin-bugs@klever.net]) | 1 | AC_INIT([napkin], [0.0], [napkin-bugs@klever.net]) |
2 | AC_CONFIG_AUX_DIR([aux.d]) | 2 | AC_CONFIG_AUX_DIR([aux.d]) |
3 | AC_CONFIG_SRCDIR([src/napkin.cc]) | 3 | AC_CONFIG_SRCDIR([src/napkin.cc]) |
4 | AC_CONFIG_HEADERS([config.h]) | 4 | AC_CONFIG_HEADERS([config.h]) |
5 | AM_INIT_AUTOMAKE([dist-bzip2]) | 5 | AM_INIT_AUTOMAKE([dist-bzip2]) |
6 | 6 | ||
7 | AC_PROG_INSTALL | 7 | AC_PROG_INSTALL |
8 | AC_PROG_CXX | 8 | AC_PROG_CXX |
9 | AC_PROG_CC | 9 | AC_PROG_CC |
10 | AC_PROG_LIBTOOL | 10 | AC_PROG_LIBTOOL |
11 | PKG_PROG_PKG_CONFIG | 11 | PKG_PROG_PKG_CONFIG |
12 | 12 | ||
13 | onegetcwd=false | ||
14 | AC_CHECK_FUNCS([get_current_dir_name getcwd],[onegetcwd=true;break]) | ||
15 | $onegetcwd || AC_MSG_ERROR([no function to get current directory found. weird.]) | ||
16 | |||
13 | AC_HEADER_STDC | 17 | AC_HEADER_STDC |
14 | 18 | ||
15 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 19 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
16 | 20 | ||
17 | PKG_CHECK_MODULES([MODULES],[gtkmm-2.4 sqlite3],,[ | 21 | PKG_CHECK_MODULES([MODULES],[gtkmm-2.4 sqlite3],,[ |
18 | AC_MSG_ERROR([not all dependencies could be satisfied]) | 22 | AC_MSG_ERROR([not all dependencies could be satisfied]) |
19 | ]) | 23 | ]) |
20 | 24 | ||
21 | AC_MSG_CHECKING([whether to enable debugging code]) | 25 | AC_MSG_CHECKING([whether to enable debugging code]) |
22 | ndebug=true | 26 | ndebug=true |
23 | AC_ARG_ENABLE([debug], | 27 | AC_ARG_ENABLE([debug], |
24 | AC_HELP_STRING([--enable-debug],[enable debugging/development code]), | 28 | AC_HELP_STRING([--enable-debug],[enable debugging/development code]), |
@@ -8,29 +8,48 @@ | |||
8 | #include "config.h" | 8 | #include "config.h" |
9 | 9 | ||
10 | namespace napkin { | 10 | namespace napkin { |
11 | 11 | ||
12 | extern const char *sql_bootstrap; | 12 | extern const char *sql_bootstrap; |
13 | 13 | ||
14 | db_t::db_t() { | 14 | db_t::db_t() { |
15 | const char *h = getenv("HOME"); | 15 | const char *h = getenv("HOME"); |
16 | if(h) { | 16 | if(h) { |
17 | datadir = h; | 17 | datadir = h; |
18 | datadir += "/."PACKAGE_NAME"/"; | 18 | datadir += "/."PACKAGE_NAME"/"; |
19 | }else{ | 19 | }else{ |
20 | #if defined(HAVE_GET_CURRENT_DIR_NAME) | ||
20 | char *cwd = get_current_dir_name(); | 21 | char *cwd = get_current_dir_name(); |
21 | if(!cwd) | 22 | if(!cwd) |
22 | throw napkin::exception("failed to get_current_dir_name()"); | 23 | throw napkin::exception("failed to get_current_dir_name()"); |
23 | datadir = cwd; | 24 | datadir = cwd; |
24 | free(cwd); | 25 | free(cwd); |
26 | #elif defined(HAVE_GETCWD) | ||
27 | { | ||
28 | char cwd[ | ||
29 | # if defined(MAXPATH) | ||
30 | MAXPATH | ||
31 | # elif defined(MAXPATHLEN) | ||
32 | MAXPATHLEN | ||
33 | # else /* maxpath */ | ||
34 | 512 | ||
35 | #endif /* maxpath */ | ||
36 | ]; | ||
37 | if(!getcwd(cwd,sizeof(cwd))) | ||
38 | throw napkin::exception("failed to getcwd()"); | ||
39 | datadir = cwd; | ||
40 | } | ||
41 | #else /* get cwd */ | ||
42 | # error dunno how to get current workdir | ||
43 | #endif /* get cwd */ | ||
25 | datadir += "/."PACKAGE_NAME"/"; | 44 | datadir += "/."PACKAGE_NAME"/"; |
26 | } | 45 | } |
27 | if(access(datadir.c_str(),R_OK|W_OK) | 46 | if(access(datadir.c_str(),R_OK|W_OK) |
28 | && mkdir(datadir.c_str(),0700)) | 47 | && mkdir(datadir.c_str(),0700)) |
29 | throw napkin::exception("no access to '"+datadir+"' directory"); | 48 | throw napkin::exception("no access to '"+datadir+"' directory"); |
30 | open((datadir+PACKAGE_NAME".db").c_str()); | 49 | open((datadir+PACKAGE_NAME".db").c_str()); |
31 | assert(_D); | 50 | assert(_D); |
32 | char **resp; int nr,nc; char *errm; | 51 | char **resp; int nr,nc; char *errm; |
33 | if(sqlite3_get_table( | 52 | if(sqlite3_get_table( |
34 | _D, | 53 | _D, |
35 | "SELECT s_tobed FROM sleeps LIMIT 0", | 54 | "SELECT s_tobed FROM sleeps LIMIT 0", |
36 | &resp,&nr,&nc,&errm)!=SQLITE_OK) { | 55 | &resp,&nr,&nc,&errm)!=SQLITE_OK) { |