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 4f36ed0e3aba3e913d8b5365722482f45552a650..c077f7c2ae457ab823b61e62bdd58128215c7119 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -96,8 +96,9 @@ static void readonly_folders (void);
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */

+static

 void
 void

-nonexistant_folder (int status) {
+nonexistent_folder (int status) {

     NMH_UNUSED (status);
     adios (NULL, "folder %s does not exist", folder);
 }
     NMH_UNUSED (status);
     adios (NULL, "folder %s does not exist", folder);
 }


@@ -254,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))) {
            /* 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 {
                ap = brkstring (dp, " ", "\n");
                argfolder = getcpy(*ap++);
            } else {


@@ -278,7 +279,7 @@ main (int argc, char **argv)
        if (argfolder)
            adios (NULL, "sorry, no folders allowed with -pop");
        if ((cp = context_find (stack))) {
        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 {
            ap = brkstring (dp, " ", "\n");
            argfolder = getcpy(*ap++);
        } else {


@@ -308,7 +309,7 @@ main (int argc, char **argv)
     if (listsw) {
        printf ("%s", argfolder ? argfolder : getfolder (1));
        if ((cp = context_find (stack))) {
     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);
            for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
                printf (" %s", *ap);
            free (dp);


@@ -359,7 +360,7 @@ main (int argc, char **argv)
         * Check if folder exists.  If not, then see if
         * we should create it, or just exit.
         */
         * Check if folder exists.  If not, then see if
         * we should create it, or just exit.
         */

-        create_folder (m_maildir (folder), fcreat, nonexistant_folder);
+        create_folder (m_maildir (folder), fcreat, nonexistent_folder);

 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */
 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */


@@ -633,7 +634,7 @@ readonly_folders (void)
 {
     int        atrlen;
     char atrcur[BUFSIZ];
 {
     int        atrlen;
     char atrcur[BUFSIZ];

-    register struct node *np;
+    struct node *np;

 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);
 
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);