X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=71ae8e85aba5e26e51c9d1a0ff9e861c286d39ff;hp=17916fb29ee061e3d9d14a3f03def3dcce6cd540;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/uip/flist.c b/uip/flist.c index 17916fb..71ae8e8 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -17,9 +17,6 @@ #include #include -#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,16 +81,16 @@ 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 */ 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 */ /* @@ -128,7 +125,7 @@ main(int argc, char **argv) #ifdef LOCALE setlocale(LC_ALL, ""); #endif - invo_name = r1bindex(argv[0], '/'); + invo_name = mhbasename(argv[0]); /* read user profile/context */ context_read(); @@ -137,16 +134,17 @@ main(int argc, char **argv) ** If program was invoked with name ending ** in `s', then add switch `-all'. */ - if (argv[0][strlen (argv[0]) - 1] == 's') + if (argv[0][strlen(argv[0]) - 1] == 's') all = TRUE; - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; /* allocate the initial space to record the folder names */ numfolders = 0; maxfolders = MAXFOLDERS; - foldersToDo = (char **) mh_xmalloc ((size_t) (maxfolders * sizeof(*foldersToDo))); + foldersToDo = (char **) mh_xmalloc((size_t) + (maxfolders * sizeof(*foldersToDo))); /* no sequences yet */ numsequences = 0; @@ -162,21 +160,21 @@ main(int argc, char **argv) adios(NULL, "-%s unknown", cp); case HELPSW: - snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", - invo_name); + snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", invo_name); print_help(buf, switches, 1); done(1); case VERSIONSW: print_version(invo_name); - done (1); + done(1); case SEQSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", + argp[-2]); /* check if too many sequences specified */ if (numsequences >= NUMATTRS) - adios (NULL, "too many sequences (more than %d) specified", NUMATTRS); + adios(NULL, "too many sequences (more than %d) specified", NUMATTRS); sequencesToDo[numsequences++] = cp; break; @@ -225,56 +223,53 @@ main(int argc, char **argv) */ if (numfolders >= maxfolders) { maxfolders += MAXFOLDERS; - foldersToDo = (char **) mh_xrealloc (foldersToDo, - (size_t) (maxfolders * sizeof(*foldersToDo))); + 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); + done(0); return 1; } @@ -323,14 +318,14 @@ ScanFolders(void) /* * change directory to base of nmh directory */ - if (chdir (nmhdir) == NOTOK) - adios (nmhdir, "unable to change directory to"); + if (chdir(nmhdir) == NOTOK) + adios(nmhdir, "unable to change directory to"); if (numfolders > 0) { /* Update context */ - strncpy (curfolder, foldersToDo[numfolders - 1], sizeof(curfolder)); - context_replace (pfolder, curfolder);/* update current folder */ - context_save (); /* save the context file */ + strncpy(curfol, foldersToDo[numfolders - 1], sizeof(curfol)); + context_replace(curfolder, curfol); /* update current folder */ + context_save(); /* save the context file */ /* ** Scan each given folder. If -all is given, @@ -341,20 +336,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); } } } @@ -377,8 +366,8 @@ BuildFolderList(char *dirName, int searchdepth) ** If base directory, don't add it to the ** folder list. We just recurse into it. */ - if (!strcmp (dirName, ".")) { - BuildFolderListRecurse (".", &st, 0); + if (strcmp(dirName, ".")==0) { + BuildFolderListRecurse(".", &st, 0); return; } @@ -387,7 +376,8 @@ BuildFolderList(char *dirName, int searchdepth) ** If recursing and directory has subfolders, ** then build folder list for subfolders. */ - if (AddFolder(dirName, showzero) && (recurse || searchdepth) && st.st_nlink > 2) + if (AddFolder(dirName, showzero) && (recurse || searchdepth) && + st.st_nlink > 2) BuildFolderListRecurse(dirName, &st, searchdepth - 1); } @@ -421,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; } @@ -436,7 +427,7 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth) for (n = dp->d_name; *n && isdigit(*n); n++); if (!*n) continue; - strncpy (name, base, sizeof(name) - 2); + strncpy(name, base, sizeof(name) - 2); if (*base) strcat(name, "/"); strncat(name, dp->d_name, sizeof(name) - strlen(name) - 1); @@ -445,13 +436,14 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth) ** Check if this was really a symbolic link pointing ** to a directory. If not, then decrement link count. */ - if (lstat (name, &st) == -1) + if (lstat(name, &st) == -1) nlinks--; /* Add this folder to the list */ if (AddFolder(name, showzero) && (recurse || searchdepth) && st.st_nlink > 2) - BuildFolderListRecurse(name, &st, searchdepth - 1); + BuildFolderListRecurse(name, &st, + searchdepth - 1); } } closedir(dir); @@ -465,13 +457,14 @@ 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; /* Read folder and create message structure */ - if (!(mp = folder_read (name))) { + if (!(mp = folder_read(name))) { /* Oops, error occurred. Record it and continue. */ AllocFolders(&folders, &nFoldersAlloced, nFolders + 1); f = &folders[nFolders++]; @@ -491,7 +484,8 @@ AddFolder(char *name, int force) /* Now count messages in this sequence */ nSeq[i] = 0; if (mp->nummsg > 0 && seqnum[i] != -1) { - for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; msgnum++) { + for (msgnum = mp->lowmsg; msgnum <= mp->hghmsg; + msgnum++) { if (in_sequence(mp, seqnum[i], msgnum)) nSeq[i]++; } @@ -519,11 +513,12 @@ AddFolder(char *name, int force) /* record the sequence information */ for (i = 0; i < numsequences; i++) { f->nSeq[i] = nSeq[i]; - f->private[i] = (seqnum[i] != -1) ? is_seq_private(mp, seqnum[i]) : 0; + f->private[i] = (seqnum[i] != -1) ? + is_seq_private(mp, seqnum[i]) : 0; } } - folder_free (mp); /* free folder/message structure */ + folder_free(mp); /* free folder/message structure */ return 1; } @@ -535,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) { @@ -564,15 +559,19 @@ PrintFolders(void) for (j = 0; j < numsequences; j++) { /* find maximum width of sequence name */ - len = strlen (sequencesToDo[j]); - if ((folders[i].nSeq[j] > 0 || showzero) && (len > maxseqlen)) + len = strlen(sequencesToDo[j]); + if ((folders[i].nSeq[j] > 0 || showzero) && + (len > maxseqlen)) maxseqlen = len; /* find the maximum number of messages in sequence */ 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; } @@ -583,22 +582,22 @@ 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)) - snprintf(tmpname, sizeof(tmpname), "%s", folders[i].name); + if (strcmp(curfol, folders[i].name)!=0) + snprintf(tmpname, sizeof(tmpname), + "%s", folders[i].name); else - snprintf(tmpname, sizeof(tmpname), "%s+", folders[i].name); + snprintf(tmpname, sizeof(tmpname), + "%s+", + folders[i].name); if (folders[i].error) { - printf("%-*s is unreadable\n", maxfolderlen+1, tmpname); + printf("%-*s is unreadable\n", + maxfolderlen+1, + tmpname); continue; } - printf("%-*s has %*d in sequence %-*s%s; out of %*d\n", - maxfolderlen+1, tmpname, - num_digits(maxseq), folders[i].nSeq[j], - maxseqlen, sequencesToDo[j], - !has_private ? "" : folders[i].private[j] ? " (private)" : " ", - num_digits(maxnum), folders[i].nMsgs); + printf("%-*s has %*d in sequence %-*s%s; out of %*d\n", maxfolderlen+1, tmpname, num_digits(maxseq), folders[i].nSeq[j], maxseqlen, sequencesToDo[j], !has_private ? "" : folders[i].private[j] ? " (private)" : " ", num_digits(maxnum), folders[i].nMsgs); } } } @@ -628,10 +627,12 @@ AllocFolders(struct Folder **f, int *nfa, int n) return; if (*f == NULL) { *nfa = 10; - *f = (struct Folder *) mh_xmalloc (*nfa * (sizeof(struct Folder))); + *f = (struct Folder *) mh_xmalloc( + *nfa * (sizeof(struct Folder))); } else { *nfa *= 2; - *f = (struct Folder *) mh_xrealloc (*f, *nfa * (sizeof(struct Folder))); + *f = (struct Folder *) mh_xrealloc( + *f, *nfa * (sizeof(struct Folder))); } } @@ -650,17 +651,19 @@ 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] == '*' && strncmp(o->name, name, ol - 1) == 0) { + } else if (o->name[ol - 1] == '*' && + strncmp(o->name, name, ol - 1) == 0) { best = o->priority; bestLen = ol; } @@ -673,17 +676,18 @@ AssignPriority(char *name) */ static void -do_readonly_folders (void) +do_readonly_folders(void) { int atrlen; char atrcur[BUFSIZ]; register struct node *np; - snprintf (atrcur, sizeof(atrcur), "atr-%s-", current); - atrlen = strlen (atrcur); + snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur); + atrlen = strlen(atrcur); for (np = m_defs; np; np = np->n_next) - if (ssequal (atrcur, np->n_name) - && !ssequal (nmhdir, np->n_name + atrlen)) - BuildFolderList (np->n_name + atrlen, 0); + 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); }