X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=d2a0490338c4edb55d5ad2094572c336a60da2be;hp=88cac0639ab01db8bfb4f788a65961a10504a222;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4

diff --git a/uip/flist.c b/uip/flist.c
index 88cac06..d2a0490 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,18 +229,17 @@ 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;
 		}
 	}
 
 	/* get current folder */
-	strncpy(curfolder, getfolder(FCUR), 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
@@ -268,7 +267,8 @@ main(int argc, char **argv)
 
 	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;
@@ -324,9 +324,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 */
 
 		/*
@@ -338,20 +337,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);
 		}
 	}
 }
@@ -449,7 +442,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);
@@ -573,7 +567,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;
 		}
@@ -584,7 +581,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