From d0bd505e1a9b0bc2fc107446dcb615bf55c42e81 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Sun, 28 May 2017 12:32:28 +0100 Subject: [PATCH 1/1] sbr/mts.c: Delete mmdlm2; use same-valued mmdlm1 instead. mmdlm1 and mmdlm2 had the same compile-time value. Both could be changed at run-time by mts.conf(5), but d205d39a stopped that. Use mmdlm1 instead of mmdlm2 and delete mmdlm2. --- h/mh.h | 2 +- h/mts.h | 1 - sbr/m_getfld.c | 2 +- sbr/mts.c | 1 - uip/dropsbr.c | 12 ++++++------ 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/h/mh.h b/h/mh.h index f2c7b823..30c6dfdc 100644 --- a/h/mh.h +++ b/h/mh.h @@ -382,7 +382,7 @@ typedef struct m_getfld_state *m_getfld_state_t; #define MS_DEFAULT 0 /* default (one msg per file) */ #define MS_UNKNOWN 1 /* type not known yet */ #define MS_MBOX 2 /* Unix-style "from" lines */ -#define MS_MMDF 3 /* string mmdlm2 */ +#define MS_MMDF 3 /* string mmdlm1 */ #define NOUSE 0 /* draft being re-used */ diff --git a/h/mts.h b/h/mts.h index afa95a4c..585c058d 100644 --- a/h/mts.h +++ b/h/mts.h @@ -27,7 +27,6 @@ char *getlocalmbox(void); * Separators */ extern char *mmdlm1; -extern char *mmdlm2; /* * Read mts.conf file diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index e500e24e..ef36a6e5 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -806,7 +806,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob) /* not a Unix style maildrop */ s->readpos -= s->bytes_read; s->bytes_read = 0; - delimstr = mmdlm2; + delimstr = mmdlm1; s->msg_style = MS_MMDF; } diff --git a/sbr/mts.c b/sbr/mts.c index ebb9924d..65059201 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -47,7 +47,6 @@ char *uucpldir = "/usr/spool/mail"; char *uucplfil = ""; char *mmdlm1 = "\001\001\001\001\n"; -char *mmdlm2 = "\001\001\001\001\n"; char *spoollocking = DEFAULT_LOCKING; diff --git a/uip/dropsbr.c b/uip/dropsbr.c index a36d145b..d54696be 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -133,7 +133,7 @@ mbx_chk_mmdf (int fd) ssize_t count; char ldelim[BUFSIZ]; - count = strlen (mmdlm2); + count = strlen (mmdlm1); if (lseek (fd, -count, SEEK_END) == (off_t) NOTOK) return NOTOK; @@ -142,9 +142,9 @@ mbx_chk_mmdf (int fd) ldelim[count] = 0; - if (strcmp (ldelim, mmdlm2) + if (strcmp (ldelim, mmdlm1) && write (fd, "\n", 1) != 1 - && write (fd, mmdlm2, count) != count) + && write (fd, mmdlm1, count) != count) return NOTOK; return OK; @@ -186,14 +186,14 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd, for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++) continue; - for ( ; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++) + for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++) continue; if (write (md, buffer, i) != i) return NOTOK; } - j = strlen (mmdlm2); - if (write (md, mmdlm2, j) != j) + j = strlen (mmdlm1); + if (write (md, mmdlm1, j) != j) return NOTOK; return (i != NOTOK ? OK : NOTOK); -- 2.48.1