Don't `else' after return. Simplify control flow.

[nmh] / sbr / m_draft.c

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index b0168e2ec43ab3532cdaefca1c7b568c1ffc308a..7af505813171ce6de4705735e5845ba3158b5665 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -2,37 +2,36 @@
 /*
  * m_draft.c -- construct the name of a draft message
  *
- * $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 <errno.h>
+#include <h/utils.h>
 
 
 char *
 m_draft (char *folder, char *msg, int use, int *isdf)
 {
-    register char *cp;
-    register struct msgs *mp;
-    struct stat st;
+    char *cp;
+    struct msgs *mp;
     static char buffer[BUFSIZ];
 
     if (*isdf == -1 || folder == NULL || *folder == '\0') {
        if (*isdf == -1 || (cp = context_find ("Draft-Folder")) == NULL) {
            *isdf = 0;
            return m_maildir (msg && *msg ? msg : draft);
-       } else {
-           folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
-                   *cp != '@' ? TFOLDER : TSUBCWF);
        }
+
+        folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
+                *cp != '@' ? TFOLDER : TSUBCWF);
     }
     *isdf = 1;
     
-    chdir (m_maildir (""));
+    if (chdir (m_maildir ("")) < 0) {
+       advise (m_maildir (""), "chdir");
+    }
     strncpy (buffer, m_maildir (folder), sizeof(buffer));
 
     create_folder (buffer, 0, done);
@@ -40,7 +39,7 @@ m_draft (char *folder, char *msg, int use, int *isdf)
     if (chdir (buffer) == -1)
        adios (buffer, "unable to change directory to");
 
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))
        adios (NULL, "unable to read folder %s", folder);
 
     /*