X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fnew.c;h=5bc71366b42aa8c9e5946161ba654ec9092fa2f4;hp=7c3191aa93c519dab359a98e8c97d9486632d76c;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=bd60514e13b4b1d4e2f726e6fc54da9eff6a263e diff --git a/uip/new.c b/uip/new.c index 7c3191a..5bc7136 100644 --- a/uip/new.c +++ b/uip/new.c @@ -10,15 +10,16 @@ ** Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new */ +#include +#include +#include #include - #include #include #include - -#include -#include -#include +#include +#include +#include static struct swit switches[] = { #define MODESW 0 @@ -54,7 +55,7 @@ count_messages(char *field) 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++) { @@ -67,7 +68,7 @@ count_messages(char *field) } } - free(field); + mh_free0(&field); return total; } @@ -112,9 +113,8 @@ get_msgnums(char *folder, char *sequences[]) fp)) { case FLD: case FLDPLUS: - case FLDEOF: if (state == FLDPLUS) { - cp = getcpy(field); + cp = mh_xstrdup(field); while (state == FLDPLUS) { state = m_getfld(state, name, field, sizeof(field), fp); @@ -134,11 +134,11 @@ get_msgnums(char *folder, char *sequences[]) } else { old_msgnums = msgnums; msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL); - free(old_msgnums); - free(this_msgnums); + mh_free0(&old_msgnums); + mh_free0(&this_msgnums); } } - free(cp); + mh_free0(&cp); } else { /* and here */ if (seq_in_list(name, sequences)) { @@ -148,19 +148,16 @@ get_msgnums(char *folder, char *sequences[]) } else { old_msgnums = msgnums; msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL); - free(old_msgnums); - free(this_msgnums); + 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", + adios(EX_DATAERR, NULL, "no blank lines are permitted in %s", seqfile); /* fall */ @@ -168,7 +165,7 @@ get_msgnums(char *folder, char *sequences[]) break; default: - adios(NULL, "%s is poorly formatted", seqfile); + adios(EX_SOFTWARE, NULL, "%s is poorly formatted", seqfile); } break; /* break from for loop */ } @@ -190,9 +187,9 @@ check_folder(char *folder, size_t len, struct list_state *b) 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; @@ -256,12 +253,12 @@ check_folders(struct node **first, struct node **last, } 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); } @@ -283,7 +280,7 @@ join_sequences(char *sequences[]) 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]); @@ -311,7 +308,11 @@ doit(char *cur, char *folders, char *sequences[]) 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"; @@ -383,14 +384,15 @@ doit(char *cur, char *folders, char *sequences[]) } 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; @@ -435,9 +437,7 @@ main(int argc, char **argv) sequences[0] = NULL; sequences[1] = NULL; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -454,28 +454,28 @@ 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(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; @@ -509,12 +509,12 @@ main(int argc, char **argv) /* 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; } @@ -523,7 +523,7 @@ main(int argc, char **argv) folder = doit(context_find(curfolder), folders, sequences); if (folder == NULL) { - done(0); + exit(EX_OK); return 1; } @@ -547,6 +547,5 @@ main(int argc, char **argv) context_save(); - done(0); - return 1; + return 0; }