summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac4
-rw-r--r--src/db.cc19
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
@@ -11,4 +11,8 @@ AC_PROG_LIBTOOL
11PKG_PROG_PKG_CONFIG 11PKG_PROG_PKG_CONFIG
12 12
13onegetcwd=false
14AC_CHECK_FUNCS([get_current_dir_name getcwd],[onegetcwd=true;break])
15$onegetcwd || AC_MSG_ERROR([no function to get current directory found. weird.])
16
13AC_HEADER_STDC 17AC_HEADER_STDC
14 18
diff --git a/src/db.cc b/src/db.cc
index d1e0a85..9ae5f8f 100644
--- a/src/db.cc
+++ b/src/db.cc
@@ -18,4 +18,5 @@ namespace napkin {
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)
@@ -23,4 +24,22 @@ namespace napkin {
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 }