X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4b2ba897bbf4c545b33e42bd1e06bee26e665dc4..a9bb157da7d3cee576e8944eaf8fab2bdbc4be8d:/uip/new.c?ds=inline diff --git a/uip/new.c b/uip/new.c index 2304c1ef..8e3c3505 100644 --- a/uip/new.c +++ b/uip/new.c @@ -1,6 +1,4 @@ - -/* - * new.c -- as new, list all folders with unseen messages +/* new.c -- as new, list all folders with unseen messages * -- as fnext, move to next folder with unseen messages * -- as fprev, move to previous folder with unseen messages * -- as unseen, scan all unseen messages @@ -98,7 +96,7 @@ get_msgnums(char *folder, char *sequences[]) char *seqfile = NULL; FILE *fp; int state; - char name[NAMESZ], field[BUFSIZ]; + char name[NAMESZ], field[NMH_BUFSIZ]; char *cp; char *msgnums = NULL, *this_msgnums, *old_msgnums; int failed_to_lock = 0; @@ -178,7 +176,7 @@ get_msgnums(char *folder, char *sequences[]) case BODY: adios (NULL, "no blank lines are permitted in %s", seqfile); - /* fall */ + /* FALLTHRU */ case FILEEOF: break; @@ -280,7 +278,7 @@ check_folders(struct node **first, struct node **last, while (vfgets(fp, &line) == OK) { len = strlen(line) - 1; line[len] = '\0'; - check_folder(getcpy(line), len, &b); + check_folder(mh_xstrdup(line), len, &b); } fclose(fp); } @@ -342,14 +340,15 @@ doit(char *cur, char *folders, char *sequences[]) if (first == NULL) { /* No folders at all... */ return NULL; - } else if (first->n_next == NULL) { + } + if (first->n_next == NULL) { /* We have only one node; any desired messages in it? */ if (first->n_field == NULL) { return NULL; - } else { - return first; } - } else if (cur_node == NULL) { + return first; + } + if (cur_node == NULL) { /* Current folder is not listed in .folders, return first. */ return first; } @@ -390,7 +389,7 @@ doit(char *cur, char *folders, char *sequences[]) if (strcmp(node->n_name, cur) == 0) { puts(" (*: current folder)"); } else { - puts(""); + putchar('\n'); } fflush(stdout);