projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
anno: Can annotate files now too. This feature is yet hidden and will change.
[mmh]
/
uip
/
repl.c
diff --git
a/uip/repl.c
b/uip/repl.c
index
a36b2c7
..
3cba512
100644
(file)
--- a/
uip/repl.c
+++ b/
uip/repl.c
@@
-33,33
+33,31
@@
static struct swit switches[] = {
{ "noedit", 0 },
#define FILTSW 8
{ "filter filterfile", 0 },
{ "noedit", 0 },
#define FILTSW 8
{ "filter filterfile", 0 },
-#define FORMSW 9
+#define NFILTSW 9
+ { "nofilter", 0 },
+#define FORMSW 10
{ "form formfile", 0 },
{ "form formfile", 0 },
-#define FRMTSW 10
- { "format", 5 },
-#define NFRMTSW 11
- { "noformat", 7 },
-#define MIMESW 12
+#define MIMESW 11
{ "mime", 0 },
{ "mime", 0 },
-#define NMIMESW 13
+#define NMIMESW 12
{ "nomime", 0 },
{ "nomime", 0 },
-#define QURYSW 14
+#define QURYSW 13
{ "query", 0 },
{ "query", 0 },
-#define NQURYSW 15
+#define NQURYSW 14
{ "noquery", 0 },
{ "noquery", 0 },
-#define WHATSW 16
+#define WHATSW 15
{ "whatnowproc program", 0 },
{ "whatnowproc program", 0 },
-#define NWHATSW 17
+#define NWHATSW 16
{ "nowhatnowproc", 0 },
{ "nowhatnowproc", 0 },
-#define VERSIONSW 18
+#define VERSIONSW 17
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 19
+#define HELPSW 18
{ "help", 0 },
{ "help", 0 },
-#define FILESW 20
+#define FILESW 19
{ "file file", 4 }, /* interface from msh */
#ifdef MHE
{ "file file", 4 }, /* interface from msh */
#ifdef MHE
-#define BILDSW 21
+#define BILDSW 20
{ "build", 5 }, /* interface from mhe */
#endif
{ "build", 5 }, /* interface from mhe */
#endif
@@
-155,6
+153,8
@@
main(int argc, char **argv)
int buildsw = 0;
#endif /* MHE */
int buildsw = 0;
#endif /* MHE */
+ filter = getcpy(etcpath(mhlreply));
+
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
@@
-243,30
+243,24
@@
main(int argc, char **argv)
argp[-2]);
file = getcpy(expanddir(cp));
continue;
argp[-2]);
file = getcpy(expanddir(cp));
continue;
- case FILTSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- filter = getcpy(etcpath(cp));
- mime = 0;
- continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
- case FRMTSW:
- filter = getcpy(etcpath(mhlreply));
- mime = 0;
+ case FILTSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ filter = getcpy(etcpath(cp));
continue;
continue;
- case NFRMTSW:
+ case NFILTSW:
filter = NULL;
continue;
case MIMESW:
mime++;
filter = NULL;
continue;
case MIMESW:
mime++;
- filter = NULL;
continue;
case NMIMESW:
mime = 0;
continue;
case NMIMESW:
mime = 0;
@@
-430,7
+424,7
@@
replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
umask(mask);
/* get new format string */
umask(mask);
/* get new format string */
- cp = new_fs(form, NULL, NULL);
+ cp = new_fs(form, NULL);
format_len = strlen(cp);
/* compile format string */
format_len = strlen(cp);
/* compile format string */
@@
-596,13
+590,13
@@
finished:
adios(drft, "error writing");
fclose(out);
adios(drft, "error writing");
fclose(out);
- /* if we want mime, then add an attachment header */
- if (!filter && mime && mp) {
+ if (mime && mp) {
+ /* add an attachment header */
char buffer[BUFSIZ];
snprintf(buffer, sizeof buffer, "+%s %s",
mp->foldpath, m_name(mp->lowsel));
char buffer[BUFSIZ];
snprintf(buffer, sizeof buffer, "+%s %s",
mp->foldpath, m_name(mp->lowsel));
- annotate(drft, attach_hdr, buffer, 0, -2, 1);
+ annotate(drft, attach_hdr, buffer, 0, -2, 1, 0);
}
/* return dynamically allocated buffers */
}
/* return dynamically allocated buffers */
@@
-761,16
+755,14
@@
insert(struct mailname *np)
/*
/*
-** Call the mhlproc
+** Call mhl
**
** This function expects that argument out has been fflushed by the caller.
*/
**
** This function expects that argument out has been fflushed by the caller.
*/
-
static void
replfilter(FILE *in, FILE *out, char *filter)
{
int pid;
static void
replfilter(FILE *in, FILE *out, char *filter)
{
int pid;
- char *mhl;
char *errstr;
if (filter == NULL)
char *errstr;
if (filter == NULL)
@@
-779,8
+771,6
@@
replfilter(FILE *in, FILE *out, char *filter)
if (access(filter, R_OK) == NOTOK)
adios(filter, "unable to read");
if (access(filter, R_OK) == NOTOK)
adios(filter, "unable to read");
- mhl = mhbasename(mhlproc);
-
rewind(in);
lseek(fileno(in), (off_t) 0, SEEK_SET);
rewind(in);
lseek(fileno(in), (off_t) 0, SEEK_SET);
@@
-793,17
+783,15
@@
replfilter(FILE *in, FILE *out, char *filter)
dup2(fileno(out), fileno(stdout));
closefds(3);
dup2(fileno(out), fileno(stdout));
closefds(3);
- execlp(mhlproc, mhl, "-form", filter, "-noclear", NULL);
+ execlp("mhl", "mhl", "-form", filter, NULL);
errstr = strerror(errno);
errstr = strerror(errno);
- write(2, "unable to exec ", 15);
- write(2, mhlproc, strlen(mhlproc));
- write(2, ": ", 2);
+ write(2, "unable to exec mhl: ", 20);
write(2, errstr, strlen(errstr));
write(2, "\n", 1);
_exit(-1);
default:
write(2, errstr, strlen(errstr));
write(2, "\n", 1);
_exit(-1);
default:
- if (pidXwait(pid, mhl))
+ if (pidXwait(pid, "mhl"))
done(1);
fseek(out, 0L, SEEK_END);
break;
done(1);
fseek(out, 0L, SEEK_END);
break;