Use variable-size (but in one case, fixed but larger) buffers for the SASL

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index a0683dd2ab377f838f4dd0f22dc67745e00d6316..bdbdc73f127eb8a2a8af1c14ae259764d7c18a21 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -95,6 +95,7 @@ get_msgnums(char *folder, char *sequences[])
     char name[NAMESZ], field[BUFSIZ];
     char *cp;
     char *msgnums = NULL, *this_msgnums, *old_msgnums;
+    int failed_to_lock = 0;
     m_getfld_state_t gstate = 0;
 
     /* copied from seq_read.c:seq_public */
@@ -112,13 +113,12 @@ get_msgnums(char *folder, char *sequences[])
     if (seqfile == NULL)
        return NULL;
 
-    if ((fp = lkfopendata (seqfile, "r")) == NULL) {
-       free(seqfile);
+    if ((fp = lkfopendata (seqfile, "r", & failed_to_lock)) == NULL) {
 
-       if (errno == EACCES  ||  errno == EAGAIN  ||  errno == EWOULDBLOCK) {
-           /* Failed to lock sequence file. */
+       if (failed_to_lock) {
            adios (seqfile, "failed to lock");
        } else {
+           free(seqfile);
            return NULL;
        }
     }
@@ -406,8 +406,11 @@ doit(char *cur, char *folders, char *sequences[])
 
     /* If we're fnext, we haven't checked the last node yet.  If it's the
      * current folder, return the first node. */
-    if (run_mode == FNEXT && strcmp(last->n_name, cur) == 0) {
-        return first;
+    if (run_mode == FNEXT) {
+       assert(last != NULL);
+       if (strcmp(last->n_name, cur) == 0) {
+            return first;
+       }
     }
 
     if (run_mode == NEW) {