X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=9d85e891f7952b28780e46616ed72d34cfe7798d;hp=f940316918b07c1cdda06ab080869864acbaf852;hb=08aa8c17c3241bb5c6a997ed2e01e25a4d0089ce;hpb=197f95940cc0860683e6988352f721e6603f9339

diff --git a/uip/folder.c b/uip/folder.c
index f940316..9d85e89 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -5,9 +5,14 @@
  *             -- list the folder stack
  *
  * $Id$
+ *
+ * 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>
+#include <h/utils.h>
 #include <errno.h>
 
 static struct swit switches[] = {
@@ -58,12 +63,10 @@ static struct swit switches[] = {
 #define VERSIONSW      22
     { "version", 0 },
 #define	HELPSW         23
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
-extern int errno;
-
 static int fshort   = 0;	/* output only folder names                 */
 static int fcreat   = 0;	/* should we ask to create new folders?     */
 static int fpack    = 0;	/* are we packing the folder?               */
@@ -351,13 +354,11 @@ main (int argc, char **argv)
 
     /* Allocate initial space to record folder names */
     maxfolders = NUMFOLDERS;
-    if ((folds = malloc (maxfolders * sizeof(char *))) == NULL)
-	adios (NULL, "unable to allocate storage for folder names");
+    folds = mh_xmalloc (maxfolders * sizeof(char *));
 
     /* Allocate initial space to record folder information */
     maxFolderInfo = NUMFOLDERS;
-    if ((fi = malloc (maxFolderInfo * sizeof(*fi))) == NULL)
-	adios (NULL, "unable to allocate storage for folder info");
+    fi = mh_xmalloc (maxFolderInfo * sizeof(*fi));
 
     /*
      * Scan the folders
@@ -392,22 +393,7 @@ main (int argc, char **argv)
 	 * Check if folder exists.  If not, then see if
 	 * we should create it, or just exit.
 	 */
-	if (stat (strncpy (buf, m_maildir (folder), sizeof(buf)), &st) == -1) {
-	    if (errno != ENOENT)
-		adios (buf, "error on folder");
-	    if (fcreat == 0) {
-		/* ask before creating folder */
-		cp = concat ("Create folder \"", buf, "\"? ", NULL);
-		if (!getanswer (cp))
-		    done (1);
-		free (cp);
-	    } else if (fcreat == -1) {
-		/* do not create, so exit */
-		done (1);
-	    }
-	    if (!makedir (buf))
-		adios (NULL, "unable to create folder %s", buf);
-	}
+        create_folder (m_maildir (folder), fcreat, done);
 
 	if (get_folder_info (folder, msg) && argfolder) {
 	    /* update current folder */
@@ -468,8 +454,7 @@ get_folder_info (char *fold, char *msg)
      */
     if (total_folders >= maxFolderInfo) {
 	maxFolderInfo += NUMFOLDERS;
-	if ((fi = realloc (fi, maxFolderInfo * sizeof(*fi))) == NULL)
-	    adios (NULL, "unable to re-allocate storage for folder info");
+	fi = mh_xrealloc (fi, maxFolderInfo * sizeof(*fi));
     }
 
     fi[i].name   = fold;
@@ -773,8 +758,7 @@ addfold (char *fold)
     /* if necessary, reallocate the space for folder names */
     if (foldp >= maxfolders) {
 	maxfolders += NUMFOLDERS;
-	if ((folds = realloc (folds, maxfolders * sizeof(char *))) == NULL)
-	    adios (NULL, "unable to re-allocate storage for folder names");
+	folds = mh_xrealloc (folds, maxfolders * sizeof(char *));
     }
 
     cp = getcpy (fold);
@@ -814,10 +798,6 @@ readonly_folders (void)
     char atrcur[BUFSIZ];
     register struct node *np;
 
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-	adios (NULL, "oops, context hasn't been read yet");
-
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);