Make sure to mark the sequence file as closed in the msgs struct.

[nmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index 4c0469edff755d822ca315ebb3d610fdd1120036..d0945fce76958ca60d9fdeb894f42ad207a4bf69 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -277,17 +277,17 @@ main(int argc, char **argv)
 void
 GetFolderOrder(void)
 {
 void
 GetFolderOrder(void)
 {

-    unsigned char *p, *s;
+    char *p, *s;

     int priority = 1;
     struct Folder *o;
 
     if (!(p = context_find("Flist-Order")))
        return;
     for (;;) {
     int priority = 1;
     struct Folder *o;
 
     if (!(p = context_find("Flist-Order")))
        return;
     for (;;) {

-       while (isspace(*p))
+       while (isspace((unsigned char) *p))

            ++p;
        s = p;
            ++p;
        s = p;

-       while (*p && !isspace(*p))
+       while (*p && !isspace((unsigned char) *p))

            ++p;
        if (p != s) {
            /* Found one. */
            ++p;
        if (p != s) {
            /* Found one. */


@@ -390,7 +390,7 @@ void
 BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 {
     char *base, name[PATH_MAX];
 BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 {
     char *base, name[PATH_MAX];

-    unsigned char *n;
+    char *n;

     int nlinks;
     DIR *dir;
     struct dirent *dp;
     int nlinks;
     DIR *dir;
     struct dirent *dp;


@@ -430,7 +430,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
        /* Check to see if the name of the file is a number
         * if it is, we assume it's a mail file and skip it
         */
        /* Check to see if the name of the file is a number
         * if it is, we assume it's a mail file and skip it
         */

-       for (n = dp->d_name; *n && isdigit(*n); n++);
+       for (n = dp->d_name; *n && isdigit((unsigned char) *n); n++);

        if (!*n)
            continue;
        strncpy (name, base, sizeof(name) - 2);
        if (!*n)
            continue;
        strncpy (name, base, sizeof(name) - 2);


@@ -468,7 +468,7 @@ AddFolder(char *name, int force)
     struct msgs *mp;
 
     /* Read folder and create message structure */
     struct msgs *mp;
 
     /* Read folder and create message structure */

-    if (!(mp = folder_read (name))) {
+    if (!(mp = folder_read (name, 0))) {

        /* Oops, error occurred.  Record it and continue. */
        AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
        f = &folders[nFolders++];
        /* Oops, error occurred.  Record it and continue. */
        AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
        f = &folders[nFolders++];