rp

commit d6b9c4355d3a6e4cd4d1e0f58ad3b26d10144728
parent 7ce4bcd5c0f2d453090114d05796eab853b37316
Author: parazyd <parazyd@dyne.org>
Date:   Thu,  1 Mar 2018 00:24:05 +0100

Simplify printouts.

Diffstat:
M
headers.c
 | 
3
+--
M
ind.c
 | 
39
+++++++++++++++++++--------------------
M
ind.h
 | 
3
+--
M
rohrpost.c
 | 
3
+--
M
sieve.c
 | 
12
++++++------

5 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/headers.c b/headers.c
@@ -14,8 +14,7 @@
 char *argv0;
 
 void headersusage(void) {
-	einfo("usage: %s [header [header [...]]]\n", argv0);
-	exit(1);
+	die("usage: %s [header [header [...]]]\n", argv0);
 }
 
 int headersmain(int argc, char *argv[]) {
diff --git a/ind.c b/ind.c
@@ -1,33 +1,32 @@
 /*
- * Copy me if you can.
+ * Copy me if you can
  * by parazyd
  */
 
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 void edie(char *fmt, ...) {
-    va_list fmtargs;
-    va_start(fmtargs, fmt);
-    fprintf(stderr, " \033[31m*\033[0m ");
-    vfprintf(stderr, fmt, fmtargs);
-    va_end(fmtargs);
-    exit(1);
-}
+	va_list fmtargs;
+
+	va_start(fmtargs, fmt);
+	vfprintf(stderr, fmt, fmtargs);
+	va_end(fmtargs);
+	fprintf(stderr, ": ");
+
+	perror(NULL);
 
-void einfo(char *fmt, ...) {
-    va_list fmtargs;
-    va_start(fmtargs, fmt);
-    fprintf(stderr, " \033[32m*\033[0m ");
-    vfprintf(stderr, fmt, fmtargs);
-    va_end(fmtargs);
+	exit(1);
 }
 
-void ewarn(char *fmt, ...) {
-    va_list fmtargs;
-    va_start(fmtargs, fmt);
-    fprintf(stderr, " \033[33m*\033[0m ");
-    vfprintf(stderr, fmt, fmtargs);
-    va_end(fmtargs);
+void die(char *fmt, ...) {
+	va_list fmtargs;
+
+	va_start(fmtargs, fmt);
+	vfprintf(stderr, fmt, fmtargs);
+	va_end(fmtargs);
+
+	exit(1);
 }
diff --git a/ind.h b/ind.h
@@ -11,7 +11,6 @@
 #define nelem(x) (sizeof(x) / sizeof((x)[0]))
 
 void edie(char *fmt, ...);
-void einfo(char *fmt, ...);
-void ewarn(char *fmt, ...);
+void die(char *fmt, ...);
 
 #endif
diff --git a/rohrpost.c b/rohrpost.c
@@ -15,8 +15,7 @@
 char *argv0;
 
 void usage(void) {
-	einfo("usage: %s cmd [args]", argv0);
-	exit(1);
+	die("usage: %s cmd [args]", argv0);
 }
 
 struct command {
diff --git a/sieve.c b/sieve.c
@@ -11,7 +11,6 @@
 
 char *argv0;
 
-
 int gento(char *line) {
 	char *type, *email, *what, *mbox;
 
@@ -30,7 +29,7 @@ int gento(char *line) {
 	printf("if header :contains [ \"To\",\"Cc\" ]  \"%s\"", email);
 	printf(" { fileinto :create \"%s\"; stop; }\n", mbox);
 
-	einfo("to: %s -> %s\n", email, mbox);
+	fprintf(stderr, "to: %s -> %s\n", email, mbox);
 
 	return 0;
 }
@@ -53,7 +52,7 @@ int genfrom(char *line) {
 	printf("if header :contains \"From\" \"%s\"", email);
 	printf(" { fileinto :create \"%s\"; stop; }\n", mbox);
 
-	einfo("from: %s -> %s\n", email, mbox);
+	fprintf(stderr, "from: %s -> %s\n", email, mbox);
 
 	return 0;
 }
@@ -68,7 +67,7 @@ int genabook(char *line) {
 	printf("if header :contains \"From\" \"%s\"", email);
 	printf(" { fileinto :create \"INBOX\"; stop; }\n");
 
-	einfo("from: %s -> INBOX\n", email);
+	fprintf(stderr, "from: %s -> INBOX\n", email);
 
 	return 0;
 }
@@ -82,11 +81,12 @@ int sievemain(int argc, char *argv[]) {
 		strtok(l, "\n");
 		if (!strncmp("to", l, 2)) {
 			if (gento(l))
-				ewarn("invalid line: %d\n", c);
+				fprintf(stderr, "\033[33m * invalid line: %d\033[0m\n", c);
 		}
 		else if (!strncmp("from", l, 4)) {
 			if (genfrom(l))
-				ewarn("invalid line: %d\n", c);
+				fprintf(stderr, "\033[33m * invalid line: %d\033[0m\n", c);
+
 		}
 		else if (!strncmp("email=", l, 6)) {
 			genabook(l);