From 5ecec6a7f4a1ce83abd53a14fba7f51b668c6336 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Feb 2011 16:11:56 -0800 Subject: [PATCH] * movemail.c: Define macros only in needed contexts. --- lib-src/ChangeLog | 5 +++-- lib-src/movemail.c | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 1d0f24212a..7aa13a45cb 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -14,8 +14,9 @@ * movemail.c (main, pop_retr): Rename locals to avoid shadowing. (progname, sfi, sfo, ibuffer, obuffer): Remove unused vars. - (DIRECTORY_SEP, IS_DIRECTORY_SEP, DONE, IS_FROM_LINE): - Remove unused macros. + (DONE): Remove unused macro. + (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_FROM_LINE): + Define these macros only in the contexts that need them. * pop.c (index): Remove unused macro. (KPOP_PORT): Define only if KERBEROS is defined. diff --git a/lib-src/movemail.c b/lib-src/movemail.c index bc7fa8824e..4a894c1cba 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -262,6 +262,13 @@ main (int argc, char **argv) if (! spool_name) #endif { + #ifndef DIRECTORY_SEP + #define DIRECTORY_SEP '/' + #endif + #ifndef IS_DIRECTORY_SEP + #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) + #endif + /* Use a lock file named after our first argument with .lock appended: If it exists, the mail file is locked. */ /* Note: this locking mechanism is *required* by the mailer @@ -862,6 +869,12 @@ static int mbx_write (char *line, int len, FILE *mbf) { #ifdef MOVEMAIL_QUOTE_POP_FROM_LINES + /* Do this as a macro instead of using strcmp to save on execution time. */ + # define IS_FROM_LINE(a) ((a[0] == 'F') \ + && (a[1] == 'r') \ + && (a[2] == 'o') \ + && (a[3] == 'm') \ + && (a[4] == ' ')) if (IS_FROM_LINE (line)) { if (fputc ('>', mbf) == EOF) -- 2.20.1