Allow environment variable LTTNG_HOME to override HOME

[lttng-ust.git] / liblttng-ust / lttng-ust-comm.c

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index ae2e518965e94e37a9743e7c022023eb880e206a..475110cfc0a5b3ba5e8c2ef1e3ece796faf50c68 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -188,6 +188,22 @@ extern void lttng_ring_buffer_client_discard_exit(void);
 extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
+/*
+ * Returns the HOME directory path. Caller MUST NOT free(3) the returned
+ * pointer.
+ */
+static
+const char *get_lttng_home_dir(void)
+{
+       const char *val;
+
+       val = (const char *) getenv("LTTNG_HOME");
+       if (val != NULL) {
+               return val;
+       }
+       return (const char *) getenv("HOME");
+}
+
 /*
  * Force a read (imply TLS fixup for dlopen) of TLS variables.
  */
@@ -209,10 +225,12 @@ void print_cmd(int cmd, int handle)
 {
        const char *cmd_name = "Unknown";
 
-       if (cmd_name_mapping[cmd]) {
+       if (cmd >= 0 && cmd < LTTNG_ARRAY_SIZE(cmd_name_mapping)
+                       && cmd_name_mapping[cmd]) {
                cmd_name = cmd_name_mapping[cmd];
        }
-       DBG("Message Received \"%s\", Handle \"%s\" (%d)", cmd_name,
+       DBG("Message Received \"%s\" (%d), Handle \"%s\" (%d)",
+               cmd_name, cmd,
                lttng_ust_obj_get_name(handle), handle);
 }
 
@@ -230,7 +248,7 @@ int setup_local_apps(void)
                assert(local_apps.allowed == 0);
                return 0;
        }
-       home_dir = (const char *) getenv("HOME");
+       home_dir = get_lttng_home_dir();
        if (!home_dir) {
                WARN("HOME environment variable not set. Disabling LTTng-UST per-user tracing.");
                assert(local_apps.allowed == 0);