X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/32ef0f5662bfe8b8891ba6341d3a27818fb55508..1c242df1244af10cf5d2c2640ac0d2a7ad1ad878:/stest.c

diff --git a/stest.c b/stest.c
index b4dba64..8fac42a 100644
--- a/stest.c
+++ b/stest.c
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -17,11 +18,11 @@ static struct stat old, new;
 int
 main(int argc, char *argv[]) {
 	struct dirent *d;
-	char buf[BUFSIZ];
+	char buf[BUFSIZ], *p;
 	DIR *dir;
 	int opt;
 
-	while((opt = getopt(argc, argv, "abcdefghln:o:pqrsuwx")) != -1)
+	while((opt = getopt(argc, argv, "abcdefghln:o:pqrsuvwx")) != -1)
 		switch(opt) {
 		case 'n': /* newer than file */
 		case 'o': /* older than file */
@@ -32,9 +33,15 @@ main(int argc, char *argv[]) {
 			FLAG(opt) = true;
 			break;
 		case '?': /* error: unknown flag */
-			fprintf(stderr, "usage: %s [-abcdefghlpqrsuwx] [-n file] [-o file] [file...]\n", argv[0]);
+			fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] [-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 */
@@ -53,7 +60,7 @@ void
 test(const char *path, const char *name) {
 	struct stat st, ln;
 
-	if(!stat(path, &st) && (FLAG('a') || name[0] != '.')          /* hidden files      */
+	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         */
@@ -68,7 +75,7 @@ test(const char *path, const char *name) {
 	&& (!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        */
+	&& (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) {   /* executable        */
 		if(FLAG('q'))
 			exit(0);
 		match = true;