X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c4f704eb5309d15ffb7c15fc67074f22d0647951..0e7daaa2daf6c668c8c6feb9da3c9a6639fa4e7e:/uip/rmf.c?ds=inline

diff --git a/uip/rmf.c b/uip/rmf.c
index 4684e7e0..6a86fe6a 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -92,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';
@@ -133,7 +133,8 @@ rmf (char *folder)
     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: 
 	    snprintf (cur, sizeof(cur), "atr-%s-%s",
@@ -162,7 +163,8 @@ rmf (char *folder)
 	    case '.': 
 		if (strcmp (dp->d_name, ".") == 0
 			|| strcmp (dp->d_name, "..") == 0)
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 
 	    case ',': 
 		break;
@@ -171,7 +173,7 @@ rmf (char *folder)
 		if (m_atoi (dp->d_name))
 		    break;
 		if (strcmp (dp->d_name, LINK) == 0
-			|| HasPrefix(dp->d_name, BACKUP_PREFIX))
+			|| has_prefix(dp->d_name, BACKUP_PREFIX))
 		    break;
 
 		admonish (NULL, "file \"%s/%s\" not deleted",