Added warning if the profile contains a post entry.

[nmh] / uip / mhical.c

diff --git a/uip/mhical.c b/uip/mhical.c
index 6cf7c0e17b14bfdf7803789011ecbd286ceaa297..078ad37ec66d11c8bad3d27a6807b689ab6584cd 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,9 +6,19 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/fmt_new.h"
+#include "sbr/getarguments.h"
+#include "sbr/concat.h"
+#include "sbr/smatch.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"

 #include "h/icalendar.h"
 #include "h/icalendar.h"

+#include "sbr/datetime.h"

 #include "sbr/icalparse.h"
 #include "sbr/icalparse.h"

-#include <h/fmt_scan.h>
+#include "h/fmt_scan.h"

 #include "h/addrsbr.h"
 #include "h/mts.h"
 #include "h/done.h"
 #include "h/addrsbr.h"
 #include "h/mts.h"
 #include "h/done.h"


@@ -24,7 +34,7 @@ typedef enum act {
     ACT_CANCEL
 } act;
 
     ACT_CANCEL
 } act;
 

-static void convert_to_reply (contentline *, act);
+static int convert_to_reply (contentline *, act, char *);

 static void convert_to_cancellation (contentline *);
 static void convert_common (contentline *, act);
 static void dump_unfolded (FILE *, contentline *);
 static void convert_to_cancellation (contentline *);
 static void convert_common (contentline *, act);
 static void dump_unfolded (FILE *, contentline *);


@@ -41,6 +51,7 @@ static char *fold (char *, int);
     X("format string", 5, FMTSW) \
     X("infile", 0, INFILESW) \
     X("outfile", 0, OUTFILESW) \
     X("format string", 5, FMTSW) \
     X("infile", 0, INFILESW) \
     X("outfile", 0, OUTFILESW) \

+    X("attendee", 0, ATTENDEESW) \

     X("contenttype", 0, CONTENTTYPESW) \
     X("nocontenttype", 0, NCONTENTTYPESW) \
     X("unfold", 0, UNFOLDSW) \
     X("contenttype", 0, CONTENTTYPESW) \
     X("nocontenttype", 0, NCONTENTTYPESW) \
     X("unfold", 0, UNFOLDSW) \


@@ -60,7 +71,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


@@ -70,7 +82,9 @@ 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;
+    char *attendee = NULL;
+    bool contenttype = false;
+    bool unfold = false;

     vevent *v, *nextvevent;
     char *form = "mhical.24hour", *format = NULL;
     char **argp, **arguments, *cp;
     vevent *v, *nextvevent;
     char *form = "mhical.24hour", *format = NULL;
     char **argp, **arguments, *cp;


@@ -149,15 +163,21 @@ main (int argc, char *argv[]) {
                 outfile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
 
                 outfile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
 

+            case ATTENDEESW:
+                if (! (cp = *argp++) || (*cp == '-' && cp[1]))
+                    die("missing argument to %s", argp[-2]);
+                attendee = cp;
+                continue;
+

             case CONTENTTYPESW:
             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;
             }
         }


@@ -213,9 +233,12 @@ main (int argc, char *argv[]) {
             if (action == ACT_CANCEL) {
                 convert_to_cancellation (v->contentlines);
             } else {
             if (action == ACT_CANCEL) {
                 convert_to_cancellation (v->contentlines);
             } else {

-                convert_to_reply (v->contentlines, action);
+                parser_status +=
+                    convert_to_reply (v->contentlines, action, attendee);
+            }
+            if (parser_status == 0) {
+                output (outputfile, v->contentlines, contenttype);

             }
             }

-            output (outputfile, v->contentlines, contenttype);

         }
 
         free_contentlines (v->contentlines);
         }
 
         free_contentlines (v->contentlines);


@@ -238,13 +261,15 @@ main (int argc, char *argv[]) {
         free (outfile);
     }
 
         free (outfile);
     }
 

-    return parser_status;
+    return parser_status > 0 ? 1 : 0;

 }
 
 /*
  * - Change METHOD from REQUEST to REPLY.
  * - Change PRODID.
 }
 
 /*
  * - Change METHOD from REQUEST to REPLY.
  * - Change PRODID.

- * - Remove all ATTENDEE lines for other users (based on ismymbox ()).
+ * - Remove all ATTENDEE lines for other users (based on ismymbox()).
+ *   If more than one address matches ismymbox(), the attendee argument,
+ *   from the -attendee switch, must be used to select one.

  * - For the user's ATTENDEE line:
  *   - Remove ROLE and RSVP parameters.
  *   - Change PARTSTAT value to indicate reply action, e.g., ACCEPTED,
  * - For the user's ATTENDEE line:
  *   - Remove ROLE and RSVP parameters.
  *   - Change PARTSTAT value to indicate reply action, e.g., ACCEPTED,


@@ -252,13 +277,13 @@ main (int argc, char *argv[]) {
  * - Insert action at beginning of SUMMARY value.
  * - Remove all X- lines.
  * - Update DTSTAMP with current timestamp.
  * - Insert action at beginning of SUMMARY value.
  * - Remove all X- lines.
  * - Update DTSTAMP with current timestamp.

- * - Remove all DESCRIPTION lines.

  * - Excise VALARM sections.
  */
  * - Excise VALARM sections.
  */

-static void
-convert_to_reply (contentline *clines, act action) {
+static int
+convert_to_reply (contentline *clines, act action, char *attendee)
+{

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

-    int found_my_attendee_line = 0;
+    unsigned int found_my_attendee_line = 0;

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


@@ -301,8 +326,9 @@ convert_to_reply (contentline *clines, act action) {
             /* Need to flush getname after use. */
             while (getname ("")) { continue; }
 
             /* Need to flush getname after use. */
             while (getname ("")) { continue; }
 

-            if (ismymbox (mn)) {
-                found_my_attendee_line = 1;
+            if (ismymbox (mn)  &&
+                (attendee == NULL || ! strcasecmp(mn->m_text, attendee))) {
+                ++found_my_attendee_line;

                 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;
 


@@ -324,7 +350,7 @@ convert_to_reply (contentline *clines, act action) {
         }
     }
 
         }
     }
 

-    if (! found_my_attendee_line) {
+    if (found_my_attendee_line == 0) {

         /* Generate and attach an ATTENDEE line for me. */
         contentline *node;
 
         /* Generate and attach an ATTENDEE line for me. */
         contentline *node;
 


@@ -339,16 +365,13 @@ convert_to_reply (contentline *clines, act action) {
             add_param_value (new_node, mh_xstrdup (getfullname ()));
             new_node->value = concat ("MAILTO:", getlocalmbox (), NULL);
         }
             add_param_value (new_node, mh_xstrdup (getfullname ()));
             new_node->value = concat ("MAILTO:", getlocalmbox (), NULL);
         }

+    } else if (found_my_attendee_line > 1) {
+        inform("Multiple attendees match your address, "
+               "re-run with -attendee switch");
+        return 1;

     }
 
     }
 

-    /* Call find_contentline () with node as argument to find multiple
-       matching contentlines. */
-    for (node = clines;
-         (node = find_contentline (node, "DESCRIPTION", 0));
-         node = node->next) {
-        /* ACCEPT, at least, replies don't seem to have DESCRIPTIONS. */
-        remove_contentline (node);
-    }
+    return 0;

 }
 
 /*
 }
 
 /*


@@ -362,7 +385,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);


@@ -384,9 +408,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);


@@ -395,7 +420,7 @@ convert_common (contentline *clines, act action) {
 
     if ((node = find_contentline (clines, "PRODID", 0))) {
         free (node->value);
 
     if ((node = find_contentline (clines, "PRODID", 0))) {
         free (node->value);

-        node->value = mh_xstrdup ("nmh mhical v0.1");
+        node->value = mh_xstrdup ("nmh mhical v0.5");

     }
 
     if ((node = find_contentline (clines, "VERSION", 0))) {
     }
 
     if ((node = find_contentline (clines, "VERSION", 0))) {


@@ -406,8 +431,8 @@ convert_common (contentline *clines, act action) {
 
         if (strcmp (node->value, "2.0")) {
             inform("supports the Version 2.0 specified by RFC 5545 "
 
         if (strcmp (node->value, "2.0")) {
             inform("supports the Version 2.0 specified by RFC 5545 "

-               "but iCalendar object has Version %s, continuing...",
-               node->value);
+                "but iCalendar object has Version %s, continuing...",
+                node->value);

             node->value = mh_xstrdup ("2.0");
         }
     }
             node->value = mh_xstrdup ("2.0");
         }
     }


@@ -470,7 +495,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; }


@@ -478,13 +503,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);


@@ -495,7 +520,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) {


@@ -504,7 +530,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) {


@@ -557,10 +584,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 };


@@ -595,7 +623,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. */


@@ -606,12 +634,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;

                 }
             }
         }
                 }
             }
         }


@@ -626,7 +654,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; }


@@ -634,12 +662,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);


@@ -726,7 +754,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)) {


@@ -756,7 +785,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;


@@ -789,7 +819,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);