Add --with-socket-path=... and --with-cache-dir=... to configure

Signed-off-by: Josue David Hernandez Gutierrez <josue.d.hernandez.gutierrez@intel.com>

Author: josuedhg

.gitignore

@@ -36,4 +36,6 @@ test-suite.log
 testing_fuse.log
 testing_fuse.trs
 testing_daemon.log
-testing_daemon.trs
+testing_daemon.trs
+clr_debug_daemon.socket
+debuginfo.conf

clr_debug_daemon.socket clr_debug_daemon.socket.inclr_debug_daemon.socket renamed to clr_debug_daemon.socket.in

@@ -2,7 +2,7 @@
 Description=Clear Linux OS debuginfo daemon
 
 [Socket]
-ListenStream=/run/clr-debug-info
+ListenStream=@SOCKET_PATH@
 SocketMode=0600
 
 [Install]

configure.ac

@@ -9,14 +9,14 @@ AC_PROG_CC
 AM_PROG_AR
 AC_LANG(C)
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([clr_debug_daemon.socket])
+AC_CONFIG_FILES([debuginfo.conf])
 PKG_CHECK_MODULES([curl], [libcurl])
 PKG_CHECK_MODULES([fuse], [fuse])
 PKG_CHECK_MODULES([SYSTEMD], [systemd])
 PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd])
 LT_INIT
 
-AC_DEFINE([SOCKET_PATH], ["/run/clr-debug-info"], [path to communication socket])
-
 dir=""
 AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
 	    [path to systemd system service dir @<:@default=/usr/lib/systemd/system@:>@]), [dir=${withval}],
@@ -38,6 +38,22 @@ else
         AC_MSG_WARN([C11 stdatomic support unavailable. Falling back to slow mutex])
 fi
 
+SOCKET_PATH=""
+AC_ARG_WITH([socket-path], AS_HELP_STRING([--with-socket-path=SOCKET_PATH],
+            [path to create unix socket @<:@default=/run/clr-debug-info@:>@]), [SOCKET_PATH=${withval}],
+            [SOCKET_PATH="/run/clr-debug-info"])
+test -z "${SOCKET_PATH}" && SOCKET_PATH=/run/clr-debug-info
+AC_DEFINE_UNQUOTED([SOCKET_PATH], ["${SOCKET_PATH}"], [path to create unix socket @<:@default=/run/clr-debug-info@:>@])
+AC_SUBST(SOCKET_PATH, [${SOCKET_PATH}])
+
+CACHE_DIR=""
+AC_ARG_WITH([cache-dir], AS_HELP_STRING([--with-cache-dir=CACHE_DIR],
+            [path to cache downloaded content @<:@default=/var/cache/debuginfo@:>@]), [CACHE_DIR="${withval}"],
+            [CACHE_DIR="/var/cache/debuginfo"])
+test -z "${CACHE_DIR}" && CACHE_DIR=/var/cache/debuginfo
+AC_DEFINE_UNQUOTED([CACHE_DIR], ["${CACHE_DIR}"], [path to cache downloaded content @<:@default=/var/cache/debuginfo@:>@])
+AC_SUBST(CACHE_DIR, [${CACHE_DIR}])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
@@ -57,6 +73,8 @@ AC_MSG_RESULT([
 
         systemd-unit-dir:       ${systemdsystemunitdir}
         tmpfiles.d:             ${tmpfilesdir}
+        socket_dir:             ${SOCKET_PATH}
+        cache_dir:              ${CACHE_DIR}
 
         C11 stdatomic support:  ${have_atomics}
 ])

debuginfo.conf debuginfo.conf.indebuginfo.conf renamed to debuginfo.conf.in

@@ -10,5 +10,5 @@
 # Clear tmp directories separately, to make them easier to override
 # Unfortunatly tmpfiles doesn't change the ownership for things if they
 # are not listed.
-d /var/cache/debuginfo/lib 755 dbginfo dbginfo 10d
-d /var/cache/debuginfo/src 755 dbginfo dbginfo 1d
+d @CACHE_DIR@/lib 755 dbginfo dbginfo 10d
+d @CACHE_DIR@/src 755 dbginfo dbginfo 1d

src/fuse.c

@@ -636,8 +636,8 @@ int main(__nc_unused__ int argc, __nc_unused__ char *argv[])
 {
         char *fake_argv[20];
         char *dir = "/usr/src/debug";
-        char *shadowdir = "/var/cache/debuginfo/src";
-        const char *required_paths[] = { "/var/cache/debuginfo/lib", "/var/cache/debuginfo/src" };
+        char *shadowdir = CACHE_DIR "/src";
+        const char *required_paths[] = { CACHE_DIR "/lib", CACHE_DIR "/src" };
 
         umask(0);
 
@@ -663,7 +663,7 @@ int main(__nc_unused__ int argc, __nc_unused__ char *argv[])
 
         if (fork() == 0) {
                 dir = "/usr/lib/debug";
-                shadowdir = "/var/cache/debuginfo/lib";
+                shadowdir = CACHE_DIR "/lib";
                 prefix = "lib";
         }
 

src/server.c

@@ -322,8 +322,9 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 
                 /* test extraction first */
                 if (asprintf(&command,
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner "
+                             "tar -C %s/%s --no-same-owner "
                              "--no-same-permissions -tf %s",
+                             CACHE_DIR,
                              prefix,
                              filename) < 0) {
                         ret = 418;
@@ -338,8 +339,9 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 
                 free(command); /* reuse */
                 if (asprintf(&command,
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner "
+                             "tar -C %s/%s --no-same-owner "
                              "--no-same-permissions -xf %s",
+                             CACHE_DIR,
                              prefix,
                              filename) < 0) {
                         ret = 418;
@@ -472,7 +474,7 @@ int main(__nc_unused__ int argc, __nc_unused__ char **argv)
         uid_t dbg_user = 0;
         gid_t dbg_group = 0;
         struct passwd *passwdentry;
-        const char *required_paths[] = { "/var/cache/debuginfo/lib", "/var/cache/debuginfo/src" };
+        const char *required_paths[] = { CACHE_DIR "/lib", CACHE_DIR "/src" };
 
         if (configure_urls()) {
                 fprintf(stderr, "Using urls from environment\n");

tests/testing_daemon.c

@@ -67,7 +67,7 @@ int testing_daemon(void)
         }
 
         close(sockfd);
-        return strcmp(buffer, "ok") && access("/var/cache/debuginfo/lib/lib", F_OK) != -1;
+        return strcmp(buffer, "ok") && access(CACHE_DIR "/lib/lib", F_OK) != -1;
 }
 
 int main(void)