** Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new
*/
+#include <h/mh.h>
+#include <h/crawl_folders.h>
+#include <h/utils.h>
#include <sys/types.h>
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#include <h/mh.h>
-#include <h/crawl_folders.h>
-#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define MODESW 0
- { "mode", 1 },
+ { "mode", 0 },
#define FOLDERSSW 1
- { "folders", 1 },
+ { "folders", 0 },
#define VERSIONSW 2
- { "Version", 1 },
+ { "Version", 0 },
#define HELPSW 3
- { "help", 1 },
+ { "help", 0 },
{ NULL, 0 }
};
+char *version=VERSION;
+
static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
/*
int j, k;
char *cp, **ap;
- field = getcpy(field);
+ field = mh_xstrdup(field);
/* copied from seq_read.c:seq_init */
for (ap = brkstring(field, " ", "\n"); *ap; ap++) {
}
}
- free(field);
+ mh_free0(&field);
return total;
}
static char *
get_msgnums(char *folder, char *sequences[])
{
+ enum state state;
+ struct field f = {{0}};
char *seqfile = concat(toabsdir(folder), "/", mh_seq, (void *)NULL);
FILE *fp = fopen(seqfile, "r");
- int state;
- char name[NAMESZ], field[BUFSIZ];
- char *cp;
char *msgnums = NULL, *this_msgnums, *old_msgnums;
/* no sequences file -> no messages */
return NULL;
}
- /* 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);
- }
+ for (state = FLD2;;) {
+ switch (state = m_getfld2(state, &f, fp)) {
+ case LENERR2:
+ state = FLD2;
+ /* FALL */
- /*
- ** 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);
- }
+ case FLD2:
+ /*
+ ** if it's in a sequence we want,
+ ** save the list of messages.
+ */
+ if (seq_in_list(f.name, sequences)) {
+ this_msgnums = trimcpy(f.value);
+ if (msgnums == NULL) {
+ msgnums = this_msgnums;
+ } else {
+ old_msgnums = msgnums;
+ msgnums = concat(old_msgnums, " ",
+ this_msgnums,
+ NULL);
+ mh_free0(&old_msgnums);
+ mh_free0(&this_msgnums);
}
}
-
- if (state == FLDEOF)
- break;
continue;
- case BODY:
- case BODYEOF:
- adios(NULL, "no blank lines are permitted in %s",
- seqfile);
- /* fall */
+ case BODY2:
+ adios(EX_DATAERR, NULL, "no blank lines are permitted in %s", seqfile);
+ /* FALL */
- case FILEEOF:
+ case FILEEOF2:
break;
default:
- adios(NULL, "%s is poorly formatted", seqfile);
+ adios(EX_SOFTWARE, NULL, "%s is poorly formatted", seqfile);
}
- break; /* break from for loop */
+ break;
}
fclose(fp);
if (is_cur || msgnums != NULL) {
if (*b->first == NULL) {
- *b->first = b->node = mh_xmalloc(sizeof(*b->node));
+ *b->first = b->node = mh_xcalloc(1, sizeof(*b->node));
} else {
- b->node->n_next = mh_xmalloc(sizeof(*b->node));
+ b->node->n_next = mh_xcalloc(1, sizeof(*b->node));
b->node = b->node->n_next;
}
b->node->n_name = folder;
} else {
fp = fopen(folders, "r");
if (fp == NULL) {
- adios(NULL, "failed to read %s", folders);
+ adios(EX_IOERR, NULL, "failed to read %s", folders);
}
while (vfgets(fp, &line) == OK) {
len = strlen(line) - 1;
line[len] = '\0';
- check_folder(getcpy(line), len, &b);
+ check_folder(mh_xstrdup(line), len, &b);
}
fclose(fp);
}
for (i = 0; sequences[i] != NULL; i++) {
len += strlen(sequences[i]) + 1;
}
- result = mh_xmalloc(len + 1);
+ result = mh_xcalloc(len + 1, sizeof(char));
for (i = 0, cp = result; sequences[i] != NULL; i++, cp += len + 1) {
len = strlen(sequences[i]);
struct node *first, *cur_node, *node, *last = NULL, *prev;
size_t folder_len;
int count, total = 0;
- char *command = NULL, *sequences_s = NULL;
+ char *sequences_s = NULL;
+ int argc = 0;
+ char *argv[MAXARGS];
+ char **seqp;
+ char buf[BUFSIZ];
if (cur == NULL || cur[0] == '\0') {
cur = "inbox";
}
fflush(stdout);
- /*
- ** TODO: Split enough of scan.c out so that we can
- ** call it here.
- */
- command = concat("scan +", node->n_name, " ",
- sequences_s, (void *)NULL);
- system(command);
- free(command);
+ argc = 0;
+ argv[argc++] = "scan";
+ snprintf(buf, sizeof buf, "+%s", node->n_name);
+ argv[argc++] = buf;
+ for (seqp=sequences; *seqp; seqp++) {
+ argv[argc++] = *seqp;
+ }
+ argv[argc] = (char *)NULL;
+ execprog(*argv, argv);
} else {
if (node->n_field == NULL) {
continue;
sequences[0] = NULL;
sequences[1] = NULL;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
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(help, sizeof(help),
"%s [switches] [sequences]",
invo_name);
print_help(help, 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 FOLDERSSW:
if (!(folders = *argp++) || *folders == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
case MODESW:
if (!(invo_name = *argp++) || *invo_name == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
invo_name = mhbasename(invo_name);
continue;
/* no sequence arguments; use unseen */
if ((unseen = context_find(usequence))) {
if (!*unseen) {
- adios(NULL, "profile entry %s set, but empty, and no sequences given", usequence);
+ adios(EX_CONFIG, NULL, "profile entry %s set, but empty, and no sequences given", usequence);
}
} else {
unseen = seq_unseen; /* use default */
}
- dp = getcpy(unseen);
+ dp = mh_xstrdup(unseen);
for (ap = brkstring(dp, " ", "\n"); *ap; ap++) {
sequences[i++] = *ap;
}
folder = doit(context_find(curfolder), folders, sequences);
if (folder == NULL) {
- done(0);
+ exit(EX_OK);
return 1;
}
context_save();
- done(0);
- return 1;
+ return 0;
}
projects / mmh / blobdiff