git.stevedylan.dev

replace lsx with stest bb4424df

Connor Lane Smith · 2011-11-19 19:54 7 file(s) · +189 −69

Makefile +12 −12


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:

	@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}

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

config.mk +1 −1

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}


dmenu_run +4 −2

fi
(
	IFS=:
	if [ "`ls -dt $PATH "$CACHE" | head -n 1`" != "$CACHE" ]; then
		lsx $PATH | sort -u > "$CACHE"
	if ls -d $PATH | stest -q -n "$CACHE"; then
		for dir in $PATH; do
			ls $dir | stest -C $dir -fx
		done | sort -u > "$CACHE"
	fi
)
cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"

lsx.1 (deleted) +0 −11

.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.

lsx.c (deleted) +0 −43

/* 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);
}

stest.1 (added) +87 −0

1	+	.TH STEST 1 dmenu\-VERSION
2	+	.SH NAME
3	+	stest \- filter a list of files by properties
4	+	.SH SYNOPSIS
5	+	.B stest
6	+	.RB [ -bcdefghpqrsuwx ]
7	+	.RB [ -C
8	+	.IR dir ]
9	+	.RB [ -n
10	+	.IR file ]
11	+	.RB [ -o
12	+	.IR file ]
13	+	.RI [ file ...]
14	+	.SH DESCRIPTION
15	+	.B stest
16	+	takes a list of files and filters by the files' properties, analogous to
17	+	.IR test (1).
18	+	Files which pass all tests are printed to stdout. If no files are given as
19	+	arguments, stest will read a list of files from stdin, one path per line.
20	+	.SH OPTIONS
21	+	.TP
22	+	.BI \-C " dir"
23	+	Tests files relative to directory
24	+	.IR dir .
25	+	.TP
26	+	.B \-b
27	+	Test that files are block specials.
28	+	.TP
29	+	.B \-c
30	+	Test that files are character specials.
31	+	.TP
32	+	.B \-d
33	+	Test that files are directories.
34	+	.TP
35	+	.B \-e
36	+	Test that files exist.
37	+	.TP
38	+	.B \-f
39	+	Test that files are regular files.
40	+	.TP
41	+	.B \-g
42	+	Test that files have their set-group-ID flag set.
43	+	.TP
44	+	.B \-h
45	+	Test that files are symbolic links.
46	+	.TP
47	+	.BI \-n " file"
48	+	Test that files are newer than
49	+	.IR file .
50	+	.TP
51	+	.BI \-o " file"
52	+	Test that files are older than
53	+	.IR file .
54	+	.TP
55	+	.B \-p
56	+	Test that files are named pipes.
57	+	.TP
58	+	.B \-q
59	+	No files are printed, only the exit status is returned.
60	+	.TP
61	+	.B \-r
62	+	Test that files are readable.
63	+	.TP
64	+	.B \-s
65	+	Test that files are not empty.
66	+	.TP
67	+	.B \-u
68	+	Test that files have their set-user-ID flag set.
69	+	.TP
70	+	.B \-w
71	+	Test that files are writable.
72	+	.TP
73	+	.B \-x
74	+	Test that files are executable.
75	+	.SH EXIT STATUS
76	+	.TP
77	+	.B 0
78	+	At least one file passed all tests.
79	+	.TP
80	+	.B 1
81	+	No files passed all tests.
82	+	.TP
83	+	.B 2
84	+	An error occurred.
85	+	.SH SEE ALSO
86	+	.IR dmenu (1),
87	+	.IR test (1)

stest.c (added) +85 −0

1	+	/* See LICENSE file for copyright and license details. */
2	+	#include <stdbool.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 OPER(x) (oper[(x)-'a'])
10	+
11	+	static bool test(const char *);
12	+
13	+	static bool quiet = false;
14	+	static bool oper[26];
15	+	static struct stat old, new;
16	+
17	+	int
18	+	main(int argc, char *argv[]) {
19	+	char buf[BUFSIZ], *p;
20	+	bool match = false;
21	+	int opt;
22	+
23	+	while((opt = getopt(argc, argv, "C:bcdefghn:o:pqrsuwx")) != -1)
24	+	switch(opt) {
25	+	case 'C': /* tests relative to directory */
26	+	if(chdir(optarg) == -1) {
27	+	perror(optarg);
28	+	exit(2);
29	+	}
30	+	break;
31	+	case 'n': /* newer than file */
32	+	case 'o': /* older than file */
33	+	if(!(OPER(opt) = stat(optarg, (opt == 'n' ? &new : &old)) == 0))
34	+	perror(optarg);
35	+	break;
36	+	case 'q': /* quiet (no output, just status) */
37	+	quiet = true;
38	+	break;
39	+	default: /* miscellaneous operators */
40	+	OPER(opt) = true;
41	+	break;
42	+	case '?': /* error: unknown flag */
43	+	fprintf(stderr, "usage: %s [-bcdefghpqrsuwx] [-C dir] [-n file] [-o file] [file...]\n", argv[0]);
44	+	exit(2);
45	+	}
46	+	if(optind == argc)
47	+	while(fgets(buf, sizeof buf, stdin)) {
48	+	if(*(p = &buf[strlen(buf)-1]) == '\n')
49	+	*p = '\0';
50	+	match \|= test(buf);
51	+	}
52	+	else
53	+	while(optind < argc)
54	+	match \|= test(argv[optind++]);
55	+
56	+	return match ? 0 : 1;
57	+	}
58	+
59	+	bool
60	+	test(const char *path) {
61	+	struct stat st;
62	+
63	+	if((!OPER('b') \|\| (stat(path, &st) == 0 && S_ISBLK(st.st_mode))) /* block special */
64	+	&& (!OPER('c') \|\| (stat(path, &st) == 0 && S_ISCHR(st.st_mode))) /* character special */
65	+	&& (!OPER('d') \|\| (stat(path, &st) == 0 && S_ISDIR(st.st_mode))) /* directory */
66	+	&& (!OPER('e') \|\| (access(path, F_OK) == 0)) /* exists */
67	+	&& (!OPER('f') \|\| (stat(path, &st) == 0 && S_ISREG(st.st_mode))) /* regular file */
68	+	&& (!OPER('g') \|\| (stat(path, &st) == 0 && (st.st_mode & S_ISGID))) /* set-group-id flag */
69	+	&& (!OPER('h') \|\| (lstat(path, &st) == 0 && S_ISLNK(st.st_mode))) /* symbolic link */
70	+	&& (!OPER('n') \|\| (stat(path, &st) == 0 && st.st_mtime > new.st_mtime)) /* newer than file */
71	+	&& (!OPER('o') \|\| (stat(path, &st) == 0 && st.st_mtime < old.st_mtime)) /* older than file */
72	+	&& (!OPER('p') \|\| (stat(path, &st) == 0 && S_ISFIFO(st.st_mode))) /* named pipe */
73	+	&& (!OPER('r') \|\| (access(path, R_OK) == 0)) /* readable */
74	+	&& (!OPER('s') \|\| (stat(path, &st) == 0 && st.st_size > 0)) /* not empty */
75	+	&& (!OPER('u') \|\| (stat(path, &st) == 0 && (st.st_mode & S_ISUID))) /* set-user-id flag */
76	+	&& (!OPER('w') \|\| (access(path, W_OK) == 0)) /* writable */
77	+	&& (!OPER('x') \|\| (access(path, X_OK) == 0))) { /* executable */
78	+	if(quiet)
79	+	exit(0);
80	+	puts(path);
81	+	return true;
82	+	}
83	+	else
84	+	return false;
85	+	}

3	3
4	4		include config.mk
5	5
6		-	SRC = dmenu.c draw.c lsx.c
	6	+	SRC = dmenu.c draw.c stest.c
7	7		OBJ = ${SRC:.c=.o}
8	8
9		-	all: options dmenu lsx
	9	+	all: options dmenu stest
10	10
11	11		options:
12	12		@echo dmenu build options:

24	24		@echo CC -o $@
25	25		@${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
26	26
27		-	lsx: lsx.o
	27	+	stest: stest.o
28	28		@echo CC -o $@
29		-	@${CC} -o $@ lsx.o ${LDFLAGS}
	29	+	@${CC} -o $@ stest.o ${LDFLAGS}
30	30
31	31		clean:
32	32		@echo cleaning
33		-	@rm -f dmenu lsx ${OBJ} dmenu-${VERSION}.tar.gz
	33	+	@rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz
34	34
35	35		dist: clean
36	36		@echo creating dist tarball
37	37		@mkdir -p dmenu-${VERSION}
38		-	@cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run lsx.1 ${SRC} dmenu-${VERSION}
	38	+	@cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run stest.1 ${SRC} dmenu-${VERSION}
39	39		@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
40	40		@gzip dmenu-${VERSION}.tar
41	41		@rm -rf dmenu-${VERSION}

43	43		install: all
44	44		@echo installing executables to ${DESTDIR}${PREFIX}/bin
45	45		@mkdir -p ${DESTDIR}${PREFIX}/bin
46		-	@cp -f dmenu dmenu_run lsx ${DESTDIR}${PREFIX}/bin
	46	+	@cp -f dmenu dmenu_run stest ${DESTDIR}${PREFIX}/bin
47	47		@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
48	48		@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
49		-	@chmod 755 ${DESTDIR}${PREFIX}/bin/lsx
	49	+	@chmod 755 ${DESTDIR}${PREFIX}/bin/stest
50	50		@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
51	51		@mkdir -p ${DESTDIR}${MANPREFIX}/man1
52	52		@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
53		-	@sed "s/VERSION/${VERSION}/g" < lsx.1 > ${DESTDIR}${MANPREFIX}/man1/lsx.1
	53	+	@sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1
54	54		@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
55		-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/lsx.1
	55	+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
56	56
57	57		uninstall:
58	58		@echo removing executables from ${DESTDIR}${PREFIX}/bin
59	59		@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
60	60		@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
61		-	@rm -f ${DESTDIR}${PREFIX}/bin/lsx
	61	+	@rm -f ${DESTDIR}${PREFIX}/bin/stest
62	62		@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
63	63		@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
64		-	@rm -f ${DESTDIR}${MANPREFIX}/man1/lsx.1
	64	+	@rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
65	65
66	66		.PHONY: all options clean dist install uninstall

17	17		LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
18	18
19	19		# flags
20		-	CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
	20	+	CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
21	21		CFLAGS = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
22	22		LDFLAGS = -s ${LIBS}
23	23

5	5		fi
6	6		(
7	7		IFS=:
8		-	if [ "`ls -dt $PATH "$CACHE" \| head -n 1`" != "$CACHE" ]; then
9		-	lsx $PATH \| sort -u > "$CACHE"
	8	+	if ls -d $PATH \| stest -q -n "$CACHE"; then
	9	+	for dir in $PATH; do
	10	+	ls $dir \| stest -C $dir -fx
	11	+	done \| sort -u > "$CACHE"
10	12		fi
11	13		)
12	14		cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"

1	-	.TH LSX 1 dmenu\-VERSION
2	-	.SH NAME
3	-	lsx \- list executables
4	-	.SH SYNOPSIS
5	-	.B lsx
6	-	.RI [ directory ...]
7	-	.SH DESCRIPTION
8	-	.B lsx
9	-	lists the executables in each
10	-	.IR directory .
11	-	If none are given the current working directory is used.

1	-	/* See LICENSE file for copyright and license details. */
2	-	#include <dirent.h>
3	-	#include <errno.h>
4	-	#include <limits.h>
5	-	#include <stdio.h>
6	-	#include <stdlib.h>
7	-	#include <unistd.h>
8	-	#include <sys/stat.h>
9	-
10	-	static void lsx(const char *dir);
11	-
12	-	static int status = EXIT_SUCCESS;
13	-
14	-	int
15	-	main(int argc, char *argv[]) {
16	-	int i;
17	-
18	-	if(argc < 2)
19	-	lsx(".");
20	-	else for(i = 1; i < argc; i++)
21	-	lsx(argv[i]);
22	-	return status;
23	-	}
24	-
25	-	void
26	-	lsx(const char *dir) {
27	-	char buf[PATH_MAX];
28	-	struct dirent *d;
29	-	struct stat st;
30	-	DIR *dp;
31	-
32	-	for(dp = opendir(dir); dp && (d = readdir(dp)); errno = 0)
33	-	if(snprintf(buf, sizeof buf, "%s/%s", dir, d->d_name) < (int)sizeof buf
34	-	&& access(buf, X_OK) == 0 && stat(buf, &st) == 0 && S_ISREG(st.st_mode))
35	-	puts(d->d_name);
36	-
37	-	if(errno != 0) {
38	-	status = EXIT_FAILURE;
39	-	perror(dir);
40	-	}
41	-	if(dp)
42	-	closedir(dp);
43	-	}