showbuildenv: Add comment describing exit-status convention.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index f714c472bcbb40b5fbfa9b3ff78f0c0545d24a0b..30f94219ab7fba2a6144ebec7fdc8bb5f3976428 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include <h/utils.h>

 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \


@@ -91,7 +92,7 @@ main (int argc, char **argv)
        interactive = defolder;
 
     if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) {
        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';
            continue;
        if (cp > newfolder)
            *cp = '\0';


@@ -123,11 +124,11 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
 static int
 rmf (char *folder)
 {

-    int i, j, others;
-    register char *maildir;
+    int i, others;
+    char *maildir;

     char cur[BUFSIZ];
     char cur[BUFSIZ];

-    register struct dirent *dp;
-    register DIR *dd;
+    struct dirent *dp;
+    DIR *dd;

 
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
 
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 


@@ -154,9 +155,8 @@ rmf (char *folder)
      * Run the external delete hook program.
      */
 
      * Run the external delete hook program.
      */
 

-    (void)ext_hook("del-hook", maildir, (char *)0);
+    (void)ext_hook("del-hook", maildir, NULL);

 
 

-    j = strlen(BACKUP_PREFIX);

     while ((dp = readdir (dd))) {
        switch (dp->d_name[0]) {
            case '.': 
     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
                if (m_atoi (dp->d_name))
                    break;
                if (strcmp (dp->d_name, LINK) == 0

-                       || strncmp (dp->d_name, BACKUP_PREFIX, j) == 0)
+                       || has_prefix(dp->d_name, BACKUP_PREFIX))

                    break;
 
                admonish (NULL, "file \"%s/%s\" not deleted",
                    break;
 
                admonish (NULL, "file \"%s/%s\" not deleted",


@@ -212,11 +212,11 @@ rmf (char *folder)
 static void
 rma (char *folder)
 {
 static void
 rma (char *folder)
 {

-    register int alen, j, plen;
-    register char *cp;
-    register struct node *np, *pp;
+    int alen, j, plen;
+    char *cp;
+    struct node *np, *pp;

 
 

-    alen = strlen ("atr-");
+    alen = LEN("atr-");

     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*
     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*