Factor trim format function out

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 230360b..e435a27 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <h/utils.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <locale.h>
@@ -76,7 +77,7 @@ main(int argc, char **argv)
                        if (folder)
                                adios(EX_USAGE, NULL, "only one folder at a time!");
                        else
-                               folder = getcpy(expandfol(cp));
+                               folder = mh_xstrdup(expandfol(cp));
                } else {
                        adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
                                        invo_name);
@@ -110,7 +111,7 @@ main(int argc, char **argv)
                cp = concat("Remove folder \"", folder, "\"? ", NULL);
                if (!getanswer(cp))
                        exit(EX_OK);
-               free(cp);
+               mh_free0(&cp);
        }
 
        if (rmf(folder) == OK) {
@@ -223,7 +224,7 @@ rma(char *folder)
        struct node *np, *pp;
 
        alen = strlen("atr-");
-       plen = strlen(cp = getcpy(toabsdir(folder))) + 1;
+       plen = strlen(cp = mh_xstrdup(toabsdir(folder))) + 1;
 
        /*
        ** Search context list for keys that look like
@@ -248,5 +249,5 @@ rma(char *folder)
                        pp = np;
                }
        }
-       free(cp);
+       mh_free0(&cp);
 }