all repos — dmenu @ 6664e4233faa3d6b677a24196e9af4ac5b1920fd

my build of dmenu

merge stest -> default
Connor Lane Smith cls@lubutu.com
Mon, 19 Dec 2011 16:52:48 +0100
commit

6664e4233faa3d6b677a24196e9af4ac5b1920fd

parent

26c78cd95291d980f8978113cd6daa9841553c93

7 files changed, 186 insertions(+), 69 deletions(-)

jump to
M MakefileMakefile

@@ -3,10 +3,10 @@ # See LICENSE file for copyright and license details.

include config.mk -SRC = dmenu.c draw.c lsx.c +SRC = dmenu.c draw.c stest.c OBJ = ${SRC:.c=.o} -all: options dmenu lsx +all: options dmenu stest options: @echo dmenu build options:

@@ -24,18 +24,18 @@ dmenu: dmenu.o draw.o

@echo CC -o $@ @${CC} -o $@ dmenu.o draw.o ${LDFLAGS} -lsx: lsx.o +stest: stest.o @echo CC -o $@ - @${CC} -o $@ lsx.o ${LDFLAGS} + @${CC} -o $@ stest.o ${LDFLAGS} clean: @echo cleaning - @rm -f dmenu lsx ${OBJ} dmenu-${VERSION}.tar.gz + @rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz dist: clean @echo creating dist tarball @mkdir -p dmenu-${VERSION} - @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run lsx.1 ${SRC} dmenu-${VERSION} + @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run stest.1 ${SRC} dmenu-${VERSION} @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} @gzip dmenu-${VERSION}.tar @rm -rf dmenu-${VERSION}

@@ -43,24 +43,24 @@

install: all @echo installing executables to ${DESTDIR}${PREFIX}/bin @mkdir -p ${DESTDIR}${PREFIX}/bin - @cp -f dmenu dmenu_run lsx ${DESTDIR}${PREFIX}/bin + @cp -f dmenu dmenu_run stest ${DESTDIR}${PREFIX}/bin @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run - @chmod 755 ${DESTDIR}${PREFIX}/bin/lsx + @chmod 755 ${DESTDIR}${PREFIX}/bin/stest @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1 @mkdir -p ${DESTDIR}${MANPREFIX}/man1 @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1 - @sed "s/VERSION/${VERSION}/g" < lsx.1 > ${DESTDIR}${MANPREFIX}/man1/lsx.1 + @sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1 @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1 - @chmod 644 ${DESTDIR}${MANPREFIX}/man1/lsx.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1 uninstall: @echo removing executables from ${DESTDIR}${PREFIX}/bin @rm -f ${DESTDIR}${PREFIX}/bin/dmenu @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run - @rm -f ${DESTDIR}${PREFIX}/bin/lsx + @rm -f ${DESTDIR}${PREFIX}/bin/stest @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1 - @rm -f ${DESTDIR}${MANPREFIX}/man1/lsx.1 + @rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1 .PHONY: all options clean dist install uninstall
M config.mkconfig.mk

@@ -17,7 +17,7 @@ INCS = -I${X11INC}

LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} # flags -CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CFLAGS = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS}
M dmenu_rundmenu_run

@@ -7,8 +7,8 @@ cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~

fi ( IFS=: - if [ "`ls -dt $PATH "$cache" | head -n 1`" != "$cache" ]; then - lsx $PATH | sort -u | tee "$cache" | dmenu "$@" + if stest -dqr -n "$cache" $PATH; then + stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@" else dmenu "$@" < "$cache" fi
D lsx.1

@@ -1,11 +0,0 @@

-.TH LSX 1 dmenu\-VERSION -.SH NAME -lsx \- list executables -.SH SYNOPSIS -.B lsx -.RI [ directory ...] -.SH DESCRIPTION -.B lsx -lists the executables in each -.IR directory . -If none are given the current working directory is used.
D lsx.c

@@ -1,43 +0,0 @@

-/* See LICENSE file for copyright and license details. */ -#include <dirent.h> -#include <errno.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/stat.h> - -static void lsx(const char *dir); - -static int status = EXIT_SUCCESS; - -int -main(int argc, char *argv[]) { - int i; - - if(argc < 2) - lsx("."); - else for(i = 1; i < argc; i++) - lsx(argv[i]); - return status; -} - -void -lsx(const char *dir) { - char buf[PATH_MAX]; - struct dirent *d; - struct stat st; - DIR *dp; - - for(dp = opendir(dir); dp && (d = readdir(dp)); errno = 0) - if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf - && access(buf, X_OK) == 0 && stat(buf, &st) == 0 && S_ISREG(st.st_mode)) - puts(d->d_name); - - if(errno != 0) { - status = EXIT_FAILURE; - perror(dir); - } - if(dp) - closedir(dp); -}
A stest.1

@@ -0,0 +1,87 @@

+.TH STEST 1 dmenu\-VERSION +.SH NAME +stest \- filter a list of files by properties +.SH SYNOPSIS +.B stest +.RB [ -abcdefghlpqrsuwx ] +.RB [ -n +.IR file ] +.RB [ -o +.IR file ] +.RI [ file ...] +.SH DESCRIPTION +.B stest +takes a list of files and filters by the files' properties, analogous to +.IR test (1). +Files which pass all tests are printed to stdout. If no files are given, stest +reads files from stdin. +.SH OPTIONS +.TP +.B \-a +Test hidden files. +.TP +.B \-b +Test that files are block specials. +.TP +.B \-c +Test that files are character specials. +.TP +.B \-d +Test that files are directories. +.TP +.B \-e +Test that files exist. +.TP +.B \-f +Test that files are regular files. +.TP +.B \-g +Test that files have their set-group-ID flag set. +.TP +.B \-h +Test that files are symbolic links. +.TP +.B \-l +Test the contents of a directory given as an argument. +.TP +.BI \-n " file" +Test that files are newer than +.IR file . +.TP +.BI \-o " file" +Test that files are older than +.IR file . +.TP +.B \-p +Test that files are named pipes. +.TP +.B \-q +No files are printed, only the exit status is returned. +.TP +.B \-r +Test that files are readable. +.TP +.B \-s +Test that files are not empty. +.TP +.B \-u +Test that files have their set-user-ID flag set. +.TP +.B \-w +Test that files are writable. +.TP +.B \-x +Test that files are executable. +.SH EXIT STATUS +.TP +.B 0 +At least one file passed all tests. +.TP +.B 1 +No files passed all tests. +.TP +.B 2 +An error occurred. +.SH SEE ALSO +.IR dmenu (1), +.IR test (1)
A stest.c

@@ -0,0 +1,84 @@

+/* See LICENSE file for copyright and license details. */ +#include <dirent.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/stat.h> + +#define FLAG(x) (flag[(x)-'a']) + +static void test(const char *, const char *); + +static bool match = false; +static bool flag[26]; +static struct stat old, new; + +int +main(int argc, char *argv[]) { + struct dirent *d; + char buf[BUFSIZ], *p; + DIR *dir; + int opt; + + while((opt = getopt(argc, argv, "abcdefghln:o:pqrsuwx")) != -1) + switch(opt) { + case 'n': /* newer than file */ + case 'o': /* older than file */ + if(!(FLAG(opt) = !stat(optarg, (opt == 'n' ? &new : &old)))) + perror(optarg); + break; + default: /* miscellaneous operators */ + FLAG(opt) = true; + break; + case '?': /* error: unknown flag */ + fprintf(stderr, "usage: %s [-abcdefghlpqrsuwx] [-n file] [-o file] [file...]\n", argv[0]); + exit(2); + } + if(optind == argc) + while(fgets(buf, sizeof buf, stdin)) { + if((p = strchr(buf, '\n'))) + *p = '\0'; + test(buf, buf); + } + for(; optind < argc; optind++) + if(FLAG('l') && (dir = opendir(argv[optind]))) { + /* test directory contents */ + while((d = readdir(dir))) + if(snprintf(buf, sizeof buf, "%s/%s", argv[optind], d->d_name) < sizeof buf) + test(buf, d->d_name); + closedir(dir); + } + else + test(argv[optind], argv[optind]); + + return match ? 0 : 1; +} + +void +test(const char *path, const char *name) { + struct stat st, ln; + + if(!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */ + && (!FLAG('b') || S_ISBLK(st.st_mode)) /* block special */ + && (!FLAG('c') || S_ISCHR(st.st_mode)) /* character special */ + && (!FLAG('d') || S_ISDIR(st.st_mode)) /* directory */ + && (!FLAG('e') || access(path, F_OK) == 0) /* exists */ + && (!FLAG('f') || S_ISREG(st.st_mode)) /* regular file */ + && (!FLAG('g') || st.st_mode & S_ISGID) /* set-group-id flag */ + && (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link */ + && (!FLAG('n') || st.st_mtime > new.st_mtime) /* newer than file */ + && (!FLAG('o') || st.st_mtime < old.st_mtime) /* older than file */ + && (!FLAG('p') || S_ISFIFO(st.st_mode)) /* named pipe */ + && (!FLAG('r') || access(path, R_OK) == 0) /* readable */ + && (!FLAG('s') || st.st_size > 0) /* not empty */ + && (!FLAG('u') || st.st_mode & S_ISUID) /* set-user-id flag */ + && (!FLAG('w') || access(path, W_OK) == 0) /* writable */ + && (!FLAG('x') || access(path, X_OK) == 0)) { /* executable */ + if(FLAG('q')) + exit(0); + match = true; + puts(name); + } +}