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

diff --git a/uip/flist.c b/uip/flist.c
index bced89f..b5226ce 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,6 +17,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 #define FALSE   0
 #define TRUE    1
@@ -58,7 +59,7 @@ static struct swit switches[] = {
 #define VERSIONSW	13
     { "version", 0 },
 #define HELPSW          14
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -113,7 +114,6 @@ int AddFolder(char *, int);
 void BuildFolderList(char *, int);
 void BuildFolderListRecurse(char *, struct stat *, int);
 void PrintFolders(void);
-static int num_digits (int);
 void AllocFolders(struct Folder **, int *, int);
 int AssignPriority(char *);
 static void do_readonly_folders(void);
@@ -148,8 +148,7 @@ main(int argc, char **argv)
     /* allocate the initial space to record the folder names */
     numfolders = 0;
     maxfolders = MAXFOLDERS;
-    if (!(foldersToDo = (char **) malloc ((size_t) (maxfolders * sizeof(*foldersToDo)))))
-	adios (NULL, "unable to allocate folder storage");
+    foldersToDo = (char **) mh_xmalloc ((size_t) (maxfolders * sizeof(*foldersToDo)));
 
     /* no sequences yet */
     numsequences = 0;
@@ -228,13 +227,12 @@ main(int argc, char **argv)
 	     */
 	    if (numfolders >= maxfolders) {
 		maxfolders += MAXFOLDERS;
-		if (!(foldersToDo = (char **) realloc (foldersToDo,
-			(size_t) (maxfolders * sizeof(*foldersToDo)))))
-		    adios (NULL, "unable to reallocate folder name storage");
+		foldersToDo = (char **) mh_xrealloc (foldersToDo,
+		    (size_t) (maxfolders * sizeof(*foldersToDo)));
 	    }
 	    if (*cp == '+' || *cp == '@') {
 		foldersToDo[numfolders++] =
-		    path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		    pluspath (cp);
 	    } else
 		foldersToDo[numfolders++] = cp;
 	}
@@ -279,6 +277,7 @@ main(int argc, char **argv)
     qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
     PrintFolders();
     done (0);
+    return 1;
 }
 
 /*
@@ -289,7 +288,7 @@ main(int argc, char **argv)
 void
 GetFolderOrder(void)
 {
-    char *p, *s;
+    unsigned char *p, *s;
     int priority = 1;
     struct Folder *o;
 
@@ -306,7 +305,7 @@ GetFolderOrder(void)
 	    AllocFolders(&orders, &nOrdersAlloced, nOrders + 1);
 	    o = &orders[nOrders++];
 	    o->priority = priority++;
-	    o->name = (char *) malloc(p - s + 1);
+	    o->name = (char *) mh_xmalloc(p - s + 1);
 	    strncpy(o->name, s, p - s);
 	    o->name[p - s] = 0;
 	} else
@@ -402,6 +401,7 @@ void
 BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 {
     char *base, name[PATH_MAX];
+    unsigned char *n;
     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, "/");
@@ -600,29 +606,6 @@ PrintFolders(void)
 }
 
 /*
- * Calculate the number of digits in a nonnegative integer
- */
-static int
-num_digits (int n)
-{
-    int ndigits = 0;
-
-    /* Sanity check */
-    if (n < 0)
-	adios (NULL, "oops, num_digits called with negative value");
-
-    if (n == 0)
-	return 1;
-
-    while (n) {
-	n /= 10;
-	ndigits++;
-    }
-
-    return ndigits;
-}
-
-/*
  * Put them in priority order.
  */
 
@@ -646,10 +629,10 @@ AllocFolders(struct Folder **f, int *nfa, int n)
 	return;
     if (*f == NULL) {
 	*nfa = 10;
-	*f = (struct Folder *) malloc (*nfa * (sizeof(struct Folder)));
+	*f = (struct Folder *) mh_xmalloc (*nfa * (sizeof(struct Folder)));
     } else {
 	*nfa *= 2;
-	*f = (struct Folder *) realloc (*f, *nfa * (sizeof(struct Folder)));
+	*f = (struct Folder *) mh_xrealloc (*f, *nfa * (sizeof(struct Folder)));
     }
 }
 
@@ -697,10 +680,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);