commit c779a83255a27a926355a28443ed5a87c50b770a
parent e9669700f573edf50514963613f16a0c70207cd9
Author: Christoph Lohmann <20h@r-36.net>
Date: Mon, 16 Apr 2012 23:11:02 +0200
cmd.h -> arg.h and a spurious linebreak.
Diffstat:
24 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/add.c b/add.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "imap.h"
diff --git a/arg.h b/arg.h
@@ -0,0 +1,41 @@
+/*
+ * Copy me if you can.
+ * by 20h
+ */
+
+#ifndef __ARG_H__
+#define __ARG_H__
+
+extern char *argv0;
+
+#define USED(x) ((void)(x))
+
+#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
+ argv[0] && argv[0][1]\
+ && argv[0][0] == '-';\
+ argc--, argv++) {\
+ char _argc;\
+ char **_argv;\
+ if (argv[0][1] == '-' && argv[0][2] == '\0') {\
+ argv++;\
+ argc--;\
+ break;\
+ }\
+ for (argv[0]++, _argv = argv; argv[0][0];\
+ argv[0]++) {\
+ if (_argv != argv)\
+ break;\
+ _argc = argv[0][0];\
+ switch (_argc)
+
+#define ARGEND }\
+ USED(_argc);\
+ }\
+ USED(argv);\
+ USED(argc);
+
+#define EARGF(x) ((argv[1] == NULL)? ((x), abort(), (char *)0) :\
+ (argc--, argv++, argv[0]))
+
+#endif
+
diff --git a/barebone.c b/barebone.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/capability.c b/capability.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "imap.h"
diff --git a/cfg.c b/cfg.c
@@ -12,7 +12,7 @@
#include <errno.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "llist.h"
#include "cfg.h"
diff --git a/cmd.h b/cmd.h
@@ -1,41 +0,0 @@
-/*
- * Copy me if you can.
- * by 20h
- */
-
-#ifndef __CMD_H__
-#define __CMD_H__
-
-extern char *argv0;
-
-#define USED(x) ((void)(x))
-
-#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
- argv[0] && argv[0][1]\
- && argv[0][0] == '-';\
- argc--, argv++) {\
- char _argc;\
- char **_argv;\
- if (argv[0][1] == '-' && argv[0][2] == '\0') {\
- argv++;\
- argc--;\
- break;\
- }\
- for (argv[0]++, _argv = argv; argv[0][0];\
- argv[0]++) {\
- if (_argv != argv)\
- break;\
- _argc = argv[0][0];\
- switch (_argc)
-
-#define ARGEND }\
- USED(_argc);\
- }\
- USED(argv);\
- USED(argc);
-
-#define EARGF(x) ((argv[1] == NULL)? ((x), abort(), (char *)0) :\
- (argc--, argv++, argv[0]))
-
-#endif
-
diff --git a/copy.c b/copy.c
@@ -9,7 +9,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/cur.c b/cur.c
@@ -9,7 +9,7 @@
#include <stdarg.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "cur.h"
diff --git a/flag.c b/flag.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/folder.c b/folder.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/ids.c b/ids.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "imap.h"
diff --git a/inc.c b/inc.c
@@ -12,7 +12,7 @@
#include <sys/wait.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "imap.h"
diff --git a/mark.c b/mark.c
@@ -12,7 +12,7 @@
#include <errno.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "mark.h"
#include "llist.h"
diff --git a/mime.c b/mime.c
@@ -14,7 +14,7 @@
#include <time.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "mime.h"
diff --git a/part.c b/part.c
@@ -11,7 +11,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/pick.c b/pick.c
@@ -11,7 +11,7 @@
#include <ctype.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "imap.h"
diff --git a/remove.c b/remove.c
@@ -9,7 +9,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/rohrpost.c b/rohrpost.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "mark.h"
#include "cur.h"
diff --git a/scan.c b/scan.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/select.c b/select.c
@@ -9,7 +9,7 @@
#include <stdarg.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "select.h"
diff --git a/sieve.c b/sieve.c
@@ -12,7 +12,7 @@
#include <errno.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "sieve.h"
diff --git a/stats.c b/stats.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
diff --git a/txtdb.c b/txtdb.c
@@ -13,7 +13,7 @@
#include <sys/file.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "llist.h"
#include "txtdb.h"
diff --git a/view.c b/view.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "ind.h"
-#include "cmd.h"
+#include "arg.h"
#include "cfg.h"
#include "llist.h"
#include "folder.h"
@@ -49,7 +49,7 @@ view_printtextplain(mime_t *mime)
plen = 0;
hvalue = mime_decodepart(mime, &plen);
if (hvalue != NULL) {
- printf("%s\n", hvalue);
+ printf("%s", hvalue);
free(hvalue);
}
}
@@ -88,7 +88,7 @@ view_printtexthtml(mime_t *mime)
goto killlynx;
}
- printf("%s\n", decbuf);
+ printf("%s", decbuf);
free(decbuf);
free(hvalue);