A cleanup, and possibly some controversy: I've replaced

[nmh] / uip / mhical.c

diff --git a/uip/mhical.c b/uip/mhical.c
index 324d4b636abc367e967a12731163b7b97751b9f0..573d7cf41c31a6059faee04efdbfbf814f69150c 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -76,7 +76,7 @@ main (int argc, char *argv[]) {
 
     icaldebug = 0;  /* Global provided by bison (with name-prefix "ical"). */
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -140,12 +140,12 @@ main (int argc, char *argv[]) {
             case INFILESW:
                 if (! (cp = *argp++) || (*cp == '-' && cp[1]))
                     adios (NULL, "missing argument to %s", argp[-2]);
-                infile = *cp == '-'  ?  add (cp, NULL)  :  path (cp, TFILE);
+                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]);
-                outfile = *cp == '-'  ?  add (cp, NULL)  :  path (cp, TFILE);
+                outfile = *cp == '-'  ?  mh_xstrdup(cp)  :  path (cp, TFILE);
                 continue;
 
             case CONTENTTYPESW:
@@ -665,7 +665,7 @@ display (FILE *file, contentline *clines, char *nfs) {
                 char *datetime;
                 contentline node_copy;
 
-                memcpy(&node_copy, node, sizeof node_copy);
+                node_copy = *node;
                 node_copy.value = concat(node_copy.value, "T235959", NULL);
                 datetime = format_datetime (timezones, &node_copy);
                 c->c_text = datetime ? datetime : strdup(node_copy.value);