X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5f7208794aead37a0bd63831b698f81054676844..d03048946b96d9e255603ea49454f33cb71a420f:/uip/folder.c diff --git a/uip/folder.c b/uip/folder.c index ef28a9b4..c077f7c2 100644 --- 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) \ @@ -96,8 +96,9 @@ static void readonly_folders (void); * Function for printing error message if folder does not exist with * -nocreate. */ +static void -nonexistant_folder (int status) { +nonexistent_folder (int status) { 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))) { - dp = getcpy (cp); + dp = mh_xstrdup(cp); 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))) { - dp = getcpy (cp); + dp = mh_xstrdup(cp); 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))) { - dp = getcpy (cp); + dp = mh_xstrdup(cp); 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. */ - 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 */ @@ -633,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);