projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated test-scan to correspond to commit
[mmh]
/
uip
/
comp.c
diff --git
a/uip/comp.c
b/uip/comp.c
index
c8189d1
..
f7a8f8f
100644
(file)
--- a/
uip/comp.c
+++ b/
uip/comp.c
@@
-79,17
+79,11
@@
static struct swit aqrul[] = {
{ NULL, 0 }
};
{ NULL, 0 }
};
-/*
- * Add an item to a comma seperated list
- */
-
-static char *addlist(char *, char *);
-
int
main (int argc, char **argv)
{
int use = NOUSE, nedit = 0, nwhat = 0;
int
main (int argc, char **argv)
{
int use = NOUSE, nedit = 0, nwhat = 0;
- int i, in = NOTOK, isdf = 0, out, dat[5], format_len;
+ int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
int outputlinelen = OUTPUTLINELEN;
char *cp, *cwd, *maildir, *dfolder = NULL;
char *ed = NULL, *file = NULL, *form = NULL;
int outputlinelen = OUTPUTLINELEN;
char *cp, *cwd, *maildir, *dfolder = NULL;
char *ed = NULL, *file = NULL, *form = NULL;
@@
-125,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 == '-')
@@
-398,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 {
@@
-412,20
+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;
}
-
-/*
- * Append an item to a comma separated list
- */
-
-static char *
-addlist (char *list, char *item)
-{
- if (list)
- list = add (", ", list);
-
- return add (item, list);
-}