rmf.c: free(3) return value from m_mailpath() calls.

And add comment to m_mailpath() that its return value needs freeing.

diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 0f9584b..c78b995 100644 (file)
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -36,6 +36,7 @@ m_maildir (char *folder)
 }
 
 
 }
 
 

+/* Return value must be free(3)'d. */

 char *
 m_mailpath (char *folder)
 {
 char *
 m_mailpath (char *folder)
 {

diff --git a/uip/rmf.c b/uip/rmf.c
index e8fa45f..a99b53c 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -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; }
 


@@ -84,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;


@@ -124,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;


@@ -136,8 +140,9 @@ rmf (char *folder)
            /* FALLTHRU */
 
        case NOTOK: 
            /* FALLTHRU */
 
        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;


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

+
+    free(cp);

 }
 }