mhstoresbr.c: Factor MIME-parameter-can-be-used-for-filename test.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 4558ca30a59b1c19387defb1864da15d6409e689..493510a0ad309d20c1b9b997acc455029fc37372 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
@@ -91,7 +92,7 @@ main (int argc, char **argv)
        interactive = defolder;
 
     if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) {
-       for (cp = copy (folder, newfolder); cp > newfolder && *cp != '/'; cp--)
+       for (cp = stpcpy(newfolder, folder); cp > newfolder && *cp != '/'; cp--)
            continue;
        if (cp > newfolder)
            *cp = '\0';
@@ -123,7 +124,7 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
-    int i, j, others;
+    int i, others;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
@@ -156,7 +157,6 @@ rmf (char *folder)
 
     (void)ext_hook("del-hook", maildir, NULL);
 
-    j = strlen(BACKUP_PREFIX);
     while ((dp = readdir (dd))) {
        switch (dp->d_name[0]) {
            case '.': 
@@ -171,7 +171,7 @@ rmf (char *folder)
                if (m_atoi (dp->d_name))
                    break;
                if (strcmp (dp->d_name, LINK) == 0
-                       || strncmp (dp->d_name, BACKUP_PREFIX, j) == 0)
+                       || HasPrefix(dp->d_name, BACKUP_PREFIX))
                    break;
 
                admonish (NULL, "file \"%s/%s\" not deleted",