projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comp(1) has no -file switch anymore.
[mmh]
/
uip
/
forw.c
diff --git
a/uip/forw.c
b/uip/forw.c
index
b0d4601
..
44c32a0
100644
(file)
--- a/
uip/forw.c
+++ b/
uip/forw.c
@@
-33,37
+33,29
@@
static struct swit switches[] = {
{ "format", 5 },
#define NFRMTSW 7
{ "noformat", 7 },
{ "format", 5 },
#define NFRMTSW 7
{ "noformat", 7 },
-#define INPLSW 8
- { "inplace", 0 },
-#define NINPLSW 9
- { "noinplace", 0 },
-#define MIMESW 10
+#define MIMESW 8
{ "mime", 0 },
{ "mime", 0 },
-#define NMIMESW 11
+#define NMIMESW 9
{ "nomime", 0 },
{ "nomime", 0 },
-#define DGSTSW 12
+#define DGSTSW 10
{ "digest list", 0 },
{ "digest list", 0 },
-#define ISSUESW 13
+#define ISSUESW 11
{ "issue number", 0 },
{ "issue number", 0 },
-#define VOLUMSW 14
+#define VOLUMSW 12
{ "volume number", 0 },
{ "volume number", 0 },
-#define WHATSW 15
+#define WHATSW 13
{ "whatnowproc program", 0 },
{ "whatnowproc program", 0 },
-#define NWHATSW 16
+#define NWHATSW 14
{ "nowhatnowproc", 0 },
{ "nowhatnowproc", 0 },
-#define BITSTUFFSW 17
- { "dashstuffing", 0 }, /* interface to mhl */
-#define NBITSTUFFSW 18
- { "nodashstuffing", 0 },
-#define VERSIONSW 19
+#define VERSIONSW 15
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 20
+#define HELPSW 16
{ "help", 0 },
{ "help", 0 },
-#define FILESW 21
+#define FILESW 17
{ "file file", 4 }, /* interface from msh */
#ifdef MHE
{ "file file", 4 }, /* interface from msh */
#ifdef MHE
-#define BILDSW 22
+#define BILDSW 18
{ "build", 5 }, /* interface from mhe */
#endif /* MHE */
{ "build", 5 }, /* interface from mhe */
#endif /* MHE */
@@
-83,8
+75,8
@@
static struct msgs *mp = NULL; /* used a lot */
/*
** static prototypes
*/
/*
** static prototypes
*/
-static void mhl_draft(int, char *, int, int, char *, char *, int);
-static void copy_draft(int, char *, char *, int, int, int);
+static void mhl_draft(int, char *, int, int, char *, char *);
+static void copy_draft(int, char *, char *, int, int);
static void add_forw_hdr(char *);
static int build_form(char *, char *, int, int);
static void add_forw_hdr(char *);
static int build_form(char *, char *, int, int);
@@
-92,8
+84,8
@@
static int build_form(char *, char *, int, int);
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- int msgp = 0, anot = 0, inplace = 1, mime = 0;
- int issue = 0, volume = 0, dashstuff = 0;
+ int msgp = 0, anot = 0, mime = 0;
+ int issue = 0, volume = 0;
int nedit = 0, nwhat = 0, in;
int out, msgnum;
char *cp, *cwd, *maildir;
int nedit = 0, nwhat = 0, in;
int out, msgnum;
char *cp, *cwd, *maildir;
@@
-194,13
+186,6
@@
main(int argc, char **argv)
filter = NULL;
continue;
filter = NULL;
continue;
- case INPLSW:
- inplace++;
- continue;
- case NINPLSW:
- inplace = 0;
- continue;
-
case MIMESW:
mime++;
filter = NULL;
case MIMESW:
mime++;
filter = NULL;
@@
-231,13
+216,6
@@
main(int argc, char **argv)
adios(NULL, "bad argument %s %s",
argp[-2], cp);
continue;
adios(NULL, "bad argument %s %s",
argp[-2], cp);
continue;
-
- case BITSTUFFSW:
- dashstuff = 1; /* trinary logic */
- continue;
- case NBITSTUFFSW:
- dashstuff = -1; /* trinary logic */
- continue;
}
}
if (*cp == '+' || *cp == '@') {
}
}
if (*cp == '+' || *cp == '@') {
@@
-342,15
+320,13
@@
main(int argc, char **argv)
** messages into the draft using mhlproc.
*/
if (filter) {
** messages into the draft using mhlproc.
*/
if (filter) {
- mhl_draft(out, digest, volume, issue, drft, filter,
- dashstuff);
+ mhl_draft(out, digest, volume, issue, drft, filter);
close(out);
} else if (mime) {
close(out);
add_forw_hdr(drft);
} else {
close(out);
} else if (mime) {
close(out);
add_forw_hdr(drft);
} else {
- copy_draft(out, digest, drft, volume, issue,
- dashstuff);
+ copy_draft(out, digest, drft, volume, issue);
close(out);
}
close(out);
}
@@
-372,7
+348,7
@@
main(int argc, char **argv)
if (nwhat)
done(0);
what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
if (nwhat)
done(0);
what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
- anot ? "Forwarded" : NULL, inplace, cwd);
+ anot ? "Forwarded" : NULL, cwd);
done(1);
return 1;
}
done(1);
return 1;
}
@@
-385,7
+361,7
@@
main(int argc, char **argv)
*/
static void
mhl_draft(int out, char *digest, int volume, int issue,
*/
static void
mhl_draft(int out, char *digest, int volume, int issue,
- char *file, char *filter, int dashstuff)
+ char *file, char *filter)
{
pid_t child_id;
int i, msgnum, pd[2];
{
pid_t child_id;
int i, msgnum, pd[2];
@@
-425,16
+401,6
@@
mhl_draft(int out, char *digest, int volume, int issue,
vec[i++] = buf2;
}
vec[i++] = buf2;
}
- /*
- ** Are we dashstuffing (quoting) the lines that begin
- ** with `-'. We use the mhl default (don't add any
- ** flag) unless the user has specified a specific flag.
- */
- if (dashstuff > 0)
- vec[i++] = "-dashstuffing";
- else if (dashstuff < 0)
- vec[i++] = "-nodashstuffing";
-
if (mp->numsel >= MAXARGS - i)
adios(NULL, "more than %d messages for %s exec",
MAXARGS - i, vec[0]);
if (mp->numsel >= MAXARGS - i)
adios(NULL, "more than %d messages for %s exec",
MAXARGS - i, vec[0]);
@@
-468,12
+434,10
@@
mhl_draft(int out, char *digest, int volume, int issue,
/*
** Copy the messages into the draft. The messages are
/*
** Copy the messages into the draft. The messages are
-** not filtered through the mhlproc. Do dashstuffing if
-** necessary.
+** not filtered through the mhlproc. Do dashstuffing.
*/
static void
*/
static void
-copy_draft(int out, char *digest, char *file, int volume, int issue,
- int dashstuff)
+copy_draft(int out, char *digest, char *file, int volume, int issue)
{
int fd,i, msgcnt, msgnum;
int len, buflen;
{
int fd,i, msgcnt, msgnum;
int len, buflen;
@@
-517,12
+481,8
@@
copy_draft(int out, char *digest, char *file, int volume, int issue,
/*
** Copy the message. Add RFC934 quoting (dashstuffing)
/*
** Copy the message. Add RFC934 quoting (dashstuffing)
- ** unless given the -nodashstuffing flag.
*/
*/
- if (dashstuff >= 0)
- cpydgst(fd, out, msgnam, file);
- else
- cpydata(fd, out, msgnam, file);
+ cpydgst(fd, out, msgnam, file);
close(fd);
msgcnt++;
close(fd);
msgcnt++;
@@
-571,7
+531,7
@@
add_forw_hdr(char *draft)
strncat(buffer, m_name(msgnum),
sizeof(buffer)-strlen(buffer)-1);
}
strncat(buffer, m_name(msgnum),
sizeof(buffer)-strlen(buffer)-1);
}
- annotate(draft, attach_hdr, buffer, 1, 0, -2, 1);
+ annotate(draft, attach_hdr, buffer, 0, -2, 1);
}
}