projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed a few #ifndef JLR/#endif pairs because they're not needed.
[mmh]
/
uip
/
comp.c
diff --git
a/uip/comp.c
b/uip/comp.c
index
569847c
..
65b213a
100644
(file)
--- a/
uip/comp.c
+++ b/
uip/comp.c
@@
-119,10
+119,10
@@
main (int argc, char **argv)
snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
invo_name);
print_help (buf, switches, 1);
snprintf (buf, sizeof(buf), "%s [+folder] [msg] [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 EDITRSW:
if (!(ed = *argp++) || *ed == '-')
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
@@
-294,34
+294,34
@@
main (int argc, char **argv)
cp = new_fs(form, NULL, NULL);
format_len = strlen(cp);
cp = new_fs(form, NULL, NULL);
format_len = strlen(cp);
- fmt_compile(cp, &fmt);
+ fmt_compile(cp, &fmt, 1);
/*
* Set up any components that were fed to us on the command line
*/
if (from) {
/*
* Set up any components that were fed to us on the command line
*/
if (from) {
- FINDCOMP(cptr, "from");
+ cptr = fmt_findcomp("from");
if (cptr)
cptr->c_text = from;
}
if (to) {
if (cptr)
cptr->c_text = from;
}
if (to) {
- FINDCOMP(cptr, "to");
+ cptr = fmt_findcomp("to");
if (cptr)
cptr->c_text = to;
}
if (cc) {
if (cptr)
cptr->c_text = to;
}
if (cc) {
- FINDCOMP(cptr, "cc");
+ cptr = fmt_findcomp("cc");
if (cptr)
cptr->c_text = cc;
}
if (fcc) {
if (cptr)
cptr->c_text = cc;
}
if (fcc) {
- FINDCOMP(cptr, "fcc");
+ cptr = fmt_findcomp("fcc");
if (cptr)
cptr->c_text = fcc;
}
if (subject) {
if (cptr)
cptr->c_text = fcc;
}
if (subject) {
- FINDCOMP(cptr, "subject");
+ cptr = fmt_findcomp("subject");
if (cptr)
cptr->c_text = subject;
}
if (cptr)
cptr->c_text = subject;
}
@@
-392,7
+392,7
@@
try_it_again:
dat[2] = 0;
dat[3] = outputlinelen;
dat[4] = 0;
dat[2] = 0;
dat[3] = outputlinelen;
dat[4] = 0;
- fmt_scan(fmt, scanl, i, dat);
+ fmt_scan(fmt, scanl, i + 1, i, dat);
write(out, scanl, strlen(scanl));
free(scanl);
} else {
write(out, scanl, strlen(scanl));
free(scanl);
} else {
@@
-406,7
+406,7
@@
edit_it:
if (nwhat)
done (0);
if (nwhat)
done (0);
- what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd);
+ what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd, 0);
done (1);
return 1;
}
done (1);
return 1;
}