Alter HasSuffixC()'s char * to be const.

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 82d6db558f6116a40453b167b64334bcc4a31070..ff9c398bb7a0646cf805ba969ae11e88bda7c86e 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -4,8 +4,6 @@
  *       -- as fnext,  move to next folder with unseen messages
  *       -- as fprev,  move to previous folder with unseen messages
  *       -- as unseen, scan all unseen messages
  *       -- as fnext,  move to next folder with unseen messages
  *       -- as fprev,  move to previous folder with unseen messages
  *       -- as unseen, scan all unseen messages

- * $Id$
- *

  * This code is Copyright (c) 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -15,27 +13,31 @@
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-

 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 

-static struct swit switches[] = {
-#define MODESW 0
-    { "mode", 1 },
-#define FOLDERSSW 1
-    { "folders", 1 },
-#define VERSIONSW 2
-    { "version", 1 },
-#define HELPSW 3
-    { "help", 1 },
-    { NULL, 0 }
-};
+#define NEW_SWITCHES \
+    X("mode", 1, MODESW) \
+    X("folders", 1, FOLDERSSW) \
+    X("version", 1, VERSIONSW) \
+    X("help", 1, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(NEW);
+#undef X

 
 

-static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(NEW, switches);
+#undef X
+
+/* What to do, based on argv[0]. */
+static enum {
+    RM_NEW,
+    RM_FNEXT,
+    RM_FPREV,
+    RM_UNSEEN
+} run_mode = RM_NEW;

 
 /* check_folders uses this to maintain state with both .folders list of
  * folders and with crawl_folders. */
 
 /* check_folders uses this to maintain state with both .folders list of
  * folders and with crawl_folders. */


@@ -93,29 +95,51 @@ seq_in_list(char *name, char *sequences[])
 static char *
 get_msgnums(char *folder, char *sequences[])
 {
 static char *
 get_msgnums(char *folder, char *sequences[])
 {

-    char *seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);
-    FILE *fp = fopen(seqfile, "r");
+    char *seqfile = NULL;
+    FILE *fp;

     int state;
     char name[NAMESZ], field[BUFSIZ];
     char *cp;
     char *msgnums = NULL, *this_msgnums, *old_msgnums;
     int state;
     char name[NAMESZ], field[BUFSIZ];
     char *cp;
     char *msgnums = NULL, *this_msgnums, *old_msgnums;

+    int failed_to_lock = 0;
+    m_getfld_state_t gstate = 0;
+
+    /* copied from seq_read.c:seq_public */
+    /*
+     * If mh_seq == NULL or if *mh_seq == '\0' (the user has defined
+     * the "mh-sequences" profile entry, but left it empty),
+     * then just return, and do not initialize any public sequences.
+     */
+    if (mh_seq == NULL || *mh_seq == '\0')
+       return NULL;
+
+    /* get filename of sequence file */
+    seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);

 
 

-    /* no sequences file -> no messages */
-    if (fp == NULL) {
-        return NULL;
+    if (seqfile == NULL)
+       return NULL;
+
+    if ((fp = lkfopendata (seqfile, "r", & failed_to_lock)) == NULL) {
+
+       if (failed_to_lock) {
+           adios (seqfile, "failed to lock");
+       } else {
+           free(seqfile);
+           return NULL;
+       }

     }
 
     }
 

-    /* copied from seq_read.c:seq_public */
-    for (state = FLD;;) {
-        switch (state = m_getfld (state, name, field, sizeof(field), fp)) {
+    /* Use m_getfld to scan sequence file */
+    for (;;) {
+       int fieldsz = sizeof field;
+       switch (state = m_getfld (&gstate, name, field, &fieldsz, fp)) {

             case FLD:
             case FLDPLUS:
             case FLD:
             case FLDPLUS:

-            case FLDEOF:

                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {
                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {

-                        state = m_getfld (state, name, field,
-                                          sizeof(field), fp);
+                       fieldsz = sizeof field;
+                       state = m_getfld (&gstate, name, field, &fieldsz, fp);

                         cp = add (field, cp);
                     }
 
                         cp = add (field, cp);
                     }
 


@@ -150,12 +174,9 @@ get_msgnums(char *folder, char *sequences[])
                     }
                 }
 
                     }
                 }
 

-                if (state == FLDEOF)
-                    break;

                 continue;
 
             case BODY:
                 continue;
 
             case BODY:

-            case BODYEOF:

                 adios (NULL, "no blank lines are permitted in %s", seqfile);
                 /* fall */
 
                 adios (NULL, "no blank lines are permitted in %s", seqfile);
                 /* fall */
 


@@ -167,8 +188,11 @@ get_msgnums(char *folder, char *sequences[])
         }
         break;  /* break from for loop */
     }
         }
         break;  /* break from for loop */
     }

+    m_getfld_state_destroy (&gstate);

 
 

-    fclose(fp);
+    lkfclosedata (fp, seqfile);
+
+    free(seqfile);

 
     return msgnums;
 }
 
     return msgnums;
 }


@@ -183,9 +207,10 @@ check_folder(char *folder, size_t len, struct list_state *b)
 
     if (is_cur || msgnums != NULL) {
        if (*b->first == NULL) {
 
     if (is_cur || msgnums != NULL) {
        if (*b->first == NULL) {

-           *b->first = b->node = mh_xmalloc(sizeof(*b->node));
+           NEW(b->node);
+           *b->first = b->node;

        } else {
        } else {

-           b->node->n_next = mh_xmalloc(sizeof(*b->node));
+           NEW(b->node->n_next);

            b->node = b->node->n_next;
        }
        b->node->n_name = folder;
            b->node = b->node->n_next;
        }
        b->node->n_name = folder;


@@ -220,6 +245,8 @@ crawl_callback(char *folder, void *baton)
  * `cur' points to the name of the current folder, `folders' points to the
  * name of a .folder (if NULL, crawl all folders), and `sequences' points to
  * the array of sequences for which to look.
  * `cur' points to the name of the current folder, `folders' points to the
  * name of a .folder (if NULL, crawl all folders), and `sequences' points to
  * the array of sequences for which to look.

+ *
+ * An empty list is returned as first=last=NULL.

  */
 static void
 check_folders(struct node **first, struct node **last,
  */
 static void
 check_folders(struct node **first, struct node **last,


@@ -231,7 +258,7 @@ check_folders(struct node **first, struct node **last,
     char *line;
     size_t len;
 
     char *line;
     size_t len;
 

-    *first = *cur_node = NULL;
+    *first = *last = *cur_node = NULL;

     *maxlen = 0;
 
     b.first = first;
     *maxlen = 0;
 
     b.first = first;


@@ -241,7 +268,9 @@ check_folders(struct node **first, struct node **last,
     b.sequences = sequences;
 
     if (folders == NULL) {
     b.sequences = sequences;
 
     if (folders == NULL) {

-       chdir(m_maildir(""));
+       if (chdir(m_maildir("")) < 0) {
+           advise (m_maildir(""), "chdir");
+       }

        crawl_folders(".", crawl_callback, &b);
     } else {
        fp = fopen(folders, "r");
        crawl_folders(".", crawl_callback, &b);
     } else {
        fp = fopen(folders, "r");


@@ -251,7 +280,7 @@ check_folders(struct node **first, struct node **last,
        while (vfgets(fp, &line) == OK) {
            len = strlen(line) - 1;
            line[len] = '\0';
        while (vfgets(fp, &line) == OK) {
            len = strlen(line) - 1;
            line[len] = '\0';

-           check_folder(getcpy(line), len, &b);
+           check_folder(mh_xstrdup(line), len, &b);

        }
        fclose(fp);
     }
        }
        fclose(fp);
     }


@@ -287,8 +316,8 @@ join_sequences(char *sequences[])
 }
 
 /* Return a struct node for the folder to change to.  This is the next
 }
 
 /* Return a struct node for the folder to change to.  This is the next

- * (previous, if FPREV mode) folder with desired messages, or the current
- * folder if no folders have desired.  If NEW or UNSEEN mode, print the
+ * (previous, if RM_FPREV mode) folder with desired messages, or the current
+ * folder if no folders have desired.  If RM_NEW or RM_UNSEEN mode, print the

  * output but don't change folders.
  *
  * n_name is the folder to change to, and n_field is the string list of
  * output but don't change folders.
  *
  * n_name is the folder to change to, and n_field is the string list of


@@ -309,32 +338,36 @@ doit(char *cur, char *folders, char *sequences[])
     check_folders(&first, &last, &cur_node, &folder_len, cur,
                  folders, sequences);
 
     check_folders(&first, &last, &cur_node, &folder_len, cur,
                  folders, sequences);
 

-    if (run_mode == FNEXT || run_mode == FPREV) {
-       if (first->n_next == NULL) {
+    if (run_mode == RM_FNEXT || run_mode == RM_FPREV) {
+       if (first == NULL) {
+           /* No folders at all... */
+           return NULL;
+       }
+        if (first->n_next == NULL) {

            /* We have only one node; any desired messages in it? */
            if (first->n_field == NULL) {
                return NULL;
            /* We have only one node; any desired messages in it? */
            if (first->n_field == NULL) {
                return NULL;

-           } else {
-               return first;

            }
            }

-       } else if (cur_node == NULL) {
+            return first;
+       }
+        if (cur_node == NULL) {

            /* Current folder is not listed in .folders, return first. */
            return first;
        }
            /* Current folder is not listed in .folders, return first. */
            return first;
        }

-    } else if (run_mode == UNSEEN) {
+    } else if (run_mode == RM_UNSEEN) {

        sequences_s = join_sequences(sequences);
     }
 
     for (node = first, prev = NULL;
         node != NULL;
         prev = node, node = node->n_next) {
        sequences_s = join_sequences(sequences);
     }
 
     for (node = first, prev = NULL;
         node != NULL;
         prev = node, node = node->n_next) {

-        if (run_mode == FNEXT) {
+        if (run_mode == RM_FNEXT) {

             /* If we have a previous node and it is the current
              * folder, return this node. */
             if (prev != NULL && strcmp(prev->n_name, cur) == 0) {
                 return node;
             }
             /* If we have a previous node and it is the current
              * folder, return this node. */
             if (prev != NULL && strcmp(prev->n_name, cur) == 0) {
                 return node;
             }

-        } else if (run_mode == FPREV) {
+        } else if (run_mode == RM_FPREV) {

             if (strcmp(node->n_name, cur) == 0) {
                 /* Found current folder in fprev mode; if we have a
                  * previous node in the list, return it; else return
             if (strcmp(node->n_name, cur) == 0) {
                 /* Found current folder in fprev mode; if we have a
                  * previous node in the list, return it; else return


@@ -344,7 +377,9 @@ doit(char *cur, char *folders, char *sequences[])
                 }
                 return prev;
             }
                 }
                 return prev;
             }

-        } else if (run_mode == UNSEEN) {
+        } else if (run_mode == RM_UNSEEN) {
+            int status;
+

             if (node->n_field == NULL) {
                 continue;
             }
             if (node->n_field == NULL) {
                 continue;
             }


@@ -363,7 +398,10 @@ doit(char *cur, char *folders, char *sequences[])
            /* TODO: Split enough of scan.c out so that we can call it here. */
            command = concat("scan +", node->n_name, " ", sequences_s,
                             (void *)NULL);
            /* TODO: Split enough of scan.c out so that we can call it here. */
            command = concat("scan +", node->n_name, " ", sequences_s,
                             (void *)NULL);

-           system(command);
+           status = system(command);
+           if (! WIFEXITED (status)) {
+               adios (command, "system");
+           }

            free(command);
         } else {
             if (node->n_field == NULL) {
            free(command);
         } else {
             if (node->n_field == NULL) {


@@ -383,11 +421,14 @@ doit(char *cur, char *folders, char *sequences[])
 
     /* If we're fnext, we haven't checked the last node yet.  If it's the
      * current folder, return the first node. */
 
     /* If we're fnext, we haven't checked the last node yet.  If it's the
      * current folder, return the first node. */

-    if (run_mode == FNEXT && strcmp(last->n_name, cur) == 0) {
-        return first;
+    if (run_mode == RM_FNEXT) {
+       assert(last != NULL);
+       if (strcmp(last->n_name, cur) == 0) {
+            return first;
+       }

     }
 
     }
 

-    if (run_mode == NEW) {
+    if (run_mode == RM_NEW) {

         printf("%-*s %6d.\n", (int) folder_len, " total", total);
     }
 
         printf("%-*s %6d.\n", (int) folder_len, " total", total);
     }
 


@@ -400,18 +441,12 @@ main(int argc, char **argv)
     char **ap, *cp, **argp, **arguments;
     char help[BUFSIZ];
     char *folders = NULL;
     char **ap, *cp, **argp, **arguments;
     char help[BUFSIZ];
     char *folders = NULL;

-    char *sequences[NUMATTRS + 1];
+    svector_t sequences = svector_create (0);

     int i = 0;
     char *unseen;
     struct node *folder;
 
     int i = 0;
     char *unseen;
     struct node *folder;
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex(argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

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


@@ -432,10 +467,10 @@ main(int argc, char **argv)
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);

-               done (1);
+               done (0);

            case VERSIONSW:
                print_version(invo_name);
            case VERSIONSW:
                print_version(invo_name);

-               done (1);
+               done (0);

 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')
 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')


@@ -449,17 +484,18 @@ main(int argc, char **argv)
            }
        }
        /* have a sequence argument */
            }
        }
        /* have a sequence argument */

-       if (!seq_in_list(cp, sequences)) {
-           sequences[i++] = cp;
+       if (!seq_in_list(cp, svector_strs (sequences))) {
+           svector_push_back (sequences, cp);
+           ++i;

        }
     }
 
     if (strcmp(invo_name, "fnext") == 0) {
        }
     }
 
     if (strcmp(invo_name, "fnext") == 0) {

-        run_mode = FNEXT;
+        run_mode = RM_FNEXT;

     } else if (strcmp(invo_name, "fprev") == 0) {
     } else if (strcmp(invo_name, "fprev") == 0) {

-        run_mode = FPREV;
+        run_mode = RM_FPREV;

     } else if (strcmp(invo_name, "unseen") == 0) {
     } else if (strcmp(invo_name, "unseen") == 0) {

-        run_mode = UNSEEN;
+        run_mode = RM_UNSEEN;

     }
 
     if (folders == NULL) {
     }
 
     if (folders == NULL) {


@@ -477,18 +513,18 @@ main(int argc, char **argv)
            adios(NULL, "must specify sequences or set %s", usequence);
        }
        for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {
            adios(NULL, "must specify sequences or set %s", usequence);
        }
        for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {

-           sequences[i++] = *ap;
+           svector_push_back (sequences, *ap);
+           ++i;

        }
     }
        }
     }

-    sequences[i] = NULL;

 
 

-    folder = doit(context_find(pfolder), folders, sequences);
+    folder = doit(context_find(pfolder), folders, svector_strs (sequences));

     if (folder == NULL) {
         done(0);
         return 1;
     }
 
     if (folder == NULL) {
         done(0);
         return 1;
     }
 

-    if (run_mode == UNSEEN) {
+    if (run_mode == RM_UNSEEN) {

         /* All the scan(1)s it runs change the current folder, so we
          * need to put it back.  Unfortunately, context_replace lamely
          * ignores the new value you give it if it is the same one it
         /* All the scan(1)s it runs change the current folder, so we
          * need to put it back.  Unfortunately, context_replace lamely
          * ignores the new value you give it if it is the same one it


@@ -500,12 +536,13 @@ main(int argc, char **argv)
     /* update current folder */
     context_replace(pfolder, folder->n_name);
 
     /* update current folder */
     context_replace(pfolder, folder->n_name);
 

-    if (run_mode == FNEXT || run_mode == FPREV) {
+    if (run_mode == RM_FNEXT || run_mode == RM_FPREV) {

         printf("%s  %s\n", folder->n_name, folder->n_field);
     }
 
     context_save();
 
         printf("%s  %s\n", folder->n_name, folder->n_field);
     }
 
     context_save();
 

+    svector_free (sequences);

     done (0);
     return 1;
 }
     done (0);
     return 1;
 }