projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added -mts switch to post, send, and whom. Replaced test-sendmail-pipe
[mmh]
/
uip
/
anno.c
diff --git
a/uip/anno.c
b/uip/anno.c
index
0d44134
..
24726d7
100644
(file)
--- a/
uip/anno.c
+++ b/
uip/anno.c
@@
-2,8
+2,6
@@
/*
* anno.c -- annotate messages
*
/*
* anno.c -- annotate messages
*
- * $Id$
- *
* 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.
* 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.
@@
-85,7
+83,7
@@
static struct swit switches[] = {
/*
* static prototypes
*/
/*
* static prototypes
*/
-static void make_comp (char **);
+static void make_comp (unsigned char **);
int
int
@@
-93,7
+91,8
@@
main (int argc, char **argv)
{
int inplace = 1, datesw = 1;
int msgnum;
{
int inplace = 1, datesw = 1;
int msgnum;
- char *cp, *maildir, *comp = NULL;
+ char *cp, *maildir;
+ unsigned char *comp = NULL;
char *text = NULL, *folder = NULL, buf[BUFSIZ];
char **argp, **arguments;
struct msgs_array msgs = { 0, 0, NULL };
char *text = NULL, *folder = NULL, buf[BUFSIZ];
char **argp, **arguments;
struct msgs_array msgs = { 0, 0, NULL };
@@
-129,10
+128,10
@@
main (int argc, char **argv)
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
invo_name);
print_help (buf, switches, 1);
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case COMPSW:
if (comp)
case COMPSW:
if (comp)
@@
-211,7
+210,7
@@
main (int argc, char **argv)
if (folder)
adios (NULL, "only one folder at a time!");
else
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-235,14
+234,10
@@
main (int argc, char **argv)
else
annotate (draft, comp, text, inplace, datesw, delete, append);
else
annotate (draft, comp, text, inplace, datesw, delete, append);
- return (done(0));
+ done(0);
+ return 1;
}
}
-#ifdef UCI
- if (strcmp(invo_name, "fanno") == 0) /* ugh! */
- datesw = 0;
-#endif /* UCI */
-
if (!context_find ("path"))
free (path ("./", TFOLDER));
if (!msgs.size)
if (!context_find ("path"))
free (path ("./", TFOLDER));
if (!msgs.size)
@@
-284,13
+279,14
@@
main (int argc, char **argv)
seq_save (mp); /* synchronize message sequences */
folder_free (mp); /* free folder/message structure */
context_save (); /* save the context file */
seq_save (mp); /* synchronize message sequences */
folder_free (mp); /* free folder/message structure */
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
static void
}
static void
-make_comp (char **ap)
+make_comp (unsigned char **ap)
{
{
- register char *cp;
+ register unsigned char *cp;
char buffer[BUFSIZ];
if (*ap == NULL) {
char buffer[BUFSIZ];
if (*ap == NULL) {