projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mhlist: Always display the column header (removed -headers).
[mmh]
/
uip
/
repl.c
diff --git
a/uip/repl.c
b/uip/repl.c
index
3c9e483
..
4523365
100644
(file)
--- a/
uip/repl.c
+++ b/
uip/repl.c
@@
-29,38
+29,32
@@
static struct swit switches[] = {
{ "nocc type", 0 },
#define EDITRSW 6
{ "editor editor", 0 },
{ "nocc type", 0 },
#define EDITRSW 6
{ "editor editor", 0 },
-#define NEDITSW 7
- { "noedit", 0 },
-#define FILTSW 8
+#define FILTSW 7
{ "filter filterfile", 0 },
{ "filter filterfile", 0 },
-#define NFILTSW 9
+#define NFILTSW 8
{ "nofilter", 0 },
{ "nofilter", 0 },
-#define FORMSW 10
+#define FORMSW 9
{ "form formfile", 0 },
{ "form formfile", 0 },
-#define MIMESW 11
+#define MIMESW 10
{ "mime", 0 },
{ "mime", 0 },
-#define NMIMESW 12
+#define NMIMESW 11
{ "nomime", 0 },
{ "nomime", 0 },
-#define QURYSW 13
+#define QURYSW 12
{ "query", 0 },
{ "query", 0 },
-#define NQURYSW 14
+#define NQURYSW 13
{ "noquery", 0 },
{ "noquery", 0 },
-#define WHATSW 15
+#define WHATSW 14
{ "whatnowproc program", 0 },
{ "whatnowproc program", 0 },
-#define NWHATSW 16
- { "nowhatnowproc", 0 },
-#define VERSIONSW 17
+#define VERSIONSW 15
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 18
+#define HELPSW 16
{ "help", 0 },
{ "help", 0 },
-#define FILESW 19
+#define FILESW 17
{ "file file", 4 }, /* interface from msh */
{ "file file", 4 }, /* interface from msh */
-
#ifdef MHE
#ifdef MHE
-#define BILDSW 20
+# define BILDSW 18
{ "build", 5 }, /* interface from mhe */
#endif
{ "build", 5 }, /* interface from mhe */
#endif
-
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-101,7
+95,7
@@
static int dftype=0;
static char *badaddrs = NULL;
static char *dfhost = NULL;
static char *badaddrs = NULL;
static char *dfhost = NULL;
-static struct mailname mq = { NULL };
+static struct mailname mq;
static struct format *fmt;
static struct format *fmt;
@@
-133,7
+127,7
@@
static char *addrcomps[] = {
static void docc(char *, int);
static int insert(struct mailname *);
static void replfilter(FILE *, FILE *, char *);
static void docc(char *, int);
static int insert(struct mailname *);
static void replfilter(FILE *, FILE *, char *);
-static void replout(FILE *, char *, char *, struct msgs *, int,
+static void replout(FILE *, char *, struct msgs *, int,
char *, char *);
char *, char *);
@@
-141,7
+135,6
@@
int
main(int argc, char **argv)
{
int anot = 0;
main(int argc, char **argv)
{
int anot = 0;
- int nedit = 0, nwhat = 0;
char *cp, *cwd, *maildir, *file = NULL;
char *folder = NULL, *msg = NULL;
char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
char *cp, *cwd, *maildir, *file = NULL;
char *folder = NULL, *msg = NULL;
char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
@@
-214,10
+207,6
@@
main(int argc, char **argv)
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case WHATSW:
continue;
case WHATSW:
@@
-225,15
+214,12
@@
main(int argc, char **argv)
*whatnowproc == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
*whatnowproc == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nwhat = 0;
continue;
#ifdef MHE
case BILDSW:
buildsw++; /* fall... */
continue;
#ifdef MHE
case BILDSW:
buildsw++; /* fall... */
-#endif /* MHE */
- case NWHATSW:
- nwhat++;
continue;
continue;
+#endif /* MHE */
case FILESW:
if (file)
case FILESW:
if (file)
@@
-360,13
+346,12
@@
main(int argc, char **argv)
form = etcpath(replcomps);
}
form = etcpath(replcomps);
}
- replout(in, msg, drft, mp, mime, form, filter);
+ replout(in, drft, mp, mime, form, filter);
fclose(in);
fclose(in);
- if (nwhat)
+ if (buildsw)
done(0);
done(0);
- what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
- cwd);
+ what_now(ed, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, cwd);
done(1);
return 1;
}
done(1);
return 1;
}
@@
-403,7
+388,7
@@
docc(char *cp, int ccflag)
static void
static void
-replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
+replout(FILE *inb, char *drft, struct msgs *mp,
int mime, char *form, char *filter)
{
register int state, i;
int mime, char *form, char *filter)
{
register int state, i;
@@
-745,15
+730,9
@@
insert(struct mailname *np)
snprintf(buffer, sizeof(buffer), "Reply to %s? ",
adrformat(np));
if (!gans(buffer, anoyes))
snprintf(buffer, sizeof(buffer), "Reply to %s? ",
adrformat(np));
if (!gans(buffer, anoyes))
- return 0;
+ return 0;
}
mp->m_next = np;
}
mp->m_next = np;
-
-#ifdef ISI
- if (ismymbox(np))
- ccme = 0;
-#endif
-
return 1;
}
return 1;
}