X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=73ad5f298c74eefbb11ebe668932dbcb7820eadb;hp=4bf3f82ccbf6d73a03215eb9b0f72c8c949ba5ed;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=240013872c392fe644bd4f79382d9f5314b4ea60 diff --git a/uip/flist.c b/uip/flist.c index 4bf3f82..73ad5f2 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -16,9 +16,12 @@ #include #include - -#define FALSE 0 -#define TRUE 1 +#include +#include +#include +#include +#include +#include /* ** We allocate space to record the names of folders @@ -33,34 +36,32 @@ static struct swit switches[] = { #define ALLSW 1 { "all", 0 }, #define NOALLSW 2 - { "noall", 0 }, + { "noall", 2 }, #define RECURSE 3 { "recurse", 0 }, #define NORECURSE 4 - { "norecurse", 0 }, + { "norecurse", 2 }, #define SHOWZERO 5 { "showzero", 0 }, #define NOSHOWZERO 6 - { "noshowzero", 0 }, + { "noshowzero", 2 }, #define ALPHASW 7 { "alpha", 0 }, #define NOALPHASW 8 - { "noalpha", 0 }, + { "noalpha", 2 }, #define FASTSW 9 { "fast", 0 }, #define NOFASTSW 10 - { "nofast", 0 }, -#define TOTALSW 11 - { "total", -5 }, -#define NOTOTALSW 12 - { "nototal", -7 }, -#define VERSIONSW 13 - { "version", 0 }, -#define HELPSW 14 + { "nofast", 2 }, +#define VERSIONSW 11 + { "Version", 0 }, +#define HELPSW 12 { "help", 0 }, { NULL, 0 } }; +char *version=VERSION; + struct Folder { char *name; /* name of folder */ int priority; @@ -74,7 +75,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 +85,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 */ +static int fastsw = FALSE; /* display info on number of messages in + * 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 */ /* @@ -125,9 +126,7 @@ main(int argc, char **argv) char **arguments; char buf[BUFSIZ]; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -146,8 +145,7 @@ main(int argc, char **argv) /* allocate the initial space to record the folder names */ numfolders = 0; maxfolders = MAXFOLDERS; - foldersToDo = (char **) mh_xmalloc((size_t) - (maxfolders * sizeof(*foldersToDo))); + foldersToDo = mh_xcalloc(maxfolders, sizeof(*foldersToDo)); /* no sequences yet */ numsequences = 0; @@ -158,26 +156,27 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); + case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case SEQSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, 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(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS); sequencesToDo[numsequences++] = cp; break; @@ -202,14 +201,11 @@ main(int argc, char **argv) alphaOrder = FALSE; break; - case NOFASTSW: - case TOTALSW: - Total = TRUE; - break; - case FASTSW: - case NOTOTALSW: - Total = FALSE; + fastsw = TRUE; + break; + case NOFASTSW: + fastsw = FALSE; break; case RECURSE: @@ -226,55 +222,53 @@ main(int argc, char **argv) */ if (numfolders >= maxfolders) { maxfolders += MAXFOLDERS; - foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo))); + foldersToDo = mh_xrealloc(foldersToDo, maxfolders * sizeof(*foldersToDo)); } if (*cp == '+' || *cp == '@') { - foldersToDo[numfolders++] = - pluspath(cp); + foldersToDo[numfolders++] = mh_xstrdup(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(EX_CONFIG, 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 = mh_xstrdup(cp); + ap = brkstring(dp, " ", "\n"); + for (; ap && *ap; ap++) { + if (numsequences >= NUMATTRS) { + adios(EX_USAGE, 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; + return EX_OK; } /* @@ -302,7 +296,7 @@ GetFolderOrder(void) AllocFolders(&orders, &nOrdersAlloced, nOrders + 1); o = &orders[nOrders++]; o->priority = priority++; - o->name = (char *) mh_xmalloc(p - s + 1); + o->name = mh_xcalloc(p - s + 1, sizeof(char)); strncpy(o->name, s, p - s); o->name[p - s] = 0; } else @@ -323,13 +317,12 @@ ScanFolders(void) * change directory to base of nmh directory */ if (chdir(nmhdir) == NOTOK) - adios(nmhdir, "unable to change directory to"); + adios(EX_OSERR, 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 */ + strncpy(curfol, foldersToDo[numfolders - 1], sizeof(curfol)); + context_replace(curfolder, curfol); /* update current folder */ context_save(); /* save the context file */ /* @@ -341,20 +334,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,7 +364,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; } @@ -416,16 +403,17 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth) nlinks = s->st_nlink; if (!(dir = opendir(dirName))) - adios(dirName, "can't open directory"); + adios(EX_IOERR, dirName, "can't open directory"); /* ** 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; } @@ -452,7 +440,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); @@ -466,7 +455,8 @@ 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; @@ -476,7 +466,7 @@ AddFolder(char *name, int force) /* Oops, error occurred. Record it and continue. */ AllocFolders(&folders, &nFoldersAlloced, nFolders + 1); f = &folders[nFolders++]; - f->name = getcpy(name); + f->name = mh_xstrdup(name); f->error = 1; f->priority = AssignPriority(f->name); return 0; @@ -513,7 +503,7 @@ AddFolder(char *name, int force) /* save general folder information */ AllocFolders(&folders, &nFoldersAlloced, nFolders + 1); f = &folders[nFolders++]; - f->name = getcpy(name); + f->name = mh_xstrdup(name); f->nMsgs = mp->nummsg; f->error = 0; f->priority = AssignPriority(f->name); @@ -538,11 +528,11 @@ 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) { + if (fastsw) { for (i = 0; i < nFolders; i++) printf("%s\n", folders[i].name); return; @@ -576,7 +566,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 +580,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)!=0) snprintf(tmpname, sizeof(tmpname), "%s", folders[i].name); else @@ -632,12 +625,10 @@ AllocFolders(struct Folder **f, int *nfa, int n) return; if (*f == NULL) { *nfa = 10; - *f = (struct Folder *) mh_xmalloc( - *nfa * (sizeof(struct Folder))); + *f = mh_xcalloc(*nfa, sizeof(struct Folder)); } else { *nfa *= 2; - *f = (struct Folder *) mh_xrealloc( - *f, *nfa * (sizeof(struct Folder))); + *f = mh_xrealloc(*f, *nfa * sizeof(struct Folder)); } } @@ -656,15 +647,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] == '*' && @@ -685,13 +676,14 @@ do_readonly_folders(void) { int atrlen; char atrcur[BUFSIZ]; - register struct node *np; + 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); }