Renamed all standard sequences (e.g. cur->c) and made them globally changeable

[mmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index d2a0490..847bb36 100644 (file)
--- 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;
+                       }
                }
        }
 
@@ -681,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)