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

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 30f94219ab7fba2a6144ebec7fdc8bb5f3976428..a99b53cf5ea05ba9fb00b38403f034fa5a62737d 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -1,6 +1,4 @@
-
-/*
- * rmf.c -- remove a folder
+/* rmf.c -- remove a folder

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -9,6 +7,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"

 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \


@@ -37,6 +37,7 @@ main (int argc, char **argv)
     int defolder = 0, interactive = -1;
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;
     int defolder = 0, interactive = -1;
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;

+    char *fp;

 
     if (nmh_init(argv[0], 1)) { return 1; }
 
 
     if (nmh_init(argv[0], 1)) { return 1; }
 


@@ -72,8 +73,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }


@@ -85,8 +85,10 @@ main (int argc, char **argv)
        folder = getfolder (1);
        defolder++;
     }
        folder = getfolder (1);
        defolder++;
     }

-    if (strcmp (m_mailpath (folder), pwd ()) == 0)
+    fp = m_mailpath(folder);
+    if (!strcmp(fp, pwd()))

        adios (NULL, "sorry, you can't remove the current working directory");
        adios (NULL, "sorry, you can't remove the current working directory");

+    free(fp);

 
     if (interactive == -1)
        interactive = defolder;
 
     if (interactive == -1)
        interactive = defolder;


@@ -125,6 +127,7 @@ static int
 rmf (char *folder)
 {
     int i, others;
 rmf (char *folder)
 {
     int i, others;

+    char *fp;

     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;


@@ -133,16 +136,18 @@ rmf (char *folder)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)

-               break;          /* fall otherwise */
+               break;
+           /* FALLTHRU */

 
        case NOTOK: 
 
        case NOTOK: 

-           snprintf (cur, sizeof(cur), "atr-%s-%s",
-                       current, m_mailpath (folder));
+            fp = m_mailpath(folder);
+           snprintf (cur, sizeof(cur), "atr-%s-%s", current, fp);
+            free(fp);

            if (!context_del (cur)) {
                printf ("[+%s de-referenced]\n", folder);
                return OK;
            }
            if (!context_del (cur)) {
                printf ("[+%s de-referenced]\n", folder);
                return OK;
            }

-           advise (NULL, "you have no profile entry for the %s folder +%s",
+           inform("you have no profile entry for the %s folder +%s",

                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }
                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }


@@ -162,7 +167,8 @@ rmf (char *folder)
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)

-                   continue;   /* else fall */
+                   continue;
+               break;

 
            case ',': 
                break;
 
            case ',': 
                break;


@@ -174,7 +180,7 @@ rmf (char *folder)
                        || has_prefix(dp->d_name, BACKUP_PREFIX))
                    break;
 
                        || has_prefix(dp->d_name, BACKUP_PREFIX))
                    break;
 

-               admonish (NULL, "file \"%s/%s\" not deleted",
+               inform("file \"%s/%s\" not deleted, continuing...",

                        folder, dp->d_name);
                others++;
                continue;
                        folder, dp->d_name);
                others++;
                continue;


@@ -199,7 +205,7 @@ rmf (char *folder)
     if (others == 0 && remdir (maildir))
        return OK;
 
     if (others == 0 && remdir (maildir))
        return OK;
 

-    advise (NULL, "folder +%s not removed", folder);
+    inform("folder +%s not removed", folder);

     return NOTOK;
 }
 
     return NOTOK;
 }
 


@@ -229,7 +235,8 @@ rma (char *folder)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)

-               admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name);
+               inform("bug: context_del(key=\"%s\"), continuing...",
+                   np->n_name);

            if (pp) {
                pp->n_next = np->n_next;
                np = pp;
            if (pp) {
                pp->n_next = np->n_next;
                np = pp;


@@ -241,4 +248,6 @@ rma (char *folder)
            pp = np;
        }
     }
            pp = np;
        }
     }

+
+    free(cp);

 }
 }