Merge branch 'master' into next

[i3/i3] / libi3 / get_exe_path.c

diff --git a/libi3/get_exe_path.c b/libi3/get_exe_path.c
index 32fa544b164b0f93c235ff8f0d418c7acf09a0c5..fca7ba02cf5a5f3fa2787c55062b89b76ab4c0d5 100644 (file)
--- a/libi3/get_exe_path.c
+++ b/libi3/get_exe_path.c
@@ -46,13 +46,11 @@ const char *get_exe_path(const char *argv0) {
 
        /* Fall back to searching $PATH (or _CS_PATH in absence of $PATH). */
        char *path = getenv("PATH");
-       size_t pathlen;
        if (path == NULL) {
                /* _CS_PATH is typically something like "/bin:/usr/bin" */
-               pathlen = confstr(_CS_PATH, tmp, sizeof(tmp));
+               confstr(_CS_PATH, tmp, sizeof(tmp));
                sasprintf(&path, ":%s", tmp);
        } else {
-               pathlen = strlen(path);
                path = strdup(path);
        }
        const char *component;
@@ -72,5 +70,5 @@ const char *get_exe_path(const char *argv0) {
        free(path);
 
        /* Last resort: maybe it’s in /usr/bin? */
-       return "/usr/bin/i3bar";
+       return "/usr/bin/i3-nagbar";
 }