inc/test-eom-align: Cut down on the flicker by re-ordering tests.

[nmh] / sbr / icalparse.y

diff --git a/sbr/icalparse.y b/sbr/icalparse.y
index 972ff983d87adea77ee24726d6c43bcf3fee33d3..f2fcc0ea863b998ff5dadc5a47b27c96c9156b04 100644 (file)
--- a/sbr/icalparse.y
+++ b/sbr/icalparse.y
@@ -1,5 +1,4 @@
-/*
- * icalparse.y -- icalendar (RFC 5545) parser
+/* icalparse.y -- icalendar (RFC 5545) parser
  *
  * This code is Copyright (c) 2014, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -39,7 +38,7 @@
 #include "h/utils.h"
 
 static char *append (contentline *, const char *, const size_t);
-static void new_input_line (contentline **);
+static void new_content_line (contentline **);
 static void new_vevent (vevent *);
 static void free_param_names (param_list *);
 static void free_param_values (value_list *);
@@ -63,7 +62,7 @@ contentline_list
     /* contentline = name *(";" param ) ":" value CRLF */
 contentline
     : ICAL_NAME {
-          new_input_line (&vevents.last->contentlines);
+          new_content_line (&vevents.last->contentlines);
           append (vevents.last->contentlines->last, $1, strlen ($1));
           vevents.last->contentlines->last->name = $1;
       } ICAL_COLON {
@@ -88,7 +87,7 @@ contentline
           }
       }
     | ICAL_NAME {
-          new_input_line (&vevents.last->contentlines);
+          new_content_line (&vevents.last->contentlines);
           append (vevents.last->contentlines->last, $1, strlen ($1));
           vevents.last->contentlines->last->name = $1;
       } param_list ICAL_COLON {
@@ -149,7 +148,7 @@ add_contentline (contentline *node, const char *name) {
     contentline *new_node;
 
     NEW0(new_node);
-    new_node->name  = strdup (name);
+    new_node->name  = mh_xstrdup (name);
     new_node->next = node->next;
     node->next = new_node;
 
@@ -177,13 +176,8 @@ find_contentline (contentline *contentlines, const char *name,
     for (node = contentlines; node; node = node->next) {
         /* node->name will be NULL if the line was "deleted". */
         if (node->name  &&  ! strcasecmp (name, node->name)) {
-            if (val  &&  node->value) {
-                if (! strcasecmp (val, node->value)) {
-                    return node;
-                }
-            } else {
+            if (!val || !node->value || !strcasecmp(val, node->value))
                 return node;
-            }
         }
     }
 
@@ -197,7 +191,7 @@ append (contentline *cline, const char *src, const size_t src_len) {
 
         while (len >= cline->input_line_size) {
             cline->input_line_size = cline->input_line_size == 0
-                ?  (BUFSIZ>=8192 ? BUFSIZ : 8192)
+                ?  NMH_BUFSIZ
                 :  2 * cline->input_line_size;
             cline->input_line =
                 mh_xrealloc (cline->input_line, cline->input_line_size);
@@ -212,7 +206,7 @@ append (contentline *cline, const char *src, const size_t src_len) {
 }
 
 static void
-new_input_line (contentline **cline) {
+new_content_line (contentline **cline) {
     contentline *new_node;
 
     NEW0(new_node);
@@ -297,6 +291,7 @@ free_contentlines (contentline *root) {
         }
         free (i->value);
         free (i->input_line);
+        charstring_free (i->unexpected);
         next = i->next;
         free (i);
     }
@@ -327,11 +322,27 @@ free_param_values (value_list *v) {
 
 static int
 icalerror (const char *error) {
+    contentline *c;
+    charstring_t context = NULL;
+
+    /* Find last chunk of unexpected text. */
+    for (c = vevents.last->contentlines; c; c = c->next) {
+        if (c->unexpected) {
+            context = c->unexpected;
+        }
+    }
+
     if (! strcmp ("syntax error, unexpected $end, expecting ICAL_NAME",
                   error)) {
         /* Empty input: produce no output. */
     } else {
-        adios (NULL, "%s", error);
+        if (context) {
+            inform ("%s after \"%s\"", error, charstring_buffer (context));
+        } else {
+            inform ("%s", error);
+        }
+        parser_status = -1;
+        return -1;
     }
 
     return 0;  /* The return value isn't used anyway. */