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

[nmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index fe3dcebde92c74cd0e7a13bf24b6ed8507cd6bde..089c76178b835d1541a9157076d8fdbe65ff8578 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,9 +17,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-#define FALSE   0
-#define TRUE    1
-
 /*
  * We allocate space to record the names of folders
  * (foldersToDo array), this number of elements at a time.
@@ -115,20 +112,13 @@ main(int argc, char **argv)
     char **arguments;
     char buf[BUFSIZ];
 
-#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; }
 
     /*
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
-    if (argv[0][strlen (argv[0]) - 1] == 's')
-       all = TRUE;
+    all = HasSuffixC(argv[0], 's');
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -241,7 +231,7 @@ main(int argc, char **argv)
        if ((cp = context_find(usequence)) && *cp) {
            char **ap, *dp;
 
-           dp = getcpy(cp);
+           dp = mh_xstrdup(cp);
            ap = brkstring (dp, " ", "\n");
            for (; ap && *ap; ap++)
                svector_push_back (sequencesToDo, *ap);
@@ -463,7 +453,7 @@ AddFolder(char *name, int force)
        /* Oops, error occurred.  Record it and continue. */
        AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
        f = &folders[nFolders++];
-       f->name = getcpy(name);
+       f->name = mh_xstrdup(name);
        f->error = 1;
        f->priority = AssignPriority(f->name);
        return 0;
@@ -499,7 +489,7 @@ AddFolder(char *name, int force)
        /* save general folder information */
        AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
        f = &folders[nFolders++];
-       f->name = getcpy(name);
+       f->name = mh_xstrdup(name);
        f->nMsgs = mp->nummsg;
        f->nSeq = ivector_create (0);
        f->private = ivector_create (0);
@@ -610,8 +600,7 @@ CompareFolders(struct Folder *f1, struct Folder *f2)
 {
     if (!alphaOrder && f1->priority != f2->priority)
        return f1->priority - f2->priority;
-    else
-       return strcmp(f1->name, f2->name);
+    return strcmp(f1->name, f2->name);
 }
 
 /*
@@ -674,7 +663,7 @@ do_readonly_folders (void)
 {
     int atrlen;
     char atrcur[BUFSIZ];
-    register struct node *np;
+    struct node *np;
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);