static struct swit switches[] = {
#define COMPSW 0
{ "component field", 0 },
-#define INPLSW 1
- { "inplace", 0 },
-#define NINPLSW 2
- { "noinplace", 0 },
-#define DATESW 3
+#define DATESW 1
{ "date", 0 },
-#define NDATESW 4
+#define NDATESW 2
{ "nodate", 0 },
-#define TEXTSW 5
+#define TEXTSW 3
{ "text body", 0 },
-#define VERSIONSW 6
+#define VERSIONSW 4
{ "version", 0 },
-#define HELPSW 7
+#define HELPSW 5
{ "help", 0 },
-#define LISTSW 8
+#define LISTSW 6
{ "list", 1 },
-#define DELETESW 9
+#define DELETESW 7
{ "delete", 2 },
-#define NUMBERSW 10
+#define NUMBERSW 8
{ "number", 2 },
-#define APPENDSW 11
+#define APPENDSW 9
{ "append", 1 },
-#define PRESERVESW 12
+#define PRESERVESW 10
{ "preserve", 1 },
-#define NOPRESERVESW 13
+#define NOPRESERVESW 11
{ "nopreserve", 3 },
{ NULL, 0 }
};
int
main(int argc, char **argv)
{
- int inplace = 1, datesw = 1;
+ int datesw = 1;
+ int preserve = 0;
int msgnum;
char *cp, *maildir;
unsigned char *comp = NULL;
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 == '-')
+ 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 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]);
- 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;
+ argp++;
+ }
- else {
- if (strcmp(*argp, "all") == 0)
- number = -1;
+ delete = number;
+ continue;
- else if (!(number = atoi(*argp)))
- adios(NULL, "missing argument to %s", argp[-2]);
+ case APPENDSW: /* append annotations instead of default prepend */
+ append = 1;
+ continue;
- argp++;
- }
+ case PRESERVESW: /* preserve access and modification times on annotated message */
+ preserve = 1;
+ continue;
- 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;
+ case NOPRESERVESW: /* don't preserve access and modification times on annotated message (default) */
+ preserve = 0;
+ continue;
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
adios(NULL, "only one folder at a time!");
else
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
-#ifdef UCI
- if (strcmp(invo_name, "fanno") == 0) /* ugh! */
- datesw = 0;
-#endif /* UCI */
-
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
- folder = getfolder(FCUR);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
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, datesw, delete, append, preserve);
}
}
- context_replace(pfolder, folder); /* update current folder */
+ 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 */
projects / mmh / blobdiff