Add support for batch mode.

[nmh] / uip / mhical.c

diff --git a/uip/mhical.c b/uip/mhical.c
index d62fce95d7049b4e37f17611cd913cdb46e28370..561935bfa4380557fc41d9f382345586672d794c 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -11,6 +11,7 @@
 #include <h/fmt_scan.h>
 #include "h/addrsbr.h"
 #include "h/mts.h"
 #include <h/fmt_scan.h>
 #include "h/addrsbr.h"
 #include "h/mts.h"

+#include "h/done.h"

 #include "h/utils.h"
 #include <time.h>
 
 #include "h/utils.h"
 #include <time.h>
 


@@ -59,7 +60,8 @@ vevent vevents = { NULL, NULL, NULL};
 int parser_status = 0;
 
 int
 int parser_status = 0;
 
 int

-main (int argc, char *argv[]) {
+main (int argc, char *argv[])
+{

     /* RFC 5322 § 3.3 date-time format, including the optional
        day-of-week and not including the optional seconds.  The
        zone is required by the RFC but not always output by this
     /* RFC 5322 § 3.3 date-time format, including the optional
        day-of-week and not including the optional seconds.  The
        zone is required by the RFC but not always output by this


@@ -69,14 +71,15 @@ main (int argc, char *argv[]) {
     act action = ACT_NONE;
     char *infile = NULL, *outfile = NULL;
     FILE *inputfile = NULL, *outputfile = NULL;
     act action = ACT_NONE;
     char *infile = NULL, *outfile = NULL;
     FILE *inputfile = NULL, *outputfile = NULL;

-    int contenttype = 0, unfold = 0;
+    bool contenttype = false;
+    bool unfold = false;

     vevent *v, *nextvevent;
     char *form = "mhical.24hour", *format = NULL;
     char **argp, **arguments, *cp;
 
     icaldebug = 0;  /* Global provided by bison (with name-prefix "ical"). */
 
     vevent *v, *nextvevent;
     char *form = "mhical.24hour", *format = NULL;
     char **argp, **arguments, *cp;
 
     icaldebug = 0;  /* Global provided by bison (with name-prefix "ical"). */
 

-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -91,7 +94,7 @@ main (int argc, char *argv[]) {
                 ambigsw (cp, switches);
                 done (1);
             case UNKWNSW:
                 ambigsw (cp, switches);
                 done (1);
             case UNKWNSW:

-                adios (NULL, "-%s unknown", cp);
+                die("-%s unknown", cp);

 
             case HELPSW: {
                 char buf[128];
 
             case HELPSW: {
                 char buf[128];


@@ -108,7 +111,7 @@ main (int argc, char *argv[]) {
 
             case REPLYSW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))
 
             case REPLYSW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 if (! strcasecmp (cp, "accept")) {
                     action = ACT_ACCEPT;
                 } else if (! strcasecmp (cp, "decline")) {
                 if (! strcasecmp (cp, "accept")) {
                     action = ACT_ACCEPT;
                 } else if (! strcasecmp (cp, "decline")) {


@@ -118,7 +121,7 @@ main (int argc, char *argv[]) {
                 } else if (! strcasecmp (cp, "delegate")) {
                     action = ACT_DELEGATE;
                 } else {
                 } else if (! strcasecmp (cp, "delegate")) {
                     action = ACT_DELEGATE;
                 } else {

-                    adios (NULL, "Unknown action: %s", cp);
+                    die("Unknown action: %s", cp);

                 }
                 continue;
 
                 }
                 continue;
 


@@ -128,35 +131,35 @@ main (int argc, char *argv[]) {
 
             case FORMSW:
                 if (! (form = *argp++) || *form == '-')
 
             case FORMSW:
                 if (! (form = *argp++) || *form == '-')

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 format = NULL;
                 continue;
             case FMTSW:
                 if (! (format = *argp++) || *format == '-')
                 format = NULL;
                 continue;
             case FMTSW:
                 if (! (format = *argp++) || *format == '-')

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 form = NULL;
                 continue;
 
             case INFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))
                 form = NULL;
                 continue;
 
             case INFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 infile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
             case OUTFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))
                 infile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
             case OUTFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))

-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);

                 outfile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
 
             case CONTENTTYPESW:
                 outfile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
 
             case CONTENTTYPESW:

-                contenttype = 1;
+                contenttype = true;

                 continue;
             case NCONTENTTYPESW:
                 continue;
             case NCONTENTTYPESW:

-                contenttype = 0;
+                contenttype = false;

                 continue;
 
             case UNFOLDSW:
                 continue;
 
             case UNFOLDSW:

-                unfold = 1;
+                unfold = true;

                 continue;
             }
         }
                 continue;
             }
         }


@@ -255,9 +258,10 @@ main (int argc, char *argv[]) {
  * - Excise VALARM sections.
  */
 static void
  * - Excise VALARM sections.
  */
 static void

-convert_to_reply (contentline *clines, act action) {
+convert_to_reply (contentline *clines, act action)
+{

     char *partstat = NULL;
     char *partstat = NULL;

-    int found_my_attendee_line = 0;
+    bool found_my_attendee_line = false;

     contentline *node;
 
     convert_common (clines, action);
     contentline *node;
 
     convert_common (clines, action);


@@ -301,7 +305,7 @@ convert_to_reply (contentline *clines, act action) {
             while (getname ("")) { continue; }
 
             if (ismymbox (mn)) {
             while (getname ("")) { continue; }
 
             if (ismymbox (mn)) {

-                found_my_attendee_line = 1;
+                found_my_attendee_line = true;

                 for (p = node->params; p && p->param_name; p = p->next) {
                     value_list *v;
 
                 for (p = node->params; p && p->param_name; p = p->next) {
                     value_list *v;
 


@@ -361,7 +365,8 @@ convert_to_reply (contentline *clines, act action) {
  * - Excise VALARM sections.
  */
 static void
  * - Excise VALARM sections.
  */
 static void

-convert_to_cancellation (contentline *clines) {
+convert_to_cancellation (contentline *clines)
+{

     contentline *node;
 
     convert_common (clines, ACT_CANCEL);
     contentline *node;
 
     convert_common (clines, ACT_CANCEL);


@@ -383,9 +388,10 @@ convert_to_cancellation (contentline *clines) {
 }
 
 static void
 }
 
 static void

-convert_common (contentline *clines, act action) {
+convert_common (contentline *clines, act action)
+{

     contentline *node;
     contentline *node;

-    int in_valarm;
+    bool in_valarm;

 
     if ((node = find_contentline (clines, "METHOD", 0))) {
         free (node->value);
 
     if ((node = find_contentline (clines, "METHOD", 0))) {
         free (node->value);


@@ -425,7 +431,7 @@ convert_common (contentline *clines, act action) {
             insert = "Tentative: ";
             break;
         case ACT_DELEGATE:
             insert = "Tentative: ";
             break;
         case ACT_DELEGATE:

-            adios (NULL, "Delegate replies are not supported");
+            die("Delegate replies are not supported");

             break;
         case ACT_CANCEL:
             insert = "Cancelled:";
             break;
         case ACT_CANCEL:
             insert = "Cancelled:";


@@ -444,7 +450,7 @@ convert_common (contentline *clines, act action) {
             node->value = tmp;
         } else {
             /* Should never get here. */
             node->value = tmp;
         } else {
             /* Should never get here. */

-            adios (NULL, "Unknown action: %d", action);
+            die("Unknown action: %d", action);

         }
     }
 
         }
     }
 


@@ -469,7 +475,7 @@ convert_common (contentline *clines, act action) {
     }
 
     /* Excise X- lines and VALARM section(s). */
     }
 
     /* Excise X- lines and VALARM section(s). */

-    in_valarm = 0;
+    in_valarm = false;

     for (node = clines; node; node = node->next) {
         /* node->name will be NULL if the line was deleted. */
         if (! node->name) { continue; }
     for (node = clines; node; node = node->next) {
         /* node->name will be NULL if the line was deleted. */
         if (! node->name) { continue; }


@@ -477,13 +483,13 @@ convert_common (contentline *clines, act action) {
         if (in_valarm) {
             if (! strcasecmp ("END", node->name)  &&
                 ! strcasecmp ("VALARM", node->value)) {
         if (in_valarm) {
             if (! strcasecmp ("END", node->name)  &&
                 ! strcasecmp ("VALARM", node->value)) {

-                in_valarm = 0;
+                in_valarm = false;

             }
             remove_contentline (node);
         } else {
             if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("VALARM", node->value)) {
             }
             remove_contentline (node);
         } else {
             if (! strcasecmp ("BEGIN", node->name)  &&
                 ! strcasecmp ("VALARM", node->value)) {

-                in_valarm = 1;
+                in_valarm = true;

                 remove_contentline (node);
             } else if (! strncasecmp ("X-", node->name, 2)) {
                 remove_contentline (node);
                 remove_contentline (node);
             } else if (! strncasecmp ("X-", node->name, 2)) {
                 remove_contentline (node);


@@ -494,7 +500,8 @@ convert_common (contentline *clines, act action) {
 
 /* Echo the input, but with unfolded lines. */
 static void
 
 /* Echo the input, but with unfolded lines. */
 static void

-dump_unfolded (FILE *file, contentline *clines) {
+dump_unfolded (FILE *file, contentline *clines)
+{

     contentline *node;
 
     for (node = clines; node; node = node->next) {
     contentline *node;
 
     for (node = clines; node; node = node->next) {


@@ -503,7 +510,8 @@ dump_unfolded (FILE *file, contentline *clines) {
 }
 
 static void
 }
 
 static void

-output (FILE *file, contentline *clines, int contenttype) {
+output (FILE *file, contentline *clines, int contenttype)
+{

     contentline *node;
 
     if (contenttype) {
     contentline *node;
 
     if (contenttype) {


@@ -556,10 +564,11 @@ output (FILE *file, contentline *clines, int contenttype) {
  *   - attendees (limited to number specified in initialization)
  */
 static void
  *   - attendees (limited to number specified in initialization)
  */
 static void

-display (FILE *file, contentline *clines, char *nfs) {
+display (FILE *file, contentline *clines, char *nfs)
+{

     tzdesc_t timezones = load_timezones (clines);
     tzdesc_t timezones = load_timezones (clines);

-    int in_vtimezone;
-    int in_valarm;
+    bool in_vtimezone;
+    bool in_valarm;

     contentline *node;
     struct format *fmt;
     int dat[5] = { 0, 0, 0, INT_MAX, 0 };
     contentline *node;
     struct format *fmt;
     int dat[5] = { 0, 0, 0, INT_MAX, 0 };


@@ -594,7 +603,7 @@ display (FILE *file, contentline *clines, char *nfs) {
     }
 
     /* Only display DESCRIPTION lines that are outside VALARM section(s). */
     }
 
     /* Only display DESCRIPTION lines that are outside VALARM section(s). */

-    in_valarm = 0;
+    in_valarm = false;

     if ((c = fmt_findcomp ("description"))) {
         for (node = clines; node; node = node->next) {
             /* node->name will be NULL if the line was deleted. */
     if ((c = fmt_findcomp ("description"))) {
         for (node = clines; node; node = node->next) {
             /* node->name will be NULL if the line was deleted. */


@@ -605,12 +614,12 @@ display (FILE *file, contentline *clines, char *nfs) {
             } else if (in_valarm) {
                 if (! strcasecmp ("END", node->name)  &&
                     ! strcasecmp ("VALARM", node->value)) {
             } else if (in_valarm) {
                 if (! strcasecmp ("END", node->name)  &&
                     ! strcasecmp ("VALARM", node->value)) {

-                    in_valarm = 0;
+                    in_valarm = false;

                 }
             } else {
                 if (! strcasecmp ("BEGIN", node->name)  &&
                     ! strcasecmp ("VALARM", node->value)) {
                 }
             } else {
                 if (! strcasecmp ("BEGIN", node->name)  &&
                     ! strcasecmp ("VALARM", node->value)) {

-                    in_valarm = 1;
+                    in_valarm = true;

                 }
             }
         }
                 }
             }
         }


@@ -625,7 +634,7 @@ display (FILE *file, contentline *clines, char *nfs) {
 
     if ((c = fmt_findcomp ("dtstart"))) {
         /* Find DTSTART outsize of a VTIMEZONE section. */
 
     if ((c = fmt_findcomp ("dtstart"))) {
         /* Find DTSTART outsize of a VTIMEZONE section. */

-        in_vtimezone = 0;
+        in_vtimezone = false;

         for (node = clines; node; node = node->next) {
             /* node->name will be NULL if the line was deleted. */
             if (! node->name) { continue; }
         for (node = clines; node; node = node->next) {
             /* node->name will be NULL if the line was deleted. */
             if (! node->name) { continue; }


@@ -633,12 +642,12 @@ display (FILE *file, contentline *clines, char *nfs) {
             if (in_vtimezone) {
                 if (! strcasecmp ("END", node->name)  &&
                     ! strcasecmp ("VTIMEZONE", node->value)) {
             if (in_vtimezone) {
                 if (! strcasecmp ("END", node->name)  &&
                     ! strcasecmp ("VTIMEZONE", node->value)) {

-                    in_vtimezone = 0;
+                    in_vtimezone = false;

                 }
             } else {
                 if (! strcasecmp ("BEGIN", node->name)  &&
                     ! strcasecmp ("VTIMEZONE", node->value)) {
                 }
             } else {
                 if (! strcasecmp ("BEGIN", node->name)  &&
                     ! strcasecmp ("VTIMEZONE", node->value)) {

-                    in_vtimezone = 1;
+                    in_vtimezone = true;

                 } else if (! strcasecmp ("DTSTART", node->name)) {
                     /* Got it:  DTSTART outside of a VTIMEZONE section. */
                     char *datetime = format_datetime (timezones, node);
                 } else if (! strcasecmp ("DTSTART", node->name)) {
                     /* Got it:  DTSTART outside of a VTIMEZONE section. */
                     char *datetime = format_datetime (timezones, node);


@@ -725,7 +734,8 @@ display (FILE *file, contentline *clines, char *nfs) {
 }
 
 static const char *
 }
 
 static const char *

-identity (const contentline *node) {
+identity (const contentline *node)
+{

     /* According to RFC 5545 § 3.3.3, an email address in the value
        must be a mailto URI. */
     if (! strncasecmp (node->value, "mailto:", 7)) {
     /* According to RFC 5545 § 3.3.3, an email address in the value
        must be a mailto URI. */
     if (! strncasecmp (node->value, "mailto:", 7)) {


@@ -755,7 +765,8 @@ identity (const contentline *node) {
 }
 
 static char *
 }
 
 static char *

-format_params (char *line, param_list *p) {
+format_params (char *line, param_list *p)
+{

     for ( ; p && p->param_name; p = p->next) {
         value_list *v;
         size_t num_values = 0;
     for ( ; p && p->param_name; p = p->next) {
         value_list *v;
         size_t num_values = 0;


@@ -788,7 +799,8 @@ format_params (char *line, param_list *p) {
 }
 
 static char *
 }
 
 static char *

-fold (char *line, int uses_cr) {
+fold (char *line, int uses_cr)
+{

     size_t remaining = strlen (line);
     size_t current_line_len = 0;
     charstring_t folded_line = charstring_create (2 * remaining);
     size_t remaining = strlen (line);
     size_t current_line_len = 0;
     charstring_t folded_line = charstring_create (2 * remaining);