X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fanno.c;h=5de385f02a8265b356b2c5f95904f07f99289d93;hp=7fd22c194f5338877a17d37405e83d1271c61678;hb=5b792c4424571f05bc2008e3109797d18d7d00d1;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/anno.c b/uip/anno.c index 7fd22c1..5de385f 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -1,43 +1,43 @@ /* - * anno.c -- annotate messages - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - * - * Three new options have been added: delete, list, and number. - * Message header fields are used by the new MIME attachment code in - * the send command. Adding features to generalize the anno command - * seemed to be a better approach than the creation of a new command - * whose features would overlap with those of the anno command. - * - * The -delete option deletes header elements that match the -component - * field name. If -delete is used without the -text option, the first - * header field whose field name matches the component name is deleted. - * If the -delete is used with the -text option, and the -text argument - * begins with a /, the first header field whose field name matches the - * component name and whose field body matches the text is deleted. If - * the -text argument does not begin with a /, then the text is assumed - * to be the last component of a path name, and the first header field - * whose field name matches the component name and a field body whose - * last path name component matches the text is deleted. If the -delete - * option is used with the new -number option described below, the nth - * header field whose field name matches the component name is deleted. - * No header fields are deleted if none of the above conditions are met. - * - * The -list option outputs the field bodies from each header field whose - * field name matches the component name, one per line. If no -text - * option is specified, only the last path name component of each field - * body is output. The entire field body is output if the -text option - * is used; the contents of the -text argument are ignored. If the -list - * option is used in conjuction with the new -number option described - * below, each line is numbered starting with 1. A tab separates the - * number from the field body. - * - * The -number option works with both the -delete and -list options as - * described above. The -number option takes an optional argument. A - * value of 1 is assumed if this argument is absent. - */ +** anno.c -- annotate messages +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +** +** Three new options have been added: delete, list, and number. +** Message header fields are used by the new MIME attachment code in +** the send command. Adding features to generalize the anno command +** seemed to be a better approach than the creation of a new command +** whose features would overlap with those of the anno command. +** +** The -delete option deletes header elements that match the -component +** field name. If -delete is used without the -text option, the first +** header field whose field name matches the component name is deleted. +** If the -delete is used with the -text option, and the -text argument +** begins with a /, the first header field whose field name matches the +** component name and whose field body matches the text is deleted. If +** the -text argument does not begin with a /, then the text is assumed +** to be the last component of a path name, and the first header field +** whose field name matches the component name and a field body whose +** last path name component matches the text is deleted. If the -delete +** option is used with the new -number option described below, the nth +** header field whose field name matches the component name is deleted. +** No header fields are deleted if none of the above conditions are met. +** +** The -list option outputs the field bodies from each header field whose +** field name matches the component name, one per line. If no -text +** option is specified, only the last path name component of each field +** body is output. The entire field body is output if the -text option +** is used; the contents of the -text argument are ignored. If the -list +** option is used in conjuction with the new -number option described +** below, each line is numbered starting with 1. A tab separates the +** number from the field body. +** +** The -number option works with both the -delete and -list options as +** described above. The -number option takes an optional argument. A +** value of 1 is assumed if this argument is absent. +*/ #include #include @@ -75,13 +75,13 @@ static struct swit switches[] = { }; /* - * static prototypes - */ -static void make_comp (unsigned char **); +** static prototypes +*/ +static void make_comp(unsigned char **); int -main (int argc, char **argv) +main(int argc, char **argv) { int inplace = 1, datesw = 1; int msgnum; @@ -99,108 +99,111 @@ main (int argc, char **argv) #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)) { - case AMBIGSW: - ambigsw (cp, switches); - done (1); - case UNKWNSW: - adios (NULL, "-%s unknown", cp); - - case HELPSW: - snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", - invo_name); - print_help (buf, switches, 1); - done (1); - case VERSIONSW: - print_version(invo_name); - done (1); - - case COMPSW: - if (comp) - adios (NULL, "only one component at a time!"); - if (!(comp = *argp++) || *comp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - - case DATESW: - datesw++; - continue; - case NDATESW: - datesw = 0; - continue; - - case INPLSW: - inplace++; - continue; - case NINPLSW: - inplace = 0; - continue; - - case TEXTSW: - if (text) - adios (NULL, "only one body at a time!"); - if (!(text = *argp++) || *text == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - - case DELETESW: /* delete annotations */ - delete = 0; - continue; - - case LISTSW: /* produce a listing */ - list = 1; - continue; - - case NUMBERSW: /* number listing or delete by number */ - if (number != 0) - adios (NULL, "only one number at a time!"); - - if (argp - arguments == argc - 1 || **argp == '-') - number = 1; - - else { - if (strcmp(*argp, "all") == 0) - number = -1; - - else if (!(number = atoi(*argp))) - adios (NULL, "missing argument to %s", argp[-2]); - - argp++; - } - - delete = number; - continue; - - case APPENDSW: /* append annotations instead of default prepend */ - append = 1; - continue; - - case PRESERVESW: /* preserve access and modification times on annotated message */ - annopreserve(1); - continue; - - case NOPRESERVESW: /* don't preserve access and modification times on annotated message (default) */ - annopreserve(0); - continue; + switch (smatch(++cp, switches)) { + case AMBIGSW: + ambigsw(cp, switches); + done(1); + case UNKWNSW: + adios(NULL, "-%s unknown", cp); + + case HELPSW: + snprintf(buf, sizeof(buf), + "%s [+folder] [msgs] [switches]", + invo_name); + print_help(buf, switches, 1); + done(1); + case VERSIONSW: + print_version(invo_name); + done(1); + + case COMPSW: + if (comp) + adios(NULL, "only one component at a time!"); + if (!(comp = *argp++) || *comp == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case DATESW: + datesw++; + continue; + case NDATESW: + datesw = 0; + continue; + + case INPLSW: + inplace++; + continue; + case NINPLSW: + inplace = 0; + continue; + + case TEXTSW: + if (text) + adios(NULL, "only one body at a time!"); + if (!(text = *argp++) || *text == '-') + adios(NULL, "missing argument to %s", + argp[-2]); + continue; + + case DELETESW: /* delete annotations */ + delete = 0; + continue; + + case LISTSW: /* produce a listing */ + list = 1; + continue; + + case NUMBERSW: /* number listing or delete by number */ + if (number != 0) + adios(NULL, "only one number at a time!"); + + if (argp-arguments == argc-1 || **argp == '-') + number = 1; + + else { + if (strcmp(*argp, "all") == 0) + number = -1; + + else if (!(number = atoi(*argp))) + adios(NULL, "missing argument to %s", argp[-2]); + + argp++; + } + + delete = number; + continue; + + case APPENDSW: /* append annotations instead of default prepend */ + append = 1; + continue; + + case PRESERVESW: /* preserve access and modification times on annotated message */ + annopreserve(1); + continue; + + case NOPRESERVESW: /* don't preserve access and modification times on annotated message (default) */ + annopreserve(0); + continue; } } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); + adios(NULL, "only one folder at a time!"); else - folder = pluspath (cp); + folder = getcpy(expandfol(cp)); } else - app_msgarg(&msgs, cp); + app_msgarg(&msgs, cp); } #ifdef UCI @@ -208,31 +211,29 @@ main (int argc, char **argv) datesw = 0; #endif /* UCI */ - if (!context_find ("path")) - free (path ("./", TFOLDER)); if (!msgs.size) app_msgarg(&msgs, "cur"); if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); + folder = getcurfol(); + maildir = toabsdir(folder); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + if (chdir(maildir) == NOTOK) + adios(maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read(folder))) + adios(NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in %s", folder); + adios(NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) - if (!m_convert (mp, msgs.msgs[msgnum])) - done (1); + if (!m_convert(mp, msgs.msgs[msgnum])) + done(1); - make_comp (&comp); + make_comp(&comp); /* annotate all the SELECTED messages */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { @@ -240,44 +241,44 @@ main (int argc, char **argv) if (list) annolist(m_name(msgnum), comp, text, number); else - annotate (m_name (msgnum), comp, text, inplace, datesw, delete, append); + annotate(m_name(msgnum), comp, text, inplace, datesw, delete, append); } } - context_replace (pfolder, folder); /* update current folder */ - seq_setcur (mp, mp->lowsel); /* update current message */ - seq_save (mp); /* synchronize message sequences */ - folder_free (mp); /* free folder/message structure */ - context_save (); /* save the context file */ - done (0); + context_replace(curfolder, folder); /* update current folder */ + seq_setcur(mp, mp->lowsel); /* update current message */ + seq_save(mp); /* synchronize message sequences */ + folder_free(mp); /* free folder/message structure */ + context_save(); /* save the context file */ + done(0); return 1; } static void -make_comp (unsigned char **ap) +make_comp(unsigned char **ap) { register unsigned char *cp; char buffer[BUFSIZ]; if (*ap == NULL) { - printf ("Enter component name: "); - fflush (stdout); + printf("Enter component name: "); + fflush(stdout); - if (fgets (buffer, sizeof buffer, stdin) == NULL) - done (1); - *ap = trimcpy (buffer); + if (fgets(buffer, sizeof buffer, stdin) == NULL) + done(1); + *ap = trimcpy(buffer); } - if ((cp = *ap + strlen (*ap) - 1) > *ap && *cp == ':') + if ((cp = *ap + strlen(*ap) - 1) > *ap && *cp == ':') *cp = 0; - if (strlen (*ap) == 0) - adios (NULL, "null component name"); + if (strlen(*ap) == 0) + adios(NULL, "null component name"); if (**ap == '-') - adios (NULL, "invalid component name %s", *ap); - if (strlen (*ap) >= NAMESZ) - adios (NULL, "too large component name %s", *ap); + adios(NULL, "invalid component name %s", *ap); + if (strlen(*ap) >= NAMESZ) + adios(NULL, "too large component name %s", *ap); for (cp = *ap; *cp; cp++) - if (!isalnum (*cp) && *cp != '-') - adios (NULL, "invalid component name %s", *ap); + if (!isalnum(*cp) && *cp != '-') + adios(NULL, "invalid component name %s", *ap); }