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 68e9182dddf95f154d3420dd3f028a823f4cace9..625d68adc96c2a5c6ce0cf6ba994293a95236fbe 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,6 +10,7 @@
 #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>

+#include "sbr/m_maildir.h"

 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \


@@ -225,13 +226,11 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (argfolder)
                adios (NULL, "only one folder at a time!");
        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 {
            if (msg)
                adios (NULL, "only one (current) message at a time!");

-           else
-               msg = cp;
+            msg = cp;

        }
     }
 
        }
     }
 


@@ -377,7 +376,7 @@ main (int argc, char **argv)
 }
 
 static int
 }
 
 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;
 {
     int        i, retval = 1;
     struct msgs *mp = NULL;


@@ -407,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);
         */
        if (!(mp = folder_read (fold, fpack))) {
            inform("unable to read folder %s, continuing...", fold);

-           *crawl_children = FALSE;
+           *crawl_children = false;

            return 0;
        }
 
            return 0;
        }
 


@@ -417,7 +416,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 
        if (fpack) {
            if (folder_pack (&mp, fverb) == -1) {
 
        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 */
                done (1);
            }
            seq_save (mp);              /* synchronize the sequences */


@@ -441,10 +440,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
     return retval;
 }
 
     return retval;
 }
 

-static boolean
+static bool

 get_folder_info_callback (char *fold, void *baton)
 {
 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);
     NMH_UNUSED (baton);
 
     get_folder_info_body (fold, NULL, &crawl_children);


@@ -455,7 +454,7 @@ get_folder_info_callback (char *fold, void *baton)
 static int
 get_folder_info (char *fold, char *msg)
 {
 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);
     int retval;
 
     retval = get_folder_info_body (fold, msg, &crawl_children);


@@ -570,7 +569,7 @@ print_folders (void)
            } else {
                printf ("has %*d message%1s  (%*d-%*d)",
                        nummsgdigits, fi[i].nummsg,
            } else {
                printf ("has %*d message%1s  (%*d-%*d)",
                        nummsgdigits, fi[i].nummsg,

-                       (fi[i].nummsg == 1) ? "" : "s",
+                       PLURALS(fi[i].nummsg),

                        lowmsgdigits, fi[i].lowmsg,
                        hghmsgdigits, fi[i].hghmsg);
                if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {
                        lowmsgdigits, fi[i].lowmsg,
                        hghmsgdigits, fi[i].hghmsg);
                if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {


@@ -591,9 +590,9 @@ print_folders (void)
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
            putchar('\n');
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
        if (all)
            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%s in %d folder%s.\n",
+               total_msgs, PLURALS(total_msgs),
+               total_folders, PLURALS(total_folders));

     }
 
     fflush (stdout);
     }
 
     fflush (stdout);