Change things so we can take two file descriptors, one for input

[nmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index fc183774fefb63b2d58c0e7e1103549595478f8e..ef28a9b4dec1c4cbb322c4fe94e171e78207709d 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -92,6 +92,16 @@ 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.
+ */
+void
+nonexistant_folder (int status) {
+    NMH_UNUSED (status);
+    adios (NULL, "folder %s does not exist", folder);
+}
+
 
 int
 main (int argc, char **argv)
@@ -349,7 +359,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, nonexistant_folder);
 
        if (get_folder_info (folder, msg) && argfolder) {
            /* update current folder */
@@ -396,7 +406,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;