I also dislike sort -u, I support that each Unix tool does one job and does it right ;)

.hgtags

@@ -21,3 +21,7 @@ c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
 1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
 7656557298c954469a6a9564e6649b1fb5db663e 2.1
 90f0e34e7f118c9ad3227a1606211ee825942b1c 2.2
+b6e09682c8adcb6569656bee73c311f9ab457715 2.3
+9e9036cbfb4b7306c6fb366249e81dc0e65bdfde 2.4
+03e83e2788c83ddd63b45a667939d7ec783c98cb 2.4.1
+1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2

Makefile

@@ -32,7 +32,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+	@cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h dmenu_path ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}
@@ -40,8 +40,9 @@ dist: clean
 install: all
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu ${DESTDIR}${PREFIX}/bin
+	@cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
@@ -49,7 +50,7 @@ install: all
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
-	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 2.3
+VERSION = 2.5
 
 # Customize below to fit your system
 

dmenu.h

@@ -14,36 +14,31 @@
 /* color */
 enum { ColFG, ColBG, ColLast };
 
-typedef struct DC DC;
+typedef struct {
-typedef struct Fnt Fnt;
+	int x, y, w, h;
-
+	unsigned long norm[ColLast];
-struct Fnt {
+	unsigned long sel[ColLast];
+	Drawable drawable;
+	GC gc;
+	struct {
 		XFontStruct *xfont;
 		XFontSet set;
 		int ascent;
 		int descent;
 		int height;
-};
+	} font;
+} DC; /* draw context */
 
-struct DC {
+int screen;
-	int x, y, w, h;
+Display *dpy;
-	unsigned long norm[ColLast];
+DC dc;			/* global drawing context */
-	unsigned long sel[ColLast];
-	Drawable drawable;
-	Fnt font;
-	GC gc;
-}; /* draw context */
-
-extern int screen;
-extern Display *dpy;
-extern DC dc;			/* global drawing context */
 
 /* draw.c */
-extern void drawtext(const char *text, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast]);
-extern unsigned int textw(const char *text);
+unsigned int textw(const char *text);
-extern unsigned int textnw(const char *text, unsigned int len);
+unsigned int textnw(const char *text, unsigned int len);
 
 /* util.c */
-extern void *emalloc(unsigned int size);		/* allocates memory, exits on error */
+void *emalloc(unsigned int size);		/* allocates memory, exits on error */
-extern void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
+void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
-extern char *estrdup(const char *str);			/* duplicates str, exits on allocation error */
+char *estrdup(const char *str);			/* duplicates str, exits on allocation error */

dmenu_path

@@ -0,0 +1,9 @@
+#!/bin/sh
+IFS=:
+for dir in $PATH
+do
+	for file in "$dir"/*
+	do
+		test -x "$file" && echo "${file##*/}"
+	done
+done | sort | uniq

main.c

@@ -418,7 +418,9 @@ main(int argc, char *argv[]) {
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
 
-	if(isatty(STDIN_FILENO)) {
+	if(argc == 2 && !strncmp("-v", argv[1], 3))
+		eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+	else if(isatty(STDIN_FILENO)) {
 		fputs("error: dmenu can't run in an interactive shell\n", stdout);
 		usage();
 	}
@@ -445,8 +447,6 @@ main(int argc, char *argv[]) {
 		else if(!strncmp(argv[i], "-sf", 4)) {
 			if(++i < argc) selfg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-v", 3))
-			eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
 		else
 			usage();
 	setlocale(LC_CTYPE, "");