core: move index/data path detection into zdb bootstrap

Author: maxux

libzdb/bootstrap.c

@@ -31,8 +31,8 @@ zdb_settings_t *zdb_initialize() {
         return NULL;
 
     // apply default settings
-    s->datapath = strdup(ZDB_DEFAULT_DATAPATH);
-    s->indexpath = strdup(ZDB_DEFAULT_INDEXPATH);
+    s->datapath = ZDB_DEFAULT_DATAPATH;
+    s->indexpath = ZDB_DEFAULT_INDEXPATH;
     s->datasize = ZDB_DEFAULT_DATA_MAXSIZE;
 
     // running 0-db in mixed mode by default
@@ -108,6 +108,19 @@ zdb_settings_t *zdb_open(zdb_settings_t *zdb_settings) {
         zdb_dir_create(zdb_settings->indexpath);
     }
 
+    // ensure that data and index does not points to the
+    // same directory
+    char *datapath = realpath(zdb_settings->datapath, NULL);
+    char *indexpath = realpath(zdb_settings->indexpath, NULL);
+
+    if(strcmp(datapath, indexpath) == 0) {
+        zdb_danger("[-] system: cannot use the same directory for index and data path");
+        return NULL;
+    }
+
+    free(datapath);
+    free(indexpath);
+
     // check/install a lock on the index and data directory to avoid
     // multiple instance of zdb running on theses directories
     snprintf(lockpath, sizeof(lockpath), "%s/.lockfile", zdb_settings->indexpath);
@@ -139,8 +152,6 @@ void zdb_close(zdb_settings_t *zdb_settings) {
 
     zdb_debug("[+] bootstrap: cleaning library\n");
     free(zdb_settings->zdbid);
-    free(zdb_settings->indexpath);
-    free(zdb_settings->datapath);
     zdb_settings->zdbid = NULL;
     zdb_settings->initialized = 0;
 

zdbd/zdbd.c

@@ -325,19 +325,11 @@ int main(int argc, char *argv[]) {
                 return 0;
 
             case 'd':
-                // free default path allocated
-                free(zdb_settings->datapath);
-
-                // resolve data path passed
-                zdb_settings->datapath = realpath(optarg, NULL);
+                zdb_settings->datapath = optarg;
                 break;
 
             case 'i':
-                // free default path allocated
-                free(zdb_settings->indexpath);
-
-                // resolve index path passed
-                zdb_settings->indexpath = realpath(optarg, NULL);
+                zdb_settings->indexpath = optarg;
                 break;
 
             case 'l':
@@ -479,11 +471,6 @@ int main(int argc, char *argv[]) {
         exit(EXIT_FAILURE);
     }
 
-    if(strcmp(zdb_settings->datapath, zdb_settings->indexpath) == 0) {
-        zdbd_danger("[-] system: cannot use the same directory for index and data path");
-        exit(EXIT_FAILURE);
-    }
-
     //
     // print information relative to database instance
     //