lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index c2ad8b89dc7a3e2440f9d83988ed9fe56755075c..625d68adc96c2a5c6ce0cf6ba994293a95236fbe 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,7 +10,7 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
@@ -226,13 +226,11 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (argfolder)
                adios (NULL, "only one folder at a time!");
-           else
-               argfolder = pluspath (cp);
+            argfolder = pluspath (cp);
        } else {
            if (msg)
                adios (NULL, "only one (current) message at a time!");
-           else
-               msg = cp;
+            msg = cp;
        }
     }
 
@@ -378,7 +376,7 @@ main (int argc, char **argv)
 }
 
 static int
-get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
+get_folder_info_body (char *fold, char *msg, bool *crawl_children)
 {
     int        i, retval = 1;
     struct msgs *mp = NULL;
@@ -408,7 +406,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
         */
        if (!(mp = folder_read (fold, fpack))) {
            inform("unable to read folder %s, continuing...", fold);
-           *crawl_children = FALSE;
+           *crawl_children = false;
            return 0;
        }
 
@@ -418,7 +416,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 
        if (fpack) {
            if (folder_pack (&mp, fverb) == -1) {
-               *crawl_children = FALSE; /* to please clang static analyzer */
+               *crawl_children = false; /* to please clang static analyzer */
                done (1);
            }
            seq_save (mp);              /* synchronize the sequences */
@@ -442,10 +440,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
     return retval;
 }
 
-static boolean
+static bool
 get_folder_info_callback (char *fold, void *baton)
 {
-    boolean crawl_children;
+    bool crawl_children;
     NMH_UNUSED (baton);
 
     get_folder_info_body (fold, NULL, &crawl_children);
@@ -456,7 +454,7 @@ get_folder_info_callback (char *fold, void *baton)
 static int
 get_folder_info (char *fold, char *msg)
 {
-    boolean crawl_children;
+    bool crawl_children;
     int retval;
 
     retval = get_folder_info_body (fold, msg, &crawl_children);