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;
datesw = 0;
continue;
- case INPLSW:
- inplace++;
- continue;
- case NINPLSW:
- inplace = 0;
- continue;
-
case TEXTSW:
if (text)
adios(NULL, "only one body at a time!");
number = 1;
else {
- if (strcmp(*argp, "all") == 0)
- number = -1;
-
- else if (!(number = atoi(*argp)))
+ 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 */
+ case APPENDSW:
append = 1;
continue;
- case PRESERVESW: /* preserve access and modification times on annotated message */
- annopreserve(1);
+ case PRESERVESW:
+ preserve = 1;
continue;
- case NOPRESERVESW: /* don't preserve access and modification times on annotated message (default) */
- annopreserve(0);
+ case NOPRESERVESW:
+ preserve = 0;
continue;
}
}
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 = getcurfol();
maildir = toabsdir(folder);
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(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 */
+ context_replace(curfolder, folder);
+ seq_setcur(mp, mp->lowsel);
+ seq_save(mp);
+ folder_free(mp);
+ context_save();
done(0);
return 1;
}