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
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;
}
}
endgrent();
+
+ qsort(*g, *n, sizeof(gid_t), gid_cmp);
}
ObtPaths* obt_paths_new(void)
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);
}
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;
}