field = getcpy(field);
/* copied from seq_read.c:seq_init */
- for (ap = brkstring (field, " ", "\n"); *ap; ap++) {
+ for (ap = brkstring(field, " ", "\n"); *ap; ap++) {
if ((cp = strchr(*ap, '-')))
*cp++ = '\0';
- if ((j = m_atoi (*ap)) > 0) {
- k = cp ? m_atoi (cp) : j;
+ if ((j = m_atoi(*ap)) > 0) {
+ k = cp ? m_atoi(cp) : j;
total += k - j + 1;
}
static char *
get_msgnums(char *folder, char *sequences[])
{
- char *seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);
+ char *seqfile = concat(toabsdir(folder), "/", mh_seq, (void *)NULL);
FILE *fp = fopen(seqfile, "r");
int state;
char name[NAMESZ], field[BUFSIZ];
/* copied from seq_read.c:seq_public */
for (state = FLD;;) {
- switch (state = m_getfld (state, name, field, sizeof(field), fp)) {
- case FLD:
- case FLDPLUS:
- case FLDEOF:
- if (state == FLDPLUS) {
- cp = getcpy (field);
- while (state == FLDPLUS) {
- state = m_getfld (state, name,
- field,
- sizeof(field),
- fp);
- cp = add (field, cp);
- }
+ switch (state = m_getfld(state, name, field, sizeof(field),
+ fp)) {
+ case FLD:
+ case FLDPLUS:
+ case FLDEOF:
+ if (state == FLDPLUS) {
+ cp = getcpy(field);
+ while (state == FLDPLUS) {
+ state = m_getfld(state, name, field,
+ sizeof(field), fp);
+ cp = add(field, cp);
+ }
- /*
- ** Here's where we differ from
- ** seq_public: if it's in a
- ** sequence we want, save the list
- ** of messages.
- */
- if (seq_in_list(name, sequences)) {
- this_msgnums = trimcpy(cp);
- if (msgnums == NULL) {
- msgnums = this_msgnums;
- } else {
- old_msgnums = msgnums;
- msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
- free(old_msgnums);
- free(this_msgnums);
- }
+ /*
+ ** Here's where we differ from
+ ** seq_public: if it's in a
+ ** sequence we want, save the list
+ ** of messages.
+ */
+ if (seq_in_list(name, sequences)) {
+ this_msgnums = trimcpy(cp);
+ if (msgnums == NULL) {
+ msgnums = this_msgnums;
+ } else {
+ old_msgnums = msgnums;
+ msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
+ free(old_msgnums);
+ free(this_msgnums);
}
- free (cp);
- } else {
- /* and here */
- if (seq_in_list(name, sequences)) {
- this_msgnums = trimcpy(field);
- if (msgnums == NULL) {
- msgnums = this_msgnums;
- } else {
- old_msgnums = msgnums;
- msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
- free(old_msgnums);
- free(this_msgnums);
- }
+ }
+ free(cp);
+ } else {
+ /* and here */
+ if (seq_in_list(name, sequences)) {
+ this_msgnums = trimcpy(field);
+ if (msgnums == NULL) {
+ msgnums = this_msgnums;
+ } else {
+ old_msgnums = msgnums;
+ msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL);
+ free(old_msgnums);
+ free(this_msgnums);
}
}
+ }
- if (state == FLDEOF)
- break;
- continue;
+ if (state == FLDEOF)
+ break;
+ continue;
- case BODY:
- case BODYEOF:
- adios (NULL, "no blank lines are permitted in %s", seqfile);
- /* fall */
+ case BODY:
+ case BODYEOF:
+ adios(NULL, "no blank lines are permitted in %s",
+ seqfile);
+ /* fall */
- case FILEEOF:
- break;
+ case FILEEOF:
+ break;
- default:
- adios (NULL, "%s is poorly formatted", seqfile);
+ default:
+ adios(NULL, "%s is poorly formatted", seqfile);
}
break; /* break from for loop */
}
b.sequences = sequences;
if (folders == NULL) {
- chdir(m_maildir(""));
+ chdir(toabsdir("+"));
crawl_folders(".", crawl_callback, &b);
} else {
fp = fopen(folders, "r");
static struct node *
doit(char *cur, char *folders, char *sequences[])
{
- struct node *first, *cur_node, *node, *last, *prev;
+ struct node *first, *cur_node, *node, *last = NULL, *prev;
size_t folder_len;
int count, total = 0;
char *command = NULL, *sequences_s = NULL;
count = count_messages(node->n_field);
total += count;
- printf("%-*s %6d.%c %s\n",
- (int) folder_len, node->n_name,
- count,
- (strcmp(node->n_name, cur) == 0 ? '*' : ' '),
- node->n_field);
+ printf("%-*s %6d.%c %s\n", (int) folder_len,
+ node->n_name, count,
+ (strcmp(node->n_name, cur) == 0 ? '*' : ' '),
+ node->n_field);
}
}
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
- arguments = getarguments (invo_name, argc, argv, 1);
+ arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
/*
*/
while ((cp = *argp++)) {
if (*cp == '-') {
- switch (smatch (++cp, switches)) {
+ switch (smatch(++cp, switches)) {
case AMBIGSW:
- ambigsw (cp, switches);
- done (1);
+ ambigsw(cp, switches);
+ done(1);
case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
+ adios(NULL, "-%s unknown", cp);
case HELPSW:
- snprintf (help, sizeof(help),
+ snprintf(help, sizeof(help),
"%s [switches] [sequences]",
invo_name);
- print_help (help, switches, 1);
- done (1);
+ print_help(help, switches, 1);
+ done(1);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done(1);
case FOLDERSSW:
if (!(folders = *argp++) || *folders == '-')
if (!(invo_name = *argp++) || *invo_name == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- invo_name = r1bindex(invo_name, '/');
+ invo_name = mhbasename(invo_name);
continue;
}
}
/* will flists */
} else {
if (folders[0] != '/') {
- folders = m_maildir(folders);
+ folders = toabsdir(folders);
}
}
if (i == 0) {
+ char *dp;
/* no sequence arguments; use unseen */
- unseen = context_find(usequence);
- if (unseen == NULL || unseen[0] == '\0') {
- adios(NULL, "must specify sequences or set %s", usequence);
+ if ((unseen = context_find(usequence))) {
+ if (!*unseen) {
+ adios(NULL, "profile entry %s set, but empty, and no sequences given", usequence);
+ }
+ } else {
+ unseen = seq_unseen; /* use default */
}
- for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {
+ dp = getcpy(unseen);
+ for (ap = brkstring(dp, " ", "\n"); *ap; ap++) {
sequences[i++] = *ap;
}
}
sequences[i] = NULL;
- folder = doit(context_find(pfolder), folders, sequences);
+ folder = doit(context_find(curfolder), folders, sequences);
if (folder == NULL) {
done(0);
return 1;
** has in memory. So, we'll be lame, too. I'm not sure if i
** should just change context_replace...
*/
- context_replace(pfolder, "defeat_context_replace_optimization");
+ context_replace(curfolder, "defeat_context_replace_optimization");
}
/* update current folder */
- context_replace(pfolder, folder->n_name);
+ context_replace(curfolder, folder->n_name);
if (run_mode == FNEXT || run_mode == FPREV) {
printf("%s %s\n", folder->n_name, folder->n_field);
context_save();
- done (0);
+ done(0);
return 1;
}