X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-stat.c;h=d9f5aa115a8985ab24beaffc8cc58f50f63254e8;hb=bd21f0a1265b43ad5f05353a39db31c16826f05c;hp=4c95aa5e888c5b4aad22e22066864d59f611af63;hpb=6274fb230a7d4ee8ccd893b306541c2b13658bcc;p=zpackage

diff --git a/zpm-stat.c b/zpm-stat.c
index 4c95aa5..d9f5aa1 100644
--- a/zpm-stat.c
+++ b/zpm-stat.c
@@ -1,3 +1,5 @@
+#define _POSIX_C_SOURCE 200112L
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -58,7 +60,8 @@ char *format_string_parse(char *s, struct format_string *f) {
 	return s;
 }
 
-void stat_one(char *fmt, char *timefmt, char *filename, struct stat *buf) {
+void stat_one(char *fmt, char *timefmt, int zeroterm, char *filename, struct
+		stat *buf) {
 	struct tm *tm;
 	char timestr[1024];
 	struct format_string f;
@@ -69,6 +72,21 @@ void stat_one(char *fmt, char *timefmt, char *filename, struct stat *buf) {
 		fmt = format_string_parse(fmt, &f);
 		if (!f.found) break; /* done */
 		if (!f.flags) {
+			if (f.found == '\\') {
+				switch (*fmt) {
+					case 0:
+						continue; break;
+					case 'n':
+						putchar('\n'); break;
+					case 't':
+						putchar('\t'); break;
+					default:
+						putchar(*fmt);
+						break;
+				}
+				fmt++;
+				continue;
+			}
 			/* literal/noformat */
 			putchar(f.found); /* or whatever */
 			continue;
@@ -80,6 +98,9 @@ void stat_one(char *fmt, char *timefmt, char *filename, struct stat *buf) {
 				timestr[1023] = 0;
 				printf("%s", timestr);
 				break;
+			case 's':
+				printf("%jd", (intmax_t)buf->st_size);
+				break;
 			case 'a': /* octal mode */
 				printf("%o", (int)buf->st_mode & 07777);
 				break;
@@ -118,12 +139,28 @@ void stat_one(char *fmt, char *timefmt, char *filename, struct stat *buf) {
 				if (!gr) exit(1);
 				printf("%s", gr->gr_name);
 				break;
+			case 'n':
+				printf("%s", filename);
+				break;
+			case 'z':
+				putchar(0); break;
+			case '%':
+				putchar('%');
+				break;
 			default: /* handle unknown formatting character */
 				printf("%c", f.found);
 				break;
 		}
 	}
-	putchar('\n');
+	if (zeroterm & 2) {
+		return;
+	}
+
+	if (zeroterm & 1 ) {
+		putchar(0);
+	} else {
+		putchar('\n');
+	}
 }
 
 int main(int ac, char *av[]) {
@@ -132,8 +169,9 @@ int main(int ac, char *av[]) {
 	int errflg = 0;
 	int c;
 	int uselstat = 0;
+	int zeroterm = 0;
 
-	while ((c = getopt(ac, av, "lf:t:")) != -1) {
+	while ((c = getopt(ac, av, "lf:t:0")) != -1) {
 		switch(c) {
 			case 'f':
 				fmt = optarg;
@@ -146,6 +184,11 @@ int main(int ac, char *av[]) {
 				"Option -%c requires an operand\n", optopt);
 				errflg++;
 				break;
+			case 'z':
+				zeroterm |= 2;
+			case '0':
+				zeroterm |= 1;
+				break;
 			case 'l':
 				uselstat = 1;
 				break;
@@ -156,7 +199,7 @@ int main(int ac, char *av[]) {
 		}
 	}
 	if (errflg) {
-		fprintf(stderr, "zpm-stat [-f <format>] [-t <timefmt>]");
+		fprintf(stderr, "zpm-stat [-f <format>] [-t <timefmt>]\n");
 		exit(2);
 	}
 	for ( ; optind < ac; optind++) {
@@ -166,7 +209,7 @@ int main(int ac, char *av[]) {
 		} else {
 			stat(av[optind], &buf);
 		}
-		stat_one(fmt, timefmt, av[optind], &buf);
+		stat_one(fmt, timefmt, zeroterm, av[optind], &buf);
 	}
 	return 0;
 }