summaryrefslogtreecommitdiff
path: root/lib-src/movemail.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src/movemail.c')
-rw-r--r--lib-src/movemail.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 231bc22fa89..84c8ce24286 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -174,8 +174,6 @@ main (int argc, char **argv)
int desc;
#endif /* not MAIL_USE_SYSTEM_LOCK */
- char *spool_name = 0;
-
#ifdef MAIL_USE_POP
bool pop_reverse_order = false;
# define ARGSTR "pr"
@@ -246,13 +244,14 @@ main (int argc, char **argv)
#ifndef DISABLE_DIRECT_ACCESS
char *lockname = 0;
+ char *spool_name = 0;
-#ifndef MAIL_USE_SYSTEM_LOCK
#ifdef MAIL_USE_MAILLOCK
spool_name = mail_spool_name (inname);
#endif
if (! spool_name)
{
+#ifndef MAIL_USE_SYSTEM_LOCK
/* 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
@@ -323,8 +322,8 @@ main (int argc, char **argv)
}
delete_lockname = lockname;
- }
#endif /* not MAIL_USE_SYSTEM_LOCK */
+ }
#ifdef SIGCHLD
signal (SIGCHLD, SIG_DFL);