Print port number in the connection error message

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index a49ba4cf8d24801562821dc89fad1e98a9e4485d..37e7162f4843364917e3a6d46b29631e603ab3c3 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -1,25 +1,47 @@
-
-/*
- * rmf.c -- remove a folder
+/* rmf.c -- remove a folder

  *
  * 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.
  */
 
  *
  * 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>
-
-static struct swit switches[] = {
-#define        INTRSW            0
-    { "interactive", 0 },
-#define        NINTRSW           1
-    { "nointeractive", 0 },
-#define VERSIONSW         2
-    { "version", 0 },
-#define        HELPSW            3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_yes_or_no_if_tty.h"
+#include "sbr/concat.h"
+#include "sbr/smatch.h"
+#include "sbr/remdir.h"
+#include "sbr/ssequal.h"
+#include "sbr/m_atoi.h"
+#include "sbr/getfolder.h"
+#include "sbr/ext_hook.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_del.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+
+#define RMF_SWITCHES \
+    X("interactive", 0, INTRSW) \
+    X("nointeractive", 0, NINTRSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(RMF);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RMF, switches);
+#undef X

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -31,17 +53,13 @@ static void rma (char *);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int defolder = 0, interactive = -1;
+    bool defolder = false;
+    int interactive = -1;

     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;

+    char *fp;

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -53,16 +71,16 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case INTRSW: 
                    interactive = 1;
 
                case INTRSW: 
                    interactive = 1;


@@ -74,11 +92,10 @@ main (int argc, char **argv)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else {
        } else {

-           adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+           die("usage: %s [+folder] [switches]", invo_name);

        }
     }
 
        }
     }
 


@@ -86,16 +103,18 @@ main (int argc, char **argv)
        free (path ("./", TFOLDER));
     if (!folder) {
        folder = getfolder (1);
        free (path ("./", TFOLDER));
     if (!folder) {
        folder = getfolder (1);

-       defolder++;
+       defolder = true;

     }
     }

-    if (strcmp (m_mailpath (folder), pwd ()) == 0)
-       adios (NULL, "sorry, you can't remove the current working directory");
+    fp = m_mailpath(folder);
+    if (!strcmp(fp, pwd()))
+       die("sorry, you can't remove the current working directory");
+    free(fp);

 
     if (interactive == -1)
        interactive = defolder;
 
     if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) {
 
     if (interactive == -1)
        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';


@@ -107,7 +126,7 @@ main (int argc, char **argv)
 
     if (interactive) {
        cp = concat ("Remove folder \"", folder, "\"? ", NULL);
 
     if (interactive) {
        cp = concat ("Remove folder \"", folder, "\"? ", NULL);

-       if (!getanswer (cp))
+       if (!read_yes_or_no_if_tty (cp))

            done (0);
        free (cp);
     }
            done (0);
        free (cp);
     }


@@ -127,72 +146,69 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
 static int
 rmf (char *folder)
 {

-    int i, j, others;
-    register char *maildir;
+    int i;
+    bool others;
+    char *fp;
+    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: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)
 
     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: 
 
        case NOTOK: 

-           snprintf (cur, sizeof(cur), "atr-%s-%s",
-                       current, m_mailpath (folder));
+            fp = m_mailpath(folder);
+           snprintf (cur, sizeof(cur), "atr-%s-%s", current, fp);
+            free(fp);

            if (!context_del (cur)) {
                printf ("[+%s de-referenced]\n", folder);
                return OK;
            }
            if (!context_del (cur)) {
                printf ("[+%s de-referenced]\n", folder);
                return OK;
            }

-           advise (NULL, "you have no profile entry for the %s folder +%s",
+           inform("you have no profile entry for the %s folder +%s",

                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }
 
     if ((dd = opendir (".")) == NULL)
                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }
 
     if ((dd = opendir (".")) == NULL)

-       adios (NULL, "unable to read folder +%s", folder);
-    others = 0;
+       die("unable to read folder +%s", folder);
+    others = false;

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

-                   continue;   /* else fall */
+                   continue;
+               break;

 
            case ',': 
 
            case ',': 

-#ifdef MHE
-           case '+': 
-#endif /* MHE */
-#ifdef UCI
-           case '_': 
-           case '#': 
-#endif /* UCI */

                break;
 
            default: 
                if (m_atoi (dp->d_name))
                    break;
                if (strcmp (dp->d_name, LINK) == 0
                break;
 
            default: 
                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;
 
                    break;
 

-               admonish (NULL, "file \"%s/%s\" not deleted",
+               inform("file \"%s/%s\" not deleted, continuing...",

                        folder, dp->d_name);
                        folder, dp->d_name);

-               others++;
+               others = true;

                continue;
        }
                continue;
        }

-       if (unlink (dp->d_name) == NOTOK) {
+       if (m_unlink (dp->d_name) == NOTOK) {

            admonish (dp->d_name, "unable to unlink %s:", folder);
            admonish (dp->d_name, "unable to unlink %s:", folder);

-           others++;
+           others = true;

        }
     }
 
        }
     }
 


@@ -204,11 +220,13 @@ rmf (char *folder)
      */
     rma (folder);
 
      */
     rma (folder);
 

-    chdir ("..");
-    if (others == 0 && remdir (maildir))
+    if (chdir ("..") < 0) {
+       advise ("..", "chdir");
+    }
+    if (!others && remdir (maildir))

        return OK;
 
        return OK;
 

-    advise (NULL, "folder +%s not removed", folder);
+    inform("folder +%s not removed", folder);

     return NOTOK;
 }
 
     return NOTOK;
 }
 


@@ -221,11 +239,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;
 
     /*


@@ -238,7 +256,8 @@ rma (char *folder)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)

-               admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name);
+               inform("bug: context_del(key=\"%s\"), continuing...",
+                   np->n_name);

            if (pp) {
                pp->n_next = np->n_next;
                np = pp;
            if (pp) {
                pp->n_next = np->n_next;
                np = pp;


@@ -250,4 +269,6 @@ rma (char *folder)
            pp = np;
        }
     }
            pp = np;
        }
     }

+
+    free(cp);

 }
 }