X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fnew.c;h=cb2abc4915e23a492c2916b8471c6de38e1d8431;hp=49840a1bf8304b344544a2d1e60da8a7bcd7fa0b;hb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/new.c b/uip/new.c index 49840a1..cb2abc4 100644 --- a/uip/new.c +++ b/uip/new.c @@ -1,14 +1,14 @@ /* - * new.c -- as new, list all folders with unseen messages - * -- as fnext, move to next folder with unseen messages - * -- as fprev, move to previous folder with unseen messages - * -- as unseen, scan all unseen messages - * This code is Copyright (c) 2008, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - * - * Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new - */ +** new.c -- as new, list all folders with unseen messages +** -- as fnext, move to next folder with unseen messages +** -- as fprev, move to previous folder with unseen messages +** -- as unseen, scan all unseen messages +** This code is Copyright (c) 2008, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +** +** Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new +*/ #include @@ -34,8 +34,10 @@ static struct swit switches[] = { static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW; -/* check_folders uses this to maintain state with both .folders list of - * folders and with crawl_folders. */ +/* +** check_folders uses this to maintain state with both .folders list of +** folders and with crawl_folders. +*/ struct list_state { struct node **first, **cur_node; size_t *maxlen; @@ -85,8 +87,10 @@ seq_in_list(char *name, char *sequences[]) return FALSE; } -/* Return the string list of message numbers from the sequences file, or NULL - * if none. */ +/* +** Return the string list of message numbers from the sequences file, +** or NULL if none. +*/ static char * get_msgnums(char *folder, char *sequences[]) { @@ -111,21 +115,26 @@ get_msgnums(char *folder, char *sequences[]) if (state == FLDPLUS) { cp = getcpy (field); while (state == FLDPLUS) { - state = m_getfld (state, name, field, - sizeof(field), fp); + 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. */ + /* + ** 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); + msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL); free(old_msgnums); free(this_msgnums); } @@ -139,8 +148,7 @@ get_msgnums(char *folder, char *sequences[]) msgnums = this_msgnums; } else { old_msgnums = msgnums; - msgnums = concat(old_msgnums, " ", - this_msgnums, (void *)NULL); + msgnums = concat(old_msgnums, " ", this_msgnums, (void *)NULL); free(old_msgnums); free(this_msgnums); } @@ -170,8 +178,10 @@ get_msgnums(char *folder, char *sequences[]) return msgnums; } -/* Check `folder' (of length `len') for interesting messages, filling in the - * list in `b'. */ +/* +** Check `folder' (of length `len') for interesting messages, +** filling in the list in `b'. +*/ static void check_folder(char *folder, size_t len, struct list_state *b) { @@ -206,20 +216,21 @@ crawl_callback(char *folder, void *baton) return TRUE; } -/* Scan folders, returning: - * first -- list of nodes for all folders which have desired messages; - * if the current folder is listed in .folders, it is also in - * the list regardless of whether it has any desired messages - * last -- last node in list - * cur_node -- node of current folder, if listed in .folders - * maxlen -- length of longest folder name - * - * `cur' points to the name of the current folder, `folders' points to the - * name of a .folder (if NULL, crawl all folders), and `sequences' points to - * the array of sequences for which to look. - * - * An empty list is returned as first=last=NULL. - */ +/* +** Scan folders, returning: +** first -- list of nodes for all folders which have desired messages; +** if the current folder is listed in .folders, it is also in +** the list regardless of whether it has any desired messages +** last -- last node in list +** cur_node -- node of current folder, if listed in .folders +** maxlen -- length of longest folder name +** +** `cur' points to the name of the current folder, `folders' points to the +** name of a .folder (if NULL, crawl all folders), and `sequences' points to +** the array of sequences for which to look. +** +** An empty list is returned as first=last=NULL. +*/ static void check_folders(struct node **first, struct node **last, struct node **cur_node, size_t *maxlen, @@ -285,14 +296,15 @@ join_sequences(char *sequences[]) return result; } -/* Return a struct node for the folder to change to. This is the next - * (previous, if FPREV mode) folder with desired messages, or the current - * folder if no folders have desired. If NEW or UNSEEN mode, print the - * output but don't change folders. - * - * n_name is the folder to change to, and n_field is the string list of - * desired message numbers. - */ +/* +** Return a struct node for the folder to change to. This is the next +** (previous, if FPREV mode) folder with desired messages, or the current +** folder if no folders have desired. If NEW or UNSEEN mode, print the +** output but don't change folders. +** +** n_name is the folder to change to, and n_field is the string list of +** desired message numbers. +*/ static struct node * doit(char *cur, char *folders, char *sequences[]) { @@ -306,21 +318,26 @@ doit(char *cur, char *folders, char *sequences[]) } check_folders(&first, &last, &cur_node, &folder_len, cur, - folders, sequences); + folders, sequences); if (run_mode == FNEXT || run_mode == FPREV) { if (first == NULL) { /* No folders at all... */ return NULL; } else if (first->n_next == NULL) { - /* We have only one node; any desired messages in it? */ + /* + ** We have only one node; any desired messages in it? + */ if (first->n_field == NULL) { return NULL; } else { return first; } } else if (cur_node == NULL) { - /* Current folder is not listed in .folders, return first. */ + /* + ** Current folder is not listed in .folders, + ** return first. + */ return first; } } else if (run_mode == UNSEEN) { @@ -331,16 +348,20 @@ doit(char *cur, char *folders, char *sequences[]) node != NULL; prev = node, node = node->n_next) { if (run_mode == FNEXT) { - /* If we have a previous node and it is the current - * folder, return this node. */ + /* + ** If we have a previous node and it is the current + ** folder, return this node. + */ if (prev != NULL && strcmp(prev->n_name, cur) == 0) { return node; } } else if (run_mode == FPREV) { if (strcmp(node->n_name, cur) == 0) { - /* Found current folder in fprev mode; if we have a - * previous node in the list, return it; else return - * the last node. */ + /* + ** Found current folder in fprev mode; + ** if we have a previous node in the list, + ** return it; else return the last node. + */ if (prev == NULL) { return last; } @@ -362,9 +383,12 @@ 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); + /* + ** 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); } else { @@ -383,8 +407,10 @@ doit(char *cur, char *folders, char *sequences[]) } } - /* If we're fnext, we haven't checked the last node yet. If it's the - * current folder, return the first node. */ + /* + ** If we're fnext, we haven't checked the last node yet. If it's the + ** current folder, return the first node. + */ if (run_mode == FNEXT && strcmp(last->n_name, cur) == 0) { return first; } @@ -419,8 +445,8 @@ main(int argc, char **argv) argp = arguments; /* - * Parse arguments - */ + ** Parse arguments + */ while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { @@ -431,8 +457,9 @@ main(int argc, char **argv) adios (NULL, "-%s unknown", cp); case HELPSW: - snprintf (help, sizeof(help), "%s [switches] [sequences]", - invo_name); + snprintf (help, sizeof(help), + "%s [switches] [sequences]", + invo_name); print_help (help, switches, 1); done (1); case VERSIONSW: @@ -441,11 +468,13 @@ main(int argc, char **argv) case FOLDERSSW: if (!(folders = *argp++) || *folders == '-') - adios(NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", + argp[-2]); continue; case MODESW: if (!(invo_name = *argp++) || *invo_name == '-') - adios(NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", + argp[-2]); invo_name = r1bindex(invo_name, '/'); continue; } @@ -491,11 +520,13 @@ main(int argc, char **argv) } if (run_mode == UNSEEN) { - /* All the scan(1)s it runs change the current folder, so we - * need to put it back. Unfortunately, context_replace lamely - * ignores the new value you give it if it is the same one it - * has in memory. So, we'll be lame, too. I'm not sure if i - * should just change context_replace... */ + /* + ** All the scan(1)s it runs change the current folder, so we + ** need to put it back. Unfortunately, context_replace lamely + ** ignores the new value you give it if it is the same one it + ** 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"); }