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

diff --git a/uip/flist.c b/uip/flist.c
index 4bf3f82..847bb36 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -91,9 +91,9 @@ static int alphaOrder = FALSE;  /* want alphabetical order only */
 static int recurse = FALSE;  /* show nested folders? */
 static int showzero   = TRUE;  /* show folders even if no messages in seq? */
 static int Total = TRUE;  /* display info on number of messages in
-	* sequence found, and total num messages   */
+		* sequence found, and total num messages */
 
-static char curfolder[BUFSIZ];  /* name of the current folder */
+static char curfol[BUFSIZ];  /* name of the current folder */
 static char *nmhdir;  /* base nmh mail directory */
 
 /*
@@ -229,49 +229,48 @@ main(int argc, char **argv)
 				foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
 			}
 			if (*cp == '+' || *cp == '@') {
-				foldersToDo[numfolders++] =
-					pluspath(cp);
+				foldersToDo[numfolders++] = getcpy(expandfol(cp));
 			} else
 				foldersToDo[numfolders++] = cp;
 		}
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	/* get current folder */
-	strncpy(curfolder, getfolder(1), sizeof(curfolder));
+	strncpy(curfol, getcurfol(), sizeof(curfol));
 
 	/* get nmh base directory */
-	nmhdir = m_maildir("");
+	nmhdir = toabsdir("+");
 
 	/*
-	** If we didn't specify any sequences, we search
-	** for the "Unseen-Sequence" profile entry and use
-	** all the sequences defined there.  We check to
-	** make sure that the Unseen-Sequence entry doesn't
-	** contain more than NUMATTRS sequences.
+	** If no sequences specified, we use the `unseen' sequence(s)
+	** We check to make sure that the Unseen-Sequence entry doesn't
+	** contain too many sequences.
 	*/
 	if (numsequences == 0) {
-		if ((cp = context_find(usequence)) && *cp) {
-			char **ap, *dp;
+		char **ap, *dp;
 
-			dp = getcpy(cp);
-			ap = brkstring(dp, " ", "\n");
-			for (; ap && *ap; ap++) {
-				if (numsequences >= NUMATTRS)
-					adios(NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
-				else
-					sequencesToDo[numsequences++] = *ap;
+		if ((cp = context_find(usequence))) {
+			if (!*cp) {
+				adios(NULL, "profile entry %s set, but empty, and no sequence given", usequence);
 			}
 		} else {
-			adios(NULL, "no sequence specified or %s profile entry found", usequence);
+			cp = seq_unseen;  /* use default */
+		}
+		dp = getcpy(cp);
+		ap = brkstring(dp, " ", "\n");
+		for (; ap && *ap; ap++) {
+			if (numsequences >= NUMATTRS) {
+				adios(NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
+			} else {
+				sequencesToDo[numsequences++] = *ap;
+			}
 		}
 	}
 
 	GetFolderOrder();
 	ScanFolders();
-	qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
+	qsort(folders, nFolders, sizeof(struct Folder),
+			(qsort_comp) CompareFolders);
 	PrintFolders();
 	done(0);
 	return 1;
@@ -327,9 +326,8 @@ ScanFolders(void)
 
 	if (numfolders > 0) {
 		/* Update context */
-		strncpy(curfolder, foldersToDo[numfolders - 1],
-				sizeof(curfolder));
-		context_replace(pfolder, curfolder);/* update current folder */
+		strncpy(curfol, foldersToDo[numfolders - 1], sizeof(curfol));
+		context_replace(curfolder, curfol); /* update current folder */
 		context_save();  /* save the context file */
 
 		/*
@@ -341,20 +339,14 @@ ScanFolders(void)
 			BuildFolderList(foldersToDo[i], all ? 1 : 0);
 	} else {
 		if (all) {
-			/*
-			** Do the readonly folders
-			*/
+			/* Do the readonly folders */
 			do_readonly_folders();
 
-			/*
-			** Now scan the entire nmh directory for folders
-			*/
+			/* Now scan the entire nmh directory for folders */
 			BuildFolderList(".", 0);
 		} else {
-			/*
-			** Else scan current folder
-			*/
-			BuildFolderList(curfolder, 0);
+			/* Else scan current folder */
+			BuildFolderList(curfol, 0);
 		}
 	}
 }
@@ -452,7 +444,8 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 			if (AddFolder(name, showzero) &&
 					(recurse || searchdepth) &&
 					st.st_nlink > 2)
-				BuildFolderListRecurse(name, &st, searchdepth - 1);
+				BuildFolderListRecurse(name, &st,
+						searchdepth - 1);
 		}
 	}
 	closedir(dir);
@@ -576,7 +569,10 @@ PrintFolders(void)
 			if (folders[i].nSeq[j] > maxseq)
 				maxseq = folders[i].nSeq[j];
 
-			/* check if this sequence is private in any of the folders */
+			/*
+			** check if this sequence is private in any of
+			** the folders
+			*/
 			if (folders[i].private[j])
 				has_private = 1;
 		}
@@ -587,7 +583,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(curfolder, folders[i].name))
+				if (strcmp(curfol, folders[i].name))
 					snprintf(tmpname, sizeof(tmpname),
 							"%s", folders[i].name);
 				else
@@ -687,7 +683,7 @@ do_readonly_folders(void)
 	char atrcur[BUFSIZ];
 	register struct node *np;
 
-	snprintf(atrcur, sizeof(atrcur), "atr-%s-", current);
+	snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
 	atrlen = strlen(atrcur);
 
 	for (np = m_defs; np; np = np->n_next)