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

diff --git a/uip/flist.c b/uip/flist.c
index d2a0490..c98a3f0 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -242,26 +242,28 @@ main(int argc, char **argv)
 	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;
+			}
 		}
 	}
 
@@ -367,7 +369,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;
 	}
@@ -412,10 +414,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;
 		}
@@ -581,7 +584,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
@@ -650,15 +653,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] == '*' &&
@@ -681,11 +684,12 @@ 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)
-		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);
 }