#include <h/mh.h>
#include <h/utils.h>
-#define FALSE 0
-#define TRUE 1
-
/*
** We allocate space to record the names of folders
** (foldersToDo array), this number of elements at a time.
#define NOTOTALSW 12
{ "nototal", -7 },
#define VERSIONSW 13
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 14
{ "help", 0 },
{ NULL, 0 }
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 */
/* 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 */
/*
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
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);
return 1;
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 */
/*
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);
}
}
}
** 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;
}
** 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;
}
if (AddFolder(name, showzero) &&
(recurse || searchdepth) &&
st.st_nlink > 2)
- BuildFolderListRecurse(name, &st, searchdepth - 1);
+ BuildFolderListRecurse(name, &st,
+ searchdepth - 1);
}
}
closedir(dir);
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;
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 (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;
}
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
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] == '*' &&
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);
}
projects / mmh / blobdiff