Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index fc183774fefb63b2d58c0e7e1103549595478f8e..c077f7c2ae457ab823b61e62bdd58128215c7119 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -33,7 +33,7 @@
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("print", 0, PRNTSW) \
-    X("noprint", -4, NPRNTSW) \
+    X("noprint", 0, NPRNTSW) \
     X("push", 0, PUSHSW) \
     X("pop", 0, POPSW) \
     X("version", 0, VERSIONSW) \
@@ -92,6 +92,17 @@ static void print_folders (void);
 static int sfold (struct msgs *, char *);
 static void readonly_folders (void);
 
+/*
+ * Function for printing error message if folder does not exist with
+ * -nocreate.
+ */
+static
+void
+nonexistent_folder (int status) {
+    NMH_UNUSED (status);
+    adios (NULL, "folder %s does not exist", folder);
+}
+
 
 int
 main (int argc, char **argv)
@@ -244,7 +255,7 @@ main (int argc, char **argv)
            /* If no folder is given, the current folder and */
            /* the top of the folder stack are swapped.      */
            if ((cp = context_find (stack))) {
-               dp = getcpy (cp);
+               dp = mh_xstrdup(cp);
                ap = brkstring (dp, " ", "\n");
                argfolder = getcpy(*ap++);
            } else {
@@ -268,7 +279,7 @@ main (int argc, char **argv)
        if (argfolder)
            adios (NULL, "sorry, no folders allowed with -pop");
        if ((cp = context_find (stack))) {
-           dp = getcpy (cp);
+           dp = mh_xstrdup(cp);
            ap = brkstring (dp, " ", "\n");
            argfolder = getcpy(*ap++);
        } else {
@@ -298,7 +309,7 @@ main (int argc, char **argv)
     if (listsw) {
        printf ("%s", argfolder ? argfolder : getfolder (1));
        if ((cp = context_find (stack))) {
-           dp = getcpy (cp);
+           dp = mh_xstrdup(cp);
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);
@@ -349,7 +360,7 @@ main (int argc, char **argv)
         * Check if folder exists.  If not, then see if
         * we should create it, or just exit.
         */
-        create_folder (m_maildir (folder), fcreat, done);
+        create_folder (m_maildir (folder), fcreat, nonexistent_folder);
 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */
@@ -396,7 +407,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
        /*
         * create message structure and get folder info
         */
-       if (!(mp = folder_read (fold, 1))) {
+       if (!(mp = folder_read (fold, fpack))) {
            admonish (NULL, "unable to read folder %s", fold);
            *crawl_children = FALSE;
            return 0;
@@ -623,7 +634,7 @@ readonly_folders (void)
 {
     int        atrlen;
     char atrcur[BUFSIZ];
-    register struct node *np;
+    struct node *np;
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);