X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fpaths.c;h=25cb6b0eb58c7a4c415f3c24dd7dd2d9d8da8498;hb=d67b818ae90c5574166d08422d3e9a68d8d65e16;hp=f723ae2c247feb0a62ac94edefdd36cf24499946;hpb=67bed35b7c1b1c9470aa8d0ba33974eabd66e089;p=chaz%2Fopenbox

diff --git a/obt/paths.c b/obt/paths.c
index f723ae2c..25cb6b0e 100644
--- a/obt/paths.c
+++ b/obt/paths.c
@@ -16,9 +16,13 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
+#include "obt/bsearch.h"
 #include "obt/paths.h"
 #include "obt/util.h"
 
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
 #endif
@@ -84,12 +88,20 @@ static GSList* split_paths(const gchar *paths)
     if (!paths)
         return NULL;
     spl = g_strsplit(paths, ":", -1);
-    for (it = spl; *it; ++it)
-        list = slist_path_add(list, *it, (GSListFunc) g_slist_append);
+    for (it = spl; *it; ++it) {
+        if ((*it)[0]) /* skip empty strings */
+            list = slist_path_add(list, *it, (GSListFunc) g_slist_append);
+    }
     g_free(spl);
     return list;
 }
 
+int gid_cmp(const void *va, const void *vb)
+{
+    const gid_t a = *(const gid_t*)va, b = *(const gid_t*)vb;
+    return a>b ? 1 : (a == b ? 0 : -1);
+}
+
 static void find_uid_gid(uid_t *u, gid_t **g, guint *n)
 {
     struct passwd *pw;
@@ -115,6 +127,8 @@ static void find_uid_gid(uid_t *u, gid_t **g, guint *n)
         }
     }
     endgrent();
+
+    qsort(*g, *n, sizeof(gid_t), gid_cmp);
 }
 
 ObtPaths* obt_paths_new(void)
@@ -219,9 +233,13 @@ void obt_paths_unref(ObtPaths *p)
         for (it = p->autostart_dirs; it; it = g_slist_next(it))
             g_free(it->data);
         g_slist_free(p->autostart_dirs);
+        for (it = p->exec_dirs; it; it = g_slist_next(it))
+            g_free(it->data);
+        g_slist_free(p->exec_dirs);
         g_free(p->config_home);
         g_free(p->data_home);
         g_free(p->cache_home);
+        g_free(p->gid);
 
         g_slice_free(ObtPaths, p);
     }
@@ -317,17 +335,18 @@ static inline gboolean try_exec(const ObtPaths *const p,
                                 const gchar *const path)
 {
     struct stat st;
-    guint i;
+    BSEARCH_SETUP();
 
-    stat(path, &st);
+    if (stat(path, &st) != 0)
+        return FALSE;
 
     if (!S_ISREG(st.st_mode))
         return FALSE;
     if (st.st_uid == p->uid)
         return st.st_mode & S_IXUSR;
-    for (i = 0; i < p->n_gid; ++i)
-        if (st.st_gid == p->gid[i])
-            return st.st_mode & S_IXGRP;
+    BSEARCH(guint, p->gid, 0, p->n_gid, st.st_gid);
+    if (BSEARCH_FOUND())
+        return st.st_mode & S_IXGRP;
     return st.st_mode & S_IXOTH;
 }
 
@@ -340,7 +359,7 @@ gboolean obt_paths_try_exec(ObtPaths *p, const gchar *path)
         GSList *it;
 
         for (it = p->exec_dirs; it; it = g_slist_next(it)) {
-            gchar *f = g_strdup_printf(it->data, G_DIR_SEPARATOR_S, path);
+            gchar *f = g_build_filename(it->data, path, NULL);
             gboolean e = try_exec(p, f);
             g_free(f);
             if (e) return TRUE;