projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed left-overs from the -idanno removal.
[mmh]
/
uip
/
spost.c
diff --git
a/uip/spost.c
b/uip/spost.c
index
8fc2f21
..
5afa435
100644
(file)
--- a/
uip/spost.c
+++ b/
uip/spost.c
@@
-34,27
+34,23
@@
struct swit switches[] = {
{ "watch", 0 },
#define NWATCSW 5
{ "nowatch", 0 },
{ "watch", 0 },
#define NWATCSW 5
{ "nowatch", 0 },
-#define BACKSW 6
- { "backup", 0 },
-#define NBACKSW 7
- { "nobackup", 0 },
-#define ALIASW 8
+#define ALIASW 6
{ "alias aliasfile", 0 },
{ "alias aliasfile", 0 },
-#define NALIASW 9
+#define NALIASW 7
{ "noalias", 0 },
{ "noalias", 0 },
-#define VERSIONSW 10
+#define VERSIONSW 8
{ "version", 0 },
{ "version", 0 },
-#define HELPSW 11
+#define HELPSW 9
{ "help", 0 },
{ "help", 0 },
-#define DEBUGSW 12
+#define DEBUGSW 10
{ "debug", -5 },
{ "debug", -5 },
-#define DISTSW 13
+#define DISTSW 11
{ "dist", -4 }, /* interface from dist */
{ "dist", -4 }, /* interface from dist */
-#define PUSHSW 14 /* fork to sendmail then exit */
+#define PUSHSW 12 /* fork to sendmail then exit */
{ "push", -4 },
{ "push", -4 },
-#define NPUSHSW 15 /* exec sendmail */
+#define NPUSHSW 13 /* exec sendmail */
{ "nopush", -6 },
{ "nopush", -6 },
-#define LIBSW 16
+#define LIBSW 14
{ "library directory", -7 },
{ NULL, 0 }
};
{ "library directory", -7 },
{ NULL, 0 }
};
@@
-125,7
+121,6
@@
static int badmsg = 0; /* message has bad semantics */
static int verbose = 0; /* spell it out */
static int debug = 0; /* debugging post */
static int watch = 0; /* watch the delivery process */
static int verbose = 0; /* spell it out */
static int debug = 0; /* debugging post */
static int watch = 0; /* watch the delivery process */
-static int backflg = 0; /* prepend backup prefix to input file when done */
static int pushflg = 0; /* if going to fork to sendmail */
static int aliasflg = 0; /* if going to process aliases */
static int pushflg = 0; /* if going to fork to sendmail */
static int aliasflg = 0; /* if going to process aliases */
@@
-137,8
+132,6
@@
static enum {
static char tmpfil[] = "/tmp/pstXXXXXX";
static char tmpfil[] = "/tmp/pstXXXXXX";
-static char from[BUFSIZ]; /* my network address */
-static char signature[BUFSIZ]; /* my signature */
static char *filter = NULL; /* the filter for BCC'ing */
static char *subject = NULL; /* the subject field for BCC'ing */
static char *fccfold[FCCS]; /* foldernames for FCC'ing */
static char *filter = NULL; /* the filter for BCC'ing */
static char *subject = NULL; /* the subject field for BCC'ing */
static char *fccfold[FCCS]; /* foldernames for FCC'ing */
@@
-159,7
+152,6
@@
extern char *getusername(void);
** static prototypes
*/
static void putfmt(char *, char *, FILE *);
** static prototypes
*/
static void putfmt(char *, char *, FILE *);
-static void start_headers(void);
static void finish_headers(FILE *);
static int get_header(char *, struct headers *);
static void putadr(char *, struct mailname *);
static void finish_headers(FILE *);
static int get_header(char *, struct headers *);
static void putadr(char *, struct mailname *);
@@
-189,7
+181,6
@@
main(int argc, char **argv)
if (context_foil(NULL) == -1)
done(1);
if (context_foil(NULL) == -1)
done(1);
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
@@
-229,13
+220,6
@@
main(int argc, char **argv)
filter = NULL;
continue;
filter = NULL;
continue;
- case BACKSW:
- backflg++;
- continue;
- case NBACKSW:
- backflg = 0;
- continue;
-
case VERBSW:
verbose++;
continue;
case VERBSW:
verbose++;
continue;
@@
-291,7
+275,6
@@
main(int argc, char **argv)
if ((in = fopen(msg, "r")) == NULL)
adios(msg, "unable to open");
if ((in = fopen(msg, "r")) == NULL)
adios(msg, "unable to open");
- start_headers();
if (debug) {
verbose++;
out = stdout;
if (debug) {
verbose++;
out = stdout;
@@
-354,12
+337,6
@@
main(int argc, char **argv)
}
fclose(in);
}
fclose(in);
- if (backflg) {
- strncpy(buf, m_backup(msg), sizeof(buf));
- if (rename(msg, buf) == NOTOK)
- advise(buf, "unable to rename %s to", msg);
- }
-
if (debug) {
/* stop here */
done(0);
if (debug) {
/* stop here */
done(0);
@@
-524,12
+501,19
@@
putfmt(char *name, char *str, FILE *out)
/*
/*
-** Construct signature name
+** Add yet missing headers.
*/
static void
*/
static void
-start_headers(void)
+finish_headers(FILE *out)
{
char *cp;
{
char *cp;
+ char from[BUFSIZ]; /* my network address */
+ char signature[BUFSIZ]; /* my signature */
+ char *resentstr = (msgstate == resent) ? "Resent-" : "";
+
+ if (!(msgflags & MDAT)) {
+ fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
+ }
strncpy(from, getusername(), sizeof(from));
if ((cp = getfullname()) && *cp) {
strncpy(from, getusername(), sizeof(from));
if ((cp = getfullname()) && *cp) {
@@
-537,24
+521,10
@@
start_headers(void)
} else {
snprintf(signature, sizeof(signature), "%s", from);
}
} else {
snprintf(signature, sizeof(signature), "%s", from);
}
-}
-
-
-/*
-** Add yet missing headers.
-*/
-static void
-finish_headers(FILE *out)
-{
- char *resentstr = (msgstate == resent) ? "Resent-" : "";
-
- if (!(msgflags & MDAT)) {
- fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
- }
if (!(msgflags & MFRM)) {
fprintf(out, "%sFrom: %s\n", resentstr, signature);
} else {
if (!(msgflags & MFRM)) {
fprintf(out, "%sFrom: %s\n", resentstr, signature);
} else {
- /* Add a Sender: header in case the From: header is fake. */
+ /* In case the From: header contains multiple addresses. */
fprintf(out, "%sSender: %s\n", resentstr, from);
}
#ifdef notdef
fprintf(out, "%sSender: %s\n", resentstr, from);
}
#ifdef notdef