X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=71ae8e85aba5e26e51c9d1a0ff9e861c286d39ff;hp=847bb3652d20d7dcd3ef9422e8a75af319ed1478;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38

diff --git a/uip/flist.c b/uip/flist.c
index 847bb36..71ae8e8 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,9 +17,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-#define FALSE   0
-#define TRUE    1
-
 /*
 ** We allocate space to record the names of folders
 ** (foldersToDo array), this number of elements at a time.
@@ -55,7 +52,7 @@ static struct swit switches[] = {
 #define NOTOTALSW  12
 	{ "nototal", -7 },
 #define VERSIONSW  13
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  14
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -74,7 +71,7 @@ static struct Folder *orders = NULL;
 static int nOrders = 0;
 static int nOrdersAlloced = 0;
 static struct Folder *folders = NULL;
-static int nFolders = 0;
+static unsigned int nFolders = 0;
 static int nFoldersAlloced = 0;
 
 /* info on folders to search */
@@ -84,7 +81,7 @@ static int maxfolders;
 
 /* info on sequences to search for */
 static char *sequencesToDo[NUMATTRS];
-static int numsequences;
+static unsigned int numsequences;
 
 static int all = FALSE;  /* scan all folders in top level? */
 static int alphaOrder = FALSE;  /* want alphabetical order only */
@@ -369,7 +366,7 @@ BuildFolderList(char *dirName, int searchdepth)
 	** If base directory, don't add it to the
 	** folder list. We just recurse into it.
 	*/
-	if (!strcmp(dirName, ".")) {
+	if (strcmp(dirName, ".")==0) {
 		BuildFolderListRecurse(".", &st, 0);
 		return;
 	}
@@ -414,10 +411,11 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 	** A hack so that we don't see a
 	** leading "./" in folder names.
 	*/
-	base = strcmp(dirName, ".") ? dirName : dirName + 1;
+	base = (strcmp(dirName, ".")==0) ? dirName + 1 : dirName;
 
 	while (nlinks && (dp = readdir(dir))) {
-		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
+		if (strcmp(dp->d_name, ".")==0 ||
+				strcmp(dp->d_name, "..")==0) {
 			nlinks--;
 			continue;
 		}
@@ -459,7 +457,8 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 int
 AddFolder(char *name, int force)
 {
-	int i, msgnum, nonzero;
+	unsigned int i;
+	int msgnum, nonzero;
 	int seqnum[NUMATTRS], nSeq[NUMATTRS];
 	struct Folder *f;
 	struct msgs *mp;
@@ -531,8 +530,8 @@ void
 PrintFolders(void)
 {
 	char tmpname[BUFSIZ];
-	int i, j, len, has_private = 0;
-	int maxfolderlen = 0, maxseqlen = 0;
+	unsigned int i, j, len, has_private = 0;
+	unsigned int maxfolderlen = 0, maxseqlen = 0;
 	int maxnum = 0, maxseq = 0;
 
 	if (!Total) {
@@ -583,7 +582,7 @@ PrintFolders(void)
 		for (j = 0; j < numsequences; j++) {
 			if (folders[i].nSeq[j] > 0 || showzero) {
 				/* Add `+' to end of name of current folder */
-				if (strcmp(curfol, folders[i].name))
+				if (strcmp(curfol, folders[i].name)!=0)
 					snprintf(tmpname, sizeof(tmpname),
 							"%s", folders[i].name);
 				else
@@ -652,15 +651,15 @@ AssignPriority(char *name)
 	nl = strlen(name);
 	for (i = 0; i < nOrders; ++i) {
 		o = &orders[i];
-		if (!strcmp(name, o->name))
+		if (strcmp(name, o->name)==0)
 			return o->priority;
 		ol = strlen(o->name);
 		if (nl < ol - 1)
 			continue;
 		if (ol < bestLen)
 			continue;
-		if (o->name[0] == '*' && !strcmp(o->name + 1,
-				name + (nl - ol + 1))) {
+		if (o->name[0] == '*' &&
+				strcmp(o->name + 1, name + (nl - ol + 1))==0) {
 			best = o->priority;
 			bestLen = ol;
 		} else if (o->name[ol - 1] == '*' &&
@@ -687,7 +686,8 @@ do_readonly_folders(void)
 	atrlen = strlen(atrcur);
 
 	for (np = m_defs; np; np = np->n_next)
-		if (isprefix(atrcur, np->n_name)
-				&& !isprefix(nmhdir, np->n_name + atrlen))
+		if (strncmp(np->n_name, atrcur, atrlen)==0
+				&& strncmp(np->n_name+atrlen, nmhdir, strlen(nmhdir))!=0)
+			/* Why do we exclude absolute path names? --meillo */
 			BuildFolderList(np->n_name + atrlen, 0);
 }