aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Lane Smith <cls@lubutu.com>2010-10-08 23:24:22 +0100
committerConnor Lane Smith <cls@lubutu.com>2010-10-08 23:24:22 +0100
commitbf7b8e37ee2a53f0f1bed75dd84e5214269cfac8 (patch)
treee1e6e3ef7c82e062fe86b088a9741d63aa9325c1
parent610a0a8d126b5caa7fec60632c999ca326ca2eff (diff)
dmenu_path.c (shell is a bottleneck)
-rw-r--r--Makefile15
-rwxr-xr-xdmenu_path26
-rw-r--r--dmenu_path.c101
3 files changed, 108 insertions, 34 deletions
diff --git a/Makefile b/Makefile
index 1082697..c183779 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
3 3
4include config.mk 4include config.mk
5 5
6all: options dmenu 6all: options dmenu dmenu_path
7 7
8options: 8options:
9 @echo dmenu build options: 9 @echo dmenu build options:
@@ -11,22 +11,21 @@ options:
11 @echo "LDFLAGS = ${LDFLAGS}" 11 @echo "LDFLAGS = ${LDFLAGS}"
12 @echo "CC = ${CC}" 12 @echo "CC = ${CC}"
13 13
14dmenu.o: dmenu.c config.mk 14dmenu: dmenu.c config.mk
15 @echo CC $< 15dmenu_path: dmenu_path.c
16 @${CC} -c ${CFLAGS} $<
17 16
18dmenu: dmenu.o 17dmenu dmenu_path:
19 @echo CC -o $@ 18 @echo CC -o $@
20 @${CC} -o $@ $+ ${LDFLAGS} 19 @${CC} -o $@ $< ${CFLAGS} ${LDFLAGS}
21 20
22clean: 21clean:
23 @echo cleaning 22 @echo cleaning
24 @rm -f dmenu dmenu.o dmenu-${VERSION}.tar.gz 23 @rm -f dmenu dmenu_path dmenu-${VERSION}.tar.gz
25 24
26dist: clean 25dist: clean
27 @echo creating dist tarball 26 @echo creating dist tarball
28 @mkdir -p dmenu-${VERSION} 27 @mkdir -p dmenu-${VERSION}
29 @cp LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path dmenu_run dmenu-${VERSION} 28 @cp LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path.c dmenu_run dmenu-${VERSION}
30 @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} 29 @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
31 @gzip dmenu-${VERSION}.tar 30 @gzip dmenu-${VERSION}.tar
32 @rm -rf dmenu-${VERSION} 31 @rm -rf dmenu-${VERSION}
diff --git a/dmenu_path b/dmenu_path
deleted file mode 100755
index a9ddd47..0000000
--- a/dmenu_path
+++ /dev/null
@@ -1,26 +0,0 @@
1#!/bin/sh
2CACHE=$HOME/.dmenu_cache
3IFS=:
4
5uptodate() {
6 test -f "$CACHE" &&
7 for dir in $PATH
8 do
9 test ! $dir -nt "$CACHE" || return 1
10 done
11}
12
13if ! uptodate
14then
15 for dir in $PATH
16 do
17 cd "$dir" &&
18 for file in *
19 do
20 test -x "$file" && echo "$file"
21 done
22 done | sort -u > "$CACHE".$$ &&
23 mv "$CACHE".$$ "$CACHE"
24fi
25
26cat "$CACHE"
diff --git a/dmenu_path.c b/dmenu_path.c
new file mode 100644
index 0000000..1575f1d
--- /dev/null
+++ b/dmenu_path.c
@@ -0,0 +1,101 @@
1/* See LICENSE file for copyright and license details. */
2#include <dirent.h>
3#include <stdio.h>
4#include <stdlib.h>
5#include <string.h>
6#include <unistd.h>
7#include <sys/stat.h>
8
9#define CACHE ".dmenu_cache"
10
11static int qstrcmp(const void *a, const void *b);
12static void die(const char *s);
13static void scan(void);
14static int uptodate(void);
15
16static char **items = NULL;
17static const char *Home, *Path;
18static size_t count = 0;
19
20int
21main(void) {
22 if(!(Home = getenv("HOME")))
23 die("no $HOME");
24 if(!(Path = getenv("PATH")))
25 die("no $PATH");
26 if(chdir(Home) < 0)
27 die("chdir failed");
28 if(uptodate()) {
29 execlp("cat", "cat", CACHE, NULL);
30 die("exec failed");
31 }
32 scan();
33 return EXIT_SUCCESS;
34}
35
36void
37die(const char *s) {
38 fprintf(stderr, "dmenu_path: %s\n", s);
39 exit(EXIT_FAILURE);
40}
41
42int
43qstrcmp(const void *a, const void *b) {
44 return strcmp(*(const char **)a, *(const char **)b);
45}
46
47void
48scan(void) {
49 char buf[PATH_MAX];
50 char *dir, *path;
51 size_t i;
52 struct dirent *ent;
53 DIR *dp;
54 FILE *cache;
55
56 if(!(path = strdup(Path)))
57 die("strdup failed");
58 for(dir = strtok(path, ":"); dir; dir = strtok(NULL, ":")) {
59 if(!(dp = opendir(dir)))
60 continue;
61 while((ent = readdir(dp))) {
62 snprintf(buf, sizeof buf, "%s/%s", dir, ent->d_name);
63 if(ent->d_name[0] == '.' || access(buf, X_OK) < 0)
64 continue;
65 if(!(items = realloc(items, ++count * sizeof *items)))
66 die("malloc failed");
67 if(!(items[count-1] = strdup(ent->d_name)))
68 die("strdup failed");
69 }
70 closedir(dp);
71 }
72 qsort(items, count, sizeof *items, qstrcmp);
73 if(!(cache = fopen(CACHE, "w")))
74 die("open failed");
75 for(i = 0; i < count; i++) {
76 if(i > 0 && !strcmp(items[i], items[i-1]))
77 continue;
78 fprintf(cache, "%s\n", items[i]);
79 fprintf(stdout, "%s\n", items[i]);
80 }
81 fclose(cache);
82 free(path);
83}
84
85int
86uptodate(void) {
87 char *dir, *path;
88 time_t mtime;
89 struct stat st;
90
91 if(stat(CACHE, &st) < 0)
92 return 0;
93 mtime = st.st_mtime;
94 if(!(path = strdup(Path)))
95 die("strdup failed");
96 for(dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))
97 if(!stat(dir, &st) && st.st_mtime > mtime)
98 return 0;
99 free(path);
100 return 1;
101}