X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fflist.c;h=408f60820dc4f4df6cdc7fdc4465a2be55832831;hb=d72dc17f4164fd8a3e3c56a74a66a21138d82814;hp=bced89fd26b99d0f9803b0be86319a72a0e6b5c4;hpb=38efa847bbbb0f0bfaca90d7665bfe21de725f99;p=mmh

diff --git a/uip/flist.c b/uip/flist.c
index bced89f..408f608 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -58,7 +58,7 @@ static struct swit switches[] = {
 #define VERSIONSW	13
     { "version", 0 },
 #define HELPSW          14
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -278,7 +278,7 @@ main(int argc, char **argv)
     ScanFolders();
     qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
     PrintFolders();
-    done (0);
+    return done (0);
 }
 
 /*
@@ -401,7 +401,7 @@ BuildFolderList(char *dirName, int searchdepth)
 void
 BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 {
-    char *base, name[PATH_MAX];
+    char *base, *n, name[PATH_MAX];
     int nlinks;
     DIR *dir;
     struct dirent *dp;
@@ -432,6 +432,12 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 	}
 	if (dp->d_name[0] == '.')
 	    continue;
+	/* 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++);
+	if (!*n)
+	    continue;
 	strncpy (name, base, sizeof(name) - 2);
 	if (*base)
 	    strcat(name, "/");
@@ -697,10 +703,6 @@ do_readonly_folders (void)
     char atrcur[BUFSIZ];
     register struct node *np;
 
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-	adios (NULL, "oops, context hasn't been read yet");
-
     snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
     atrlen = strlen (atrcur);