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

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 98ecde68d70f27ac102083dfb6012e8e04a799a7..7e00a8124104a6b34d15acab32ea20cc8aaaf1a5 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -33,7 +33,7 @@
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("print", 0, PRNTSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("print", 0, PRNTSW) \

-    X("noprint", -4, NPRNTSW) \
+    X("noprint", 0, NPRNTSW) \

     X("push", 0, PUSHSW) \
     X("pop", 0, POPSW) \
     X("version", 0, VERSIONSW) \
     X("push", 0, PUSHSW) \
     X("pop", 0, POPSW) \
     X("version", 0, VERSIONSW) \


@@ -92,6 +92,17 @@ static void print_folders (void);
 static int sfold (struct msgs *, char *);
 static void readonly_folders (void);
 
 static int sfold (struct msgs *, char *);
 static void readonly_folders (void);
 

+/*
+ * Function for printing error message if folder does not exist with
+ * -nocreate.
+ */
+static
+void
+nonexistent_folder (int status) {
+    NMH_UNUSED (status);
+    adios (NULL, "folder %s does not exist", folder);
+}
+

 
 int
 main (int argc, char **argv)
 
 int
 main (int argc, char **argv)


@@ -107,8 +118,7 @@ main (int argc, char **argv)
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */
      * If program was invoked with name ending
      * in `s', then add switch `-all'.
      */

-    if (argv[0][strlen (argv[0]) - 1] == 's')
-       all = 1;
+    all = HasSuffixC(argv[0], 's');

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


@@ -244,7 +254,7 @@ main (int argc, char **argv)
            /* If no folder is given, the current folder and */
            /* the top of the folder stack are swapped.      */
            if ((cp = context_find (stack))) {
            /* If no folder is given, the current folder and */
            /* the top of the folder stack are swapped.      */
            if ((cp = context_find (stack))) {

-               dp = getcpy (cp);
+               dp = mh_xstrdup(cp);

                ap = brkstring (dp, " ", "\n");
                argfolder = getcpy(*ap++);
            } else {
                ap = brkstring (dp, " ", "\n");
                argfolder = getcpy(*ap++);
            } else {


@@ -268,7 +278,7 @@ main (int argc, char **argv)
        if (argfolder)
            adios (NULL, "sorry, no folders allowed with -pop");
        if ((cp = context_find (stack))) {
        if (argfolder)
            adios (NULL, "sorry, no folders allowed with -pop");
        if ((cp = context_find (stack))) {

-           dp = getcpy (cp);
+           dp = mh_xstrdup(cp);

            ap = brkstring (dp, " ", "\n");
            argfolder = getcpy(*ap++);
        } else {
            ap = brkstring (dp, " ", "\n");
            argfolder = getcpy(*ap++);
        } else {


@@ -298,12 +308,12 @@ main (int argc, char **argv)
     if (listsw) {
        printf ("%s", argfolder ? argfolder : getfolder (1));
        if ((cp = context_find (stack))) {
     if (listsw) {
        printf ("%s", argfolder ? argfolder : getfolder (1));
        if ((cp = context_find (stack))) {

-           dp = getcpy (cp);
+           dp = mh_xstrdup(cp);

            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);
        }
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);
        }

-       printf ("\n");
+       putchar('\n');

 
        if (!printsw)
            done (0);
 
        if (!printsw)
            done (0);


@@ -349,7 +359,7 @@ main (int argc, char **argv)
         * Check if folder exists.  If not, then see if
         * we should create it, or just exit.
         */
         * Check if folder exists.  If not, then see if
         * we should create it, or just exit.
         */

-        create_folder (m_maildir (folder), fcreat, done);
+        create_folder (m_maildir (folder), fcreat, nonexistent_folder);

 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */
 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */


@@ -396,8 +406,9 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
        /*
         * create message structure and get folder info
         */
        /*
         * create message structure and get folder info
         */

-       if (!(mp = folder_read (fold, 1))) {
+       if (!(mp = folder_read (fold, fpack))) {

            admonish (NULL, "unable to read folder %s", fold);
            admonish (NULL, "unable to read folder %s", fold);

+           *crawl_children = FALSE;

            return 0;
        }
 
            return 0;
        }
 


@@ -406,8 +417,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
            retval = 0;
 
        if (fpack) {
            retval = 0;
 
        if (fpack) {

-           if (folder_pack (&mp, fverb) == -1)
+           if (folder_pack (&mp, fverb) == -1) {
+               *crawl_children = FALSE; /* to please clang static analyzer */

                done (1);
                done (1);

+           }

            seq_save (mp);              /* synchronize the sequences */
            context_save ();    /* save the context file     */
        }
            seq_save (mp);              /* synchronize the sequences */
            context_save ();    /* save the context file     */
        }


@@ -578,7 +591,7 @@ print_folders (void)
      */
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
      */
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)

-           printf ("\n");
+           putchar('\n');

        printf ("TOTAL = %d message%c in %d folder%s.\n",
                total_msgs, total_msgs != 1 ? 's' : ' ',
                total_folders, total_folders != 1 ? "s" : "");
        printf ("TOTAL = %d message%c in %d folder%s.\n",
                total_msgs, total_msgs != 1 ? 's' : ' ',
                total_folders, total_folders != 1 ? "s" : "");


@@ -620,7 +633,7 @@ readonly_folders (void)
 {
     int        atrlen;
     char atrcur[BUFSIZ];
 {
     int        atrlen;
     char atrcur[BUFSIZ];

-    register struct node *np;
+    struct node *np;

 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);