Synched common.sh.in from master to nmh-oauth.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 29ef616abfa1324175ab32577ff704cff0d3c293..fc183774fefb63b2d58c0e7e1103549595478f8e 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -12,7 +12,6 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
-#include <errno.h>
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
@@ -102,13 +101,7 @@ main (int argc, char **argv)
     char *cp, *dp, *msg = NULL, *argfolder = NULL;
     char **ap, **argp, buf[BUFSIZ], **arguments;
 
-#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
@@ -405,6 +398,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
         */
        if (!(mp = folder_read (fold, 1))) {
            admonish (NULL, "unable to read folder %s", fold);
+           *crawl_children = FALSE;
            return 0;
        }
 
@@ -413,8 +407,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
            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);
+           }
            seq_save (mp);              /* synchronize the sequences */
            context_save ();    /* save the context file     */
        }