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

[nmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index cea1ca7c3c1e940cf6faee2ac92c179264567df6..f40f010dee9e7b8afd42b35050e27a17683055df 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -1,5 +1,4 @@
-/*
- * flist.c -- list nmh folders containing messages
+/* flist.c -- list nmh folders containing messages

  *         -- in a given sequence
  *
  * originally by
  *         -- in a given sequence
  *
  * originally by


@@ -16,9 +15,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-
-#define FALSE   0
-#define TRUE    1
+#include "sbr/m_maildir.h"

 
 /*
  * We allocate space to record the names of folders
 
 /*
  * We allocate space to record the names of folders


@@ -76,11 +73,11 @@ static int maxfolders;
 /* info on sequences to search for */
 static svector_t sequencesToDo;
 
 /* info on sequences to search for */
 static svector_t sequencesToDo;
 

-static int all        = FALSE;  /* scan all folders in top level?           */
-static int alphaOrder = FALSE; /* want alphabetical order only             */
-static int recurse    = FALSE; /* show nested folders?                     */
-static int showzero   = TRUE;  /* show folders even if no messages in seq? */
-static int Total      = TRUE;  /* display info on number of messages in    *
+static bool all;                /* scan all folders in top level? */
+static bool alphaOrder;         /* want alphabetical order only */
+static bool recurse;            /* show nested folders? */
+static bool showzero = true;    /* show folders even if no messages in seq? */
+static bool Total = true;       /* display info on number of messages in

                                 * sequence found, and total num messages   */
 
 static char curfolder[BUFSIZ]; /* name of the current folder */
                                 * sequence found, and total num messages   */
 
 static char curfolder[BUFSIZ]; /* name of the current folder */


@@ -93,17 +90,17 @@ static char *nmhdir;                /* base nmh mail directory    */
 typedef int (*qsort_comp) (const void *, const void *);
 
 /*
 typedef int (*qsort_comp) (const void *, const void *);
 
 /*

- * prototypes
+ * static prototypes

  */
  */

-int CompareFolders(struct Folder *, struct Folder *);
-void GetFolderOrder(void);
-void ScanFolders(void);
-int AddFolder(char *, int);
-void BuildFolderList(char *, int);
-void BuildFolderListRecurse(char *, struct stat *, int);
-void PrintFolders(void);
-void AllocFolders(struct Folder **, int *, int);
-int AssignPriority(char *);
+static int CompareFolders(struct Folder *, struct Folder *);
+static void GetFolderOrder(void);
+static void ScanFolders(void);
+static int AddFolder(char *, int);
+static void BuildFolderList(char *, int);
+static void BuildFolderListRecurse(char *, struct stat *, int);
+static void PrintFolders(void);
+static void AllocFolders(struct Folder **, int *, int);
+static int AssignPriority(char *);

 static void do_readonly_folders(void);
 
 
 static void do_readonly_folders(void);
 
 


@@ -115,18 +112,13 @@ main(int argc, char **argv)
     char **arguments;
     char buf[BUFSIZ];
 
     char **arguments;
     char buf[BUFSIZ];
 

-    setlocale(LC_ALL, "");
-    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 program was invoked with name ending
      * in `s', then add switch `-all'.
      */

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

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


@@ -166,41 +158,41 @@ main(int argc, char **argv)
                break;
 
            case ALLSW:
                break;
 
            case ALLSW:

-               all = TRUE;
+               all = true;

                break;
            case NOALLSW:
                break;
            case NOALLSW:

-               all = FALSE;
+               all = false;

                break;
 
            case SHOWZERO:
                break;
 
            case SHOWZERO:

-               showzero = TRUE;
+               showzero = true;

                break;
            case NOSHOWZERO:
                break;
            case NOSHOWZERO:

-               showzero = FALSE;
+               showzero = false;

                break;
 
            case ALPHASW:
                break;
 
            case ALPHASW:

-               alphaOrder = TRUE;
+               alphaOrder = true;

                break;
            case NOALPHASW:
                break;
            case NOALPHASW:

-               alphaOrder = FALSE;
+               alphaOrder = false;

                break;
 
            case NOFASTSW:
            case TOTALSW:
                break;
 
            case NOFASTSW:
            case TOTALSW:

-               Total = TRUE;
+               Total = true;

                break;
 
            case FASTSW:
            case NOTOTALSW:
                break;
 
            case FASTSW:
            case NOTOTALSW:

-               Total = FALSE;
+               Total = false;

                break;
 
            case RECURSE:
                break;
 
            case RECURSE:

-               recurse = TRUE;
+               recurse = true;

                break;
            case NORECURSE:
                break;
            case NORECURSE:

-               recurse = FALSE;
+               recurse = false;

                break;
            }
        } else {
                break;
            }
        } else {


@@ -239,7 +231,7 @@ main(int argc, char **argv)
        if ((cp = context_find(usequence)) && *cp) {
            char **ap, *dp;
 
        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);
            ap = brkstring (dp, " ", "\n");
            for (; ap && *ap; ap++)
                svector_push_back (sequencesToDo, *ap);


@@ -262,7 +254,7 @@ main(int argc, char **argv)
  * how to sort folders for output.
  */
 
  * how to sort folders for output.
  */
 

-void
+static void

 GetFolderOrder(void)
 {
     char *p, *s;
 GetFolderOrder(void)
 {
     char *p, *s;


@@ -294,7 +286,7 @@ GetFolderOrder(void)
  * Scan all the necessary folders
  */
 
  * Scan all the necessary folders
  */
 

-void
+static void

 ScanFolders(void)
 {
     int i;
 ScanFolders(void)
 {
     int i;


@@ -343,7 +335,7 @@ ScanFolders(void)
  * the top of our search tree.
  */
 
  * the top of our search tree.
  */
 

-void
+static void

 BuildFolderList(char *dirName, int searchdepth)
 {
     struct stat st;
 BuildFolderList(char *dirName, int searchdepth)
 {
     struct stat st;


@@ -374,7 +366,7 @@ BuildFolderList(char *dirName, int searchdepth)
  * Recursive building of folder list
  */
 
  * Recursive building of folder list
  */
 

-void
+static void

 BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 {
     char *base, name[PATH_MAX];
 BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 {
     char *base, name[PATH_MAX];


@@ -418,7 +410,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
        /* Check to see if the name of the file is a number
         * if it is, we assume it's a mail file and skip it
         */
        /* Check to see if the name of the file is a number
         * if it is, we assume it's a mail file and skip it
         */

-       for (n = dp->d_name; *n && isdigit((unsigned char) *n); n++);
+       for (n = dp->d_name; isdigit((unsigned char)*n); n++);

        if (!*n)
            continue;
        strncpy (name, base, sizeof(name) - 2);
        if (!*n)
            continue;
        strncpy (name, base, sizeof(name) - 2);


@@ -446,7 +438,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
  * messages and the number of messages in each sequence.
  */
 
  * messages and the number of messages in each sequence.
  */
 

-int
+static int

 AddFolder(char *name, int force)
 {
     unsigned int i;
 AddFolder(char *name, int force)
 {
     unsigned int i;


@@ -461,7 +453,7 @@ AddFolder(char *name, int force)
        /* Oops, error occurred.  Record it and continue. */
        AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
        f = &folders[nFolders++];
        /* 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;
        f->error = 1;
        f->priority = AssignPriority(f->name);
        return 0;


@@ -497,7 +489,7 @@ AddFolder(char *name, int force)
        /* save general folder information */
        AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
        f = &folders[nFolders++];
        /* 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);
        f->nMsgs = mp->nummsg;
        f->nSeq = ivector_create (0);
        f->private = ivector_create (0);


@@ -524,7 +516,7 @@ AddFolder(char *name, int force)
  * Print the folder/sequence information
  */
 
  * Print the folder/sequence information
  */
 

-void
+static void

 PrintFolders(void)
 {
     char tmpname[BUFSIZ];
 PrintFolders(void)
 {
     char tmpname[BUFSIZ];


@@ -534,7 +526,7 @@ PrintFolders(void)
 
     if (!Total) {
        for (i = 0; i < nFolders; i++)
 
     if (!Total) {
        for (i = 0; i < nFolders; i++)

-           printf("%s\n", folders[i].name);
+           puts(folders[i].name);

        return;
     }
 
        return;
     }
 


@@ -603,20 +595,19 @@ PrintFolders(void)
  * Put them in priority order.
  */
 
  * Put them in priority order.
  */
 

-int
+static int

 CompareFolders(struct Folder *f1, struct Folder *f2)
 {
     if (!alphaOrder && f1->priority != f2->priority)
        return f1->priority - f2->priority;
 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);

 }
 
 /*
  * Make sure we have at least n folders allocated.
  */
 
 }
 
 /*
  * Make sure we have at least n folders allocated.
  */
 

-void
+static void

 AllocFolders(struct Folder **f, int *nfa, int n)
 {
     if (n <= *nfa)
 AllocFolders(struct Folder **f, int *nfa, int n)
 {
     if (n <= *nfa)


@@ -634,7 +625,7 @@ AllocFolders(struct Folder **f, int *nfa, int n)
  * Return the priority for a name.  The highest comes from an exact match.
  * After that, the longest match (then first) assigns the priority.
  */
  * Return the priority for a name.  The highest comes from an exact match.
  * After that, the longest match (then first) assigns the priority.
  */

-int
+static int

 AssignPriority(char *name)
 {
     int i, ol, nl;
 AssignPriority(char *name)
 {
     int i, ol, nl;


@@ -672,7 +663,7 @@ do_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);