#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
- { "noverbose", 0 },
-#define CONTENTIDSW 2
- { "contentid", 0 },
-#define NCONTENTIDSW 3
- { "nocontentid", 0 },
-#define VERSIONSW 4
- { "version", 0 },
-#define HELPSW 5
+ { "noverbose", 2 },
+#define VERSIONSW 2
+ { "Version", 0 },
+#define HELPSW 3
{ "help", 0 },
-#define DEBUGSW 6
+#define DEBUGSW 4
{ "debug", -5 },
{ NULL, 0 }
};
int debugsw = 0;
int verbosw = 0;
-int contentidsw = 1;
-
/*
** Temporary files
*/
done = unlink_done;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
print_version(invo_name);
done(1);
- case CONTENTIDSW:
- contentidsw = 1;
- continue;
- case NCONTENTIDSW:
- contentidsw = 0;
- continue;
-
case VERBSW:
verbosw++;
continue;
add_header(ct, np, vp);
/*
- ** output the Content-ID, unless disabled by -nocontentid
+ ** output the Content-ID
*/
- if (contentidsw && ct->c_id) {
+ if (ct->c_id) {
np = getcpy(ID_FIELD);
vp = concat(" ", ct->c_id, NULL);
add_header(ct, np, vp);