Trash folder replaces rmmproc. Rework of rmm(1) and refile(1).

[mmh] / sbr / m_backup.c

diff --git a/sbr/m_backup.c b/sbr/m_backup.c
index c34c409..bdb0e86 100644 (file)
--- a/sbr/m_backup.c
+++ b/sbr/m_backup.c
@@ -1,28 +1,26 @@
-
 /*
- * m_backup.c -- construct a backup file
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** m_backup.c -- construct a backup file
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 
 
 char *
-m_backup (char *file)
+m_backup(char *file)
 {
-    char *cp;
-    static char buffer[BUFSIZ];
+       char *cp;
+       static char buffer[BUFSIZ];
 
-    if ((cp = r1bindex(file, '/')) == file)
-       snprintf(buffer, sizeof(buffer), "%s%s",
-               BACKUP_PREFIX, cp);
-    else
-       snprintf(buffer, sizeof(buffer), "%.*s%s%s", (int)(cp - file), file,
-               BACKUP_PREFIX, cp);
+       if ((cp = mhbasename(file)) == file)
+               snprintf(buffer, sizeof(buffer), "%s%s", backup_prefix, cp);
+       else
+               snprintf(buffer, sizeof(buffer), "%.*s%s%s", (int)(cp - file),
+                               file, backup_prefix, cp);
 
-    unlink(buffer);
-    return buffer;
+       unlink(buffer);
+       return buffer;
 }