1989-04-28 03:54:04 +00:00
|
|
|
|
/* movemail foo bar -- move file foo to file bar,
|
|
|
|
|
locking file foo the way /bin/mail respects.
|
2011-01-26 08:36:39 +00:00
|
|
|
|
|
2020-01-01 00:19:43 +00:00
|
|
|
|
Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2020 Free Software
|
2013-01-01 09:11:05 +00:00
|
|
|
|
Foundation, Inc.
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-09 23:19:13 +00:00
|
|
|
|
GNU Emacs is free software: you can redistribute it and/or modify
|
1989-10-31 16:00:17 +00:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2016-03-10 15:34:52 +00:00
|
|
|
|
the Free Software Foundation, either version 3 of the License, or (at
|
|
|
|
|
your option) any later version.
|
1989-10-31 16:00:17 +00:00
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
GNU Emacs is distributed in the hope that it will be useful,
|
1989-10-31 16:00:17 +00:00
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1989-10-31 16:00:17 +00:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
2008-05-09 23:19:13 +00:00
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-04-05 23:04:36 +00:00
|
|
|
|
/* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
|
|
|
|
|
cause loss of mail* if you do it on a system that does not normally
|
2012-08-10 07:07:07 +00:00
|
|
|
|
use flock/lockf as its way of interlocking access to inbox files. The
|
1994-04-05 23:04:36 +00:00
|
|
|
|
setting of MAIL_USE_FLOCK and MAIL_USE_LOCKF *must agree* with the
|
|
|
|
|
system's own conventions. It is not a choice that is up to you.
|
1992-01-18 22:46:00 +00:00
|
|
|
|
|
|
|
|
|
So, if your system uses lock files rather than flock, then the only way
|
|
|
|
|
you can get proper operation is to enable movemail to write lockfiles there.
|
|
|
|
|
This means you must either give that directory access modes
|
|
|
|
|
that permit everyone to write lockfiles in it, or you must make movemail
|
|
|
|
|
a setuid or setgid program. */
|
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
/*
|
|
|
|
|
* Modified January, 1986 by Michael R. Gretzinger (Project Athena)
|
|
|
|
|
*
|
1996-02-22 22:37:14 +00:00
|
|
|
|
* Added POP (Post Office Protocol) service. When compiled -DMAIL_USE_POP
|
1989-04-28 03:54:04 +00:00
|
|
|
|
* movemail will accept input filename arguments of the form
|
|
|
|
|
* "po:username". This will cause movemail to open a connection to
|
|
|
|
|
* a pop server running on $MAILHOST (environment variable). Movemail
|
|
|
|
|
* must be setuid to root in order to work with POP.
|
2003-02-04 14:56:31 +00:00
|
|
|
|
*
|
1989-04-28 03:54:04 +00:00
|
|
|
|
* New module: popmail.c
|
|
|
|
|
* Modified routines:
|
1991-12-07 22:01:44 +00:00
|
|
|
|
* main - added code within #ifdef MAIL_USE_POP; added setuid (getuid ())
|
2003-02-04 14:56:31 +00:00
|
|
|
|
* after POP code.
|
1989-04-28 03:54:04 +00:00
|
|
|
|
* New routines in movemail.c:
|
|
|
|
|
* get_errmsg - return pointer to system error message
|
|
|
|
|
*
|
1994-09-27 19:45:00 +00:00
|
|
|
|
* Modified August, 1993 by Jonathan Kamens (OpenVision Technologies)
|
|
|
|
|
*
|
|
|
|
|
* Move all of the POP code into a separate file, "pop.c".
|
|
|
|
|
* Use strerror instead of get_errmsg.
|
|
|
|
|
*
|
1989-04-28 03:54:04 +00:00
|
|
|
|
*/
|
|
|
|
|
|
2000-05-21 11:02:50 +00:00
|
|
|
|
#include <config.h>
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <sys/file.h>
|
Limit <config.h>’s includes
This follows up on recent problems with the fact that config.h
includes stdlib.h etc.; some files need to include stdlib.h later.
config.h generally should limit itself to includes that are
universally safe; outside of MS-Windows, only stdbool.h makes
the cut among the files currently included. So, move the
other includes to just the files that need them (Bug#24506).
* configure.ac (config_opsysfile): Remove, as this generic hook
is no longer needed.
* lib-src/etags.c, src/unexmacosx.c, src/w32.c, src/w32notify.c:
* src/w32proc.c (_GNU_SOURCE):
Remove, as it’s OK for config.h to do this now.
* src/conf_post.h: Include <ms-w32.h>, instead of the generic
config_opsysfile, for simplicity as this old way of configuring is
now done only for the MS-Windows port. Do not include <ms-w32.h>
if DEFER_MS_W32_H, for the benefit of the few files that want its
effects later. Do not include <alloca.h>, <string.h>, or
<stdlib.h>. Other files modified to include these headers as
needed, or to not include headers that are no longer needed.
* src/lisp.h: Include <alloca.h> and <string.h> here, since
some of the inline functions need them.
* src/regex.c: Include <alloca.h> if not emacs. (If emacs,
we can rely on SAFE_ALLOCA.) There is no longer any need to
worry about HAVE_ALLOCA_H.
* src/unexmacosx.c: Rely on config.h not including stdlib.h.
* src/w32.c, src/w32notify.c, src/w32proc.c (DEFER_MS_W32_H):
Define before including <config.h> first, and include <ms-w32.h>
after the troublesome headers.
2016-09-30 19:14:04 +00:00
|
|
|
|
#include <stdlib.h>
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#include <errno.h>
|
2009-02-13 14:21:30 +00:00
|
|
|
|
#include <time.h>
|
2000-08-28 18:56:15 +00:00
|
|
|
|
|
1997-01-21 01:54:39 +00:00
|
|
|
|
#include <getopt.h>
|
2000-09-01 13:50:50 +00:00
|
|
|
|
#include <unistd.h>
|
2000-08-28 18:56:15 +00:00
|
|
|
|
#include <fcntl.h>
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
#include <signal.h>
|
2010-07-06 11:50:35 +00:00
|
|
|
|
#include <string.h>
|
Use unlocked stdio more systematically
This can improve performance significantly on stdio-bottlenecked code.
E.g., make-docfile is 3x faster on my Fedora 25 x86-64 desktop.
* admin/merge-gnulib (GNULIB_MODULES): Add unlocked-io.
* lib-src/ebrowse.c, lib-src/emacsclient.c, lib-src/etags.c:
* lib-src/hexl.c, lib-src/make-docfile.c, lib-src/movemail.c:
* lib-src/profile.c, lib-src/update-game-score.c:
Include unlocked-io.h instead of stdio.h, since these programs are
single-threaded.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/unlocked-io.h, m4/unlocked-io.m4: New files, copied from Gnulib.
* src/charset.c, src/cm.c, src/emacs.c, src/image.c, src/keyboard.c:
* src/lread.c, src/term.c:
Include sysstdio.h, possibly instead of stdio.h, to define
the unlocked functions if the system does not provide them.
* src/charset.c, src/lread.c (getc_unlocked):
Remove, since sysstdio.h now defines it if needed.
* src/cm.c (cmputc, cmcheckmagic):
* src/dispnew.c (update_frame, update_frame_with_menu)
(update_frame_1, Fsend_string_to_terminal, Fding, bitch_at_user):
* src/emacs.c (main, Fdump_emacs):
* src/fileio.c (Fdo_auto_save, Fset_binary_mode):
* src/image.c (slurp_file, png_read_from_file, png_load_body)
(our_stdio_fill_input_buffer):
* src/keyboard.c (record_char, kbd_buffer_get_event, handle_interrupt):
* src/lread.c (readbyte_from_file):
* src/minibuf.c (read_minibuf_noninteractive):
* src/print.c (printchar_to_stream, strout)
(Fredirect_debugging_output):
* src/sysdep.c (reset_sys_modes, procfs_ttyname)
(procfs_get_total_memory):
* src/term.c (tty_ring_bell, tty_send_additional_strings)
(tty_set_terminal_modes, tty_reset_terminal_modes)
(tty_update_end, tty_clear_end_of_line, tty_write_glyphs)
(tty_write_glyphs_with_face, tty_insert_glyphs)
(tty_menu_activate):
* src/xfaces.c (Fx_load_color_file):
Use unlocked stdio when it should be safe.
* src/sysstdio.h (clearerr_unlocked, feof_unlocked, ferror_unlocked)
(fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked)
(fread_unlocked, fwrite_unlocked, getc_unlocked, getchar_unlocked)
(putc_unlocked, putchar_unloced): Provide substitutes if not declared.
2017-06-22 18:21:20 +00:00
|
|
|
|
|
|
|
|
|
#include <unlocked-io.h>
|
|
|
|
|
|
2000-09-01 13:50:50 +00:00
|
|
|
|
#include "syswait.h"
|
1994-09-27 19:45:00 +00:00
|
|
|
|
#ifdef MAIL_USE_POP
|
|
|
|
|
#include "pop.h"
|
|
|
|
|
#endif
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-01-06 03:57:28 +00:00
|
|
|
|
#ifdef MSDOS
|
|
|
|
|
#undef access
|
|
|
|
|
#endif /* MSDOS */
|
|
|
|
|
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#ifdef WINDOWSNT
|
1998-05-02 06:43:03 +00:00
|
|
|
|
#include "ntlib.h"
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#undef access
|
|
|
|
|
#undef unlink
|
|
|
|
|
#define fork() 0
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
#define waitpid(child, var, flags) (*(var) = 0)
|
1996-04-28 19:07:35 +00:00
|
|
|
|
/* Unfortunately, Samba doesn't seem to properly lock Unix files even
|
|
|
|
|
though the locking call succeeds (and indeed blocks local access from
|
|
|
|
|
other NT programs). If you have direct file access using an NFS
|
|
|
|
|
client or something other than Samba, the locking call might work
|
1998-05-02 06:43:03 +00:00
|
|
|
|
properly - make sure it does before you enable this!
|
|
|
|
|
|
|
|
|
|
[18-Feb-97 andrewi] I now believe my comment above to be incorrect,
|
|
|
|
|
since it was based on a misunderstanding of how locking calls are
|
|
|
|
|
implemented and used on Unix. */
|
|
|
|
|
//#define DISABLE_DIRECT_ACCESS
|
|
|
|
|
|
|
|
|
|
#include <fcntl.h>
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#endif /* WINDOWSNT */
|
|
|
|
|
|
2008-01-18 15:15:07 +00:00
|
|
|
|
#ifdef WINDOWSNT
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#include <sys/locking.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-08-10 07:07:07 +00:00
|
|
|
|
/* If your system uses the `flock' or `lockf' system call for mail locking,
|
|
|
|
|
define MAIL_USE_SYSTEM_LOCK. If your system type should always define
|
|
|
|
|
MAIL_USE_LOCKF or MAIL_USE_FLOCK but configure does not do this,
|
|
|
|
|
please make a bug report. */
|
|
|
|
|
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#ifdef MAIL_USE_LOCKF
|
|
|
|
|
#define MAIL_USE_SYSTEM_LOCK
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef MAIL_USE_FLOCK
|
|
|
|
|
#define MAIL_USE_SYSTEM_LOCK
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-04-12 21:55:38 +00:00
|
|
|
|
#if (!defined MAIL_USE_SYSTEM_LOCK \
|
|
|
|
|
&& (defined HAVE_LIBMAIL || defined HAVE_LIBLOCKFILE) \
|
|
|
|
|
&& defined HAVE_MAILLOCK_H)
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#include <maillock.h>
|
|
|
|
|
/* We can't use maillock unless we know what directory system mail
|
|
|
|
|
files appear in. */
|
|
|
|
|
#ifdef MAILDIR
|
|
|
|
|
#define MAIL_USE_MAILLOCK
|
2011-04-16 21:20:25 +00:00
|
|
|
|
static char *mail_spool_name (char *);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-06-24 17:39:14 +00:00
|
|
|
|
static _Noreturn void fatal (const char *s1, const char *s2, const char *s3);
|
Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
* b2m.c (concat, fatal): Use const char*.
(main): Don't assign labels a string literal.
* ebrowse.c (struct member): filename, def_filename is const.
(struct sym): filename, sfilename is const.
(struct kw): name is const.
(add_sym, yyerror, token_string, insert_keyword, main): Use const char*.
* emacsclient.c (message, sock_err_message, send_to_emacs)
(quote_argument, set_local_socket)
(start_daemon_and_retry_set_socket): Use const char*.
* etags.c (compressor, language, Ada_suffix, Ada_help, Asm_suffixes)
(Asm_help, default_C_suffixes, default_C_help, Cplusplus_suffixes)
(Cplusplus_help, Cjava_suffixes, Cobol_suffixes, Cstar_suffixes)
(Erlang_suffixes, Erlang_help, Forth_suffixes, Forth_help)
(Fortran_suffixes, Fortran_help, HTML_suffixes, HTML_help)
(Lisp_suffixes, Lisp_help, Lua_suffixes, Lua_help)
(Makefile_filenames, Makefile_help, Objc_suffixes, Objc_help)
(Pascal_suffixes, Pascal_help, Perl_suffixes, Perl_interpreters)
(Perl_help, PHP_suffixes, PHP_help, plain_C_suffixses, PS_suffixes)
(PS_help, Prolog_suffixes, Prolog_help, Python_suffixes, Python_help)
(Scheme_suffixes, Scheme_help, TeX_suffixes, TeX_help, Texinfo_suffixes)
(Texinfo_help, Yacc_suffixes, Yacc_help, auto_help, none_help)
(no_lang_help, print_language_names)
(get_language_from_interpreter, get_language_from_filename)
(init, make_tag, struct C_stab_entry, write_classname, TEX_defenv)
(TEX_decode_env, nocase_tail, savestr, savenstr, fatal, pfatal)
(concat): Use const char*.
* make-docfile.c (error, fatal, scan_c_file, scan_lisp_file): Use
const char *.
* movemail.c (fatal, error, concat): Use const char *.
* pop.c (pop_multi_first, socket_connection, sendline): Use conat char*.
* pop.h (pop_multi_first): Use const char *.
(_ARGS): Remove.
* sorted-doc.c (error, fatal, states): Use const char *.
* update-game-score.c (get_prefix, write_scores, main): Use const char*.
2010-08-11 08:20:34 +00:00
|
|
|
|
static void error (const char *s1, const char *s2, const char *s3);
|
2012-06-24 17:39:14 +00:00
|
|
|
|
static _Noreturn void pfatal_with_name (char *name);
|
|
|
|
|
static _Noreturn void pfatal_and_delete (char *name);
|
2010-07-06 11:11:28 +00:00
|
|
|
|
#ifdef MAIL_USE_POP
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
static int popmail (char *, char *, bool, char *, bool);
|
|
|
|
|
static bool pop_retr (popserver, int, FILE *);
|
|
|
|
|
static bool mbx_write (char *, int, FILE *);
|
|
|
|
|
static bool mbx_delimit_begin (FILE *);
|
|
|
|
|
static bool mbx_delimit_end (FILE *);
|
2010-07-06 11:11:28 +00:00
|
|
|
|
#endif
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
2012-07-12 15:20:39 +00:00
|
|
|
|
#if (defined MAIL_USE_MAILLOCK \
|
2015-04-12 21:55:38 +00:00
|
|
|
|
|| (!defined DISABLE_DIRECT_ACCESS && !defined MAIL_USE_SYSTEM_LOCK))
|
2012-07-11 22:44:07 +00:00
|
|
|
|
/* Like malloc but get fatal error if memory is exhausted. */
|
|
|
|
|
|
2018-04-28 23:49:24 +00:00
|
|
|
|
static void * ATTRIBUTE_MALLOC
|
2012-07-11 22:44:07 +00:00
|
|
|
|
xmalloc (size_t size)
|
|
|
|
|
{
|
|
|
|
|
void *result = malloc (size);
|
|
|
|
|
if (!result)
|
|
|
|
|
fatal ("virtual memory exhausted", 0, 0);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
/* Nonzero means this is name of a lock file to delete on fatal error. */
|
2011-02-21 18:06:25 +00:00
|
|
|
|
static char *delete_lockname;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-10-12 19:20:24 +00:00
|
|
|
|
int
|
2010-07-03 00:50:23 +00:00
|
|
|
|
main (int argc, char **argv)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
|
|
|
|
char *inname, *outname;
|
|
|
|
|
int indesc, outdesc;
|
2010-10-03 23:35:22 +00:00
|
|
|
|
ssize_t nread;
|
2011-02-21 18:22:20 +00:00
|
|
|
|
int wait_status;
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
int c;
|
|
|
|
|
bool preserve_mail = false;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#ifndef MAIL_USE_SYSTEM_LOCK
|
1989-04-28 03:54:04 +00:00
|
|
|
|
struct stat st;
|
|
|
|
|
int tem;
|
1992-03-28 21:00:42 +00:00
|
|
|
|
char *tempname;
|
2012-07-11 22:44:07 +00:00
|
|
|
|
size_t inname_len, inname_dirlen;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
int desc;
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#endif /* not MAIL_USE_SYSTEM_LOCK */
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1998-09-04 20:14:16 +00:00
|
|
|
|
#ifdef MAIL_USE_POP
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
bool pop_reverse_order = false;
|
1998-09-04 20:14:16 +00:00
|
|
|
|
# define ARGSTR "pr"
|
|
|
|
|
#else /* ! MAIL_USE_POP */
|
|
|
|
|
# define ARGSTR "p"
|
|
|
|
|
#endif /* MAIL_USE_POP */
|
|
|
|
|
|
2011-09-09 01:06:52 +00:00
|
|
|
|
uid_t real_gid = getgid ();
|
|
|
|
|
uid_t priv_gid = getegid ();
|
2010-04-02 15:26:24 +00:00
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
delete_lockname = 0;
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
while (0 <= (c = getopt (argc, argv, ARGSTR)))
|
1994-10-12 19:20:24 +00:00
|
|
|
|
{
|
1997-01-21 01:54:39 +00:00
|
|
|
|
switch (c) {
|
1998-09-04 20:14:16 +00:00
|
|
|
|
#ifdef MAIL_USE_POP
|
|
|
|
|
case 'r':
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
pop_reverse_order = true;
|
1998-09-04 20:14:16 +00:00
|
|
|
|
break;
|
|
|
|
|
#endif
|
1997-01-21 01:54:39 +00:00
|
|
|
|
case 'p':
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
preserve_mail = true;
|
1997-01-21 01:54:39 +00:00
|
|
|
|
break;
|
|
|
|
|
default:
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1997-01-21 01:54:39 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
#ifdef MAIL_USE_POP
|
|
|
|
|
(argc - optind < 2) || (argc - optind > 3)
|
|
|
|
|
#else
|
|
|
|
|
(argc - optind != 2)
|
|
|
|
|
#endif
|
|
|
|
|
)
|
|
|
|
|
{
|
|
|
|
|
#ifdef MAIL_USE_POP
|
2009-03-04 04:16:39 +00:00
|
|
|
|
fprintf (stderr, "Usage: movemail [-p] [-r] inbox destfile%s\n",
|
2003-07-28 22:10:30 +00:00
|
|
|
|
" [POP-password]");
|
1997-01-21 01:54:39 +00:00
|
|
|
|
#else
|
2003-07-28 22:10:30 +00:00
|
|
|
|
fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", "");
|
1997-01-21 01:54:39 +00:00
|
|
|
|
#endif
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1994-10-12 19:20:24 +00:00
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1997-01-21 01:54:39 +00:00
|
|
|
|
inname = argv[optind];
|
|
|
|
|
outname = argv[optind+1];
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1995-08-06 23:57:31 +00:00
|
|
|
|
if (*outname == 0)
|
2005-02-04 22:11:43 +00:00
|
|
|
|
fatal ("Destination file name is empty", 0, 0);
|
1995-08-06 23:57:31 +00:00
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#ifdef MAIL_USE_POP
|
1993-05-30 19:26:11 +00:00
|
|
|
|
if (!strncmp (inname, "po:", 3))
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
1995-06-30 01:10:20 +00:00
|
|
|
|
int status;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1997-01-21 01:54:39 +00:00
|
|
|
|
status = popmail (inname + 3, outname, preserve_mail,
|
1998-09-04 20:14:16 +00:00
|
|
|
|
(argc - optind == 3) ? argv[optind+2] : NULL,
|
|
|
|
|
pop_reverse_order);
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return status;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-04-02 15:26:24 +00:00
|
|
|
|
if (setuid (getuid ()) < 0)
|
|
|
|
|
fatal ("Failed to drop privileges", 0, 0);
|
|
|
|
|
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#endif /* MAIL_USE_POP */
|
|
|
|
|
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#ifndef DISABLE_DIRECT_ACCESS
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
|
|
|
|
|
char *lockname = 0;
|
2015-09-09 10:36:08 +00:00
|
|
|
|
char *spool_name = 0;
|
|
|
|
|
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#ifdef MAIL_USE_MAILLOCK
|
|
|
|
|
spool_name = mail_spool_name (inname);
|
|
|
|
|
#endif
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (! spool_name)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
2015-09-09 22:40:49 +00:00
|
|
|
|
#ifndef MAIL_USE_SYSTEM_LOCK
|
1997-01-20 07:30:40 +00:00
|
|
|
|
/* 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
|
|
|
|
|
(on systems which use it) to prevent loss of mail.
|
|
|
|
|
|
|
|
|
|
On systems that use a lock file, extracting the mail without locking
|
|
|
|
|
WILL occasionally cause loss of mail due to timing errors!
|
|
|
|
|
|
2012-08-08 16:03:04 +00:00
|
|
|
|
So, if creation of the lock file fails due to access
|
|
|
|
|
permission on the mail spool directory, you simply MUST
|
|
|
|
|
change the permission and/or make movemail a setgid program
|
1997-01-20 07:30:40 +00:00
|
|
|
|
so it can create lock files properly.
|
|
|
|
|
|
2012-08-08 16:03:04 +00:00
|
|
|
|
You might also wish to verify that your system is one which
|
2012-08-10 07:07:07 +00:00
|
|
|
|
uses lock files for this purpose. Some systems use other methods. */
|
1997-01-20 07:30:40 +00:00
|
|
|
|
|
2012-07-11 22:44:07 +00:00
|
|
|
|
inname_len = strlen (inname);
|
|
|
|
|
lockname = xmalloc (inname_len + sizeof ".lock");
|
|
|
|
|
strcpy (lockname, inname);
|
|
|
|
|
strcpy (lockname + inname_len, ".lock");
|
|
|
|
|
for (inname_dirlen = inname_len;
|
2011-06-10 17:50:07 +00:00
|
|
|
|
inname_dirlen && !IS_DIRECTORY_SEP (inname[inname_dirlen - 1]);
|
|
|
|
|
inname_dirlen--)
|
|
|
|
|
continue;
|
2012-07-10 21:48:34 +00:00
|
|
|
|
tempname = xmalloc (inname_dirlen + sizeof "EXXXXXX");
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
while (true)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
1997-01-20 07:30:40 +00:00
|
|
|
|
/* Create the lock file, but not under the lock file name. */
|
|
|
|
|
/* Give up if cannot do that. */
|
2011-06-10 17:50:07 +00:00
|
|
|
|
|
|
|
|
|
memcpy (tempname, inname, inname_dirlen);
|
|
|
|
|
strcpy (tempname + inname_dirlen, "EXXXXXX");
|
Use binary-io module, O_BINARY, and "b" flag.
* admin/merge-gnulib (GNULIB_MODULES): Add binary-io. It was already
present implicitly; this just makes the dependence explicit.
* lib-src/etags.c, lib-src/hexl.c, lib-src/make-docfile.c:
Include binary-io.h instead of fcntl.h and/or io.h.
(main): Use set_binary_mode or SET_BINARY
in place of handcrafted code.
* lib-src/etags.c (main) [DOS_NT]:
* lib-src/movemail.c (main) [WINDOWSNT]:
Don't mess with _fmode.
* lib-src/etags.c (main, process_file_name, analyse_regex):
Use fopen/popen's "b" flag instead.
* lib-src/movemail.c (main, popmail): Use open/lk_open/mkostemp's O_BINARY
instead.
* src/callproc.c (create_temp_file): Use mkostemp's O_BINARY flag.
* src/emacs.c [MSDOS]:
* src/emacs.c (main) [DOS_NT]: Don't mess with _fmode.
(main) [MSDOS]: Use SET_BINARY instead of setmode.
* src/minibuf.c: Include binary-io.h instead of fcntl.h.
(read_minibuf_noninteractive):
Use set_binary_mode instead of handcrafted code.
Don't call emacs_set_tty if emacs_get_tty failed.
* src/sysdep.c, src/systty.h (emacs_get_tty): Return int, not void.
* src/sysdep.c (emacs_open, emacs_pipe): Use O_BINARY.
* src/w32.c (pipe2): Adjust eassert to include O_BINARY.
Fixes: debbugs:18006
2014-07-14 19:23:18 +00:00
|
|
|
|
desc = mkostemp (tempname, O_BINARY);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
if (desc < 0)
|
|
|
|
|
{
|
2013-08-04 16:56:56 +00:00
|
|
|
|
int mkostemp_errno = errno;
|
2011-08-28 23:57:19 +00:00
|
|
|
|
error ("error while creating what would become the lock file",
|
|
|
|
|
0, 0);
|
2013-08-04 16:56:56 +00:00
|
|
|
|
errno = mkostemp_errno;
|
2011-08-28 23:57:19 +00:00
|
|
|
|
pfatal_with_name (tempname);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
}
|
|
|
|
|
close (desc);
|
|
|
|
|
|
|
|
|
|
tem = link (tempname, lockname);
|
2009-01-01 09:34:28 +00:00
|
|
|
|
|
2012-11-23 08:28:06 +00:00
|
|
|
|
if (tem < 0 && errno != EEXIST)
|
|
|
|
|
pfatal_with_name (lockname);
|
2009-01-01 09:34:28 +00:00
|
|
|
|
|
1997-01-20 07:30:40 +00:00
|
|
|
|
unlink (tempname);
|
|
|
|
|
if (tem >= 0)
|
|
|
|
|
break;
|
|
|
|
|
sleep (1);
|
|
|
|
|
|
|
|
|
|
/* If lock file is five minutes old, unlock it.
|
|
|
|
|
Five minutes should be good enough to cope with crashes
|
|
|
|
|
and wedgitude, and long enough to avoid being fooled
|
|
|
|
|
by time differences between machines. */
|
|
|
|
|
if (stat (lockname, &st) >= 0)
|
|
|
|
|
{
|
2011-04-16 21:20:25 +00:00
|
|
|
|
time_t now = time (0);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
if (st.st_ctime < now - 300)
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
{
|
|
|
|
|
unlink (lockname);
|
|
|
|
|
lockname = 0;
|
|
|
|
|
}
|
1997-01-20 07:30:40 +00:00
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
1997-01-20 07:30:40 +00:00
|
|
|
|
delete_lockname = lockname;
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#endif /* not MAIL_USE_SYSTEM_LOCK */
|
2015-09-09 22:40:49 +00:00
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
#ifdef SIGCHLD
|
|
|
|
|
signal (SIGCHLD, SIG_DFL);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
pid_t child = fork ();
|
|
|
|
|
if (child < 0)
|
|
|
|
|
fatal ("Error in fork; %s", strerror (errno), 0);
|
|
|
|
|
|
|
|
|
|
if (child == 0)
|
1994-01-04 06:46:12 +00:00
|
|
|
|
{
|
1996-09-29 22:45:55 +00:00
|
|
|
|
int lockcount = 0;
|
1997-01-20 07:30:40 +00:00
|
|
|
|
int status = 0;
|
|
|
|
|
#if defined (MAIL_USE_MAILLOCK) && defined (HAVE_TOUCHLOCK)
|
Omit IF_LINT code that no longer seems needed
Nowadays GCC is smarter, or the Emacs code has mutated, or both,
and now is as good a time as any to remove uses of IF_LINT that
now seem to be unnecessary.
* lib-src/emacsclient.c (set_local_socket):
* lib-src/movemail.c (main) [MAIL_USE_MAILLOCK && HAVE_TOUCHLOCK]:
* src/buffer.c (fix_start_end_in_overlays, fix_overlays_before):
* src/casefiddle.c (casify_region):
* src/charset.c (load_charset_map):
* src/coding.c (decode_coding_object, encode_coding_object):
* src/data.c (Fmake_variable_buffer_local, Fmake_local_variable)
(cons_to_unsigned, cons_to_signed):
* src/frame.c (make_frame, x_set_frame_parameters):
* src/keyboard.c (read_event_from_main_queue):
* src/regex.c (regex_compile):
* src/syntax.c (back_comment):
* src/window.c (Frecenter):
* src/xfaces.c (Fx_list_fonts):
Remove IF_LINT that no longer seems necessary.
* src/image.c (png_load_body, jpeg_load_body): Simplify use of IF_LINT.
* src/keyboard.c (read_char): Use IF_LINT (volatile) rather than
a pragma dance to pacify GCC -Wclobbered.
* src/xdisp.c (x_produce_glyphs): Rewrite to avoid need for IF_LINT.
* src/xterm.c (x_connection_closed): Now _Noreturn, which should
mean we do not need IF_LINT any more.
(x_io_error_quitter): Now _Noreturn. Put an 'assume (false)’
at the end, to forestall warnings from older compilers.
2016-05-30 23:09:25 +00:00
|
|
|
|
time_t touched_lock;
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#endif
|
1996-09-29 22:45:55 +00:00
|
|
|
|
|
2011-01-23 22:58:52 +00:00
|
|
|
|
if (setuid (getuid ()) < 0 || setregid (-1, real_gid) < 0)
|
2010-04-02 15:26:24 +00:00
|
|
|
|
fatal ("Failed to drop privileges", 0, 0);
|
1994-01-04 06:46:12 +00:00
|
|
|
|
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#ifdef MAIL_USE_SYSTEM_LOCK
|
Use binary-io module, O_BINARY, and "b" flag.
* admin/merge-gnulib (GNULIB_MODULES): Add binary-io. It was already
present implicitly; this just makes the dependence explicit.
* lib-src/etags.c, lib-src/hexl.c, lib-src/make-docfile.c:
Include binary-io.h instead of fcntl.h and/or io.h.
(main): Use set_binary_mode or SET_BINARY
in place of handcrafted code.
* lib-src/etags.c (main) [DOS_NT]:
* lib-src/movemail.c (main) [WINDOWSNT]:
Don't mess with _fmode.
* lib-src/etags.c (main, process_file_name, analyse_regex):
Use fopen/popen's "b" flag instead.
* lib-src/movemail.c (main, popmail): Use open/lk_open/mkostemp's O_BINARY
instead.
* src/callproc.c (create_temp_file): Use mkostemp's O_BINARY flag.
* src/emacs.c [MSDOS]:
* src/emacs.c (main) [DOS_NT]: Don't mess with _fmode.
(main) [MSDOS]: Use SET_BINARY instead of setmode.
* src/minibuf.c: Include binary-io.h instead of fcntl.h.
(read_minibuf_noninteractive):
Use set_binary_mode instead of handcrafted code.
Don't call emacs_set_tty if emacs_get_tty failed.
* src/sysdep.c, src/systty.h (emacs_get_tty): Return int, not void.
* src/sysdep.c (emacs_open, emacs_pipe): Use O_BINARY.
* src/w32.c (pipe2): Adjust eassert to include O_BINARY.
Fixes: debbugs:18006
2014-07-14 19:23:18 +00:00
|
|
|
|
indesc = open (inname, O_RDWR | O_BINARY);
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#else /* if not MAIL_USE_SYSTEM_LOCK */
|
Use binary-io module, O_BINARY, and "b" flag.
* admin/merge-gnulib (GNULIB_MODULES): Add binary-io. It was already
present implicitly; this just makes the dependence explicit.
* lib-src/etags.c, lib-src/hexl.c, lib-src/make-docfile.c:
Include binary-io.h instead of fcntl.h and/or io.h.
(main): Use set_binary_mode or SET_BINARY
in place of handcrafted code.
* lib-src/etags.c (main) [DOS_NT]:
* lib-src/movemail.c (main) [WINDOWSNT]:
Don't mess with _fmode.
* lib-src/etags.c (main, process_file_name, analyse_regex):
Use fopen/popen's "b" flag instead.
* lib-src/movemail.c (main, popmail): Use open/lk_open/mkostemp's O_BINARY
instead.
* src/callproc.c (create_temp_file): Use mkostemp's O_BINARY flag.
* src/emacs.c [MSDOS]:
* src/emacs.c (main) [DOS_NT]: Don't mess with _fmode.
(main) [MSDOS]: Use SET_BINARY instead of setmode.
* src/minibuf.c: Include binary-io.h instead of fcntl.h.
(read_minibuf_noninteractive):
Use set_binary_mode instead of handcrafted code.
Don't call emacs_set_tty if emacs_get_tty failed.
* src/sysdep.c, src/systty.h (emacs_get_tty): Return int, not void.
* src/sysdep.c (emacs_open, emacs_pipe): Use O_BINARY.
* src/w32.c (pipe2): Adjust eassert to include O_BINARY.
Fixes: debbugs:18006
2014-07-14 19:23:18 +00:00
|
|
|
|
indesc = open (inname, O_RDONLY | O_BINARY);
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#endif /* not MAIL_USE_SYSTEM_LOCK */
|
1989-05-14 22:52:53 +00:00
|
|
|
|
|
1994-01-04 06:46:12 +00:00
|
|
|
|
if (indesc < 0)
|
|
|
|
|
pfatal_with_name (inname);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
2013-03-13 01:05:40 +00:00
|
|
|
|
/* Make sure the user can read the output file. */
|
|
|
|
|
umask (umask (0) & 0377);
|
|
|
|
|
|
Use binary-io module, O_BINARY, and "b" flag.
* admin/merge-gnulib (GNULIB_MODULES): Add binary-io. It was already
present implicitly; this just makes the dependence explicit.
* lib-src/etags.c, lib-src/hexl.c, lib-src/make-docfile.c:
Include binary-io.h instead of fcntl.h and/or io.h.
(main): Use set_binary_mode or SET_BINARY
in place of handcrafted code.
* lib-src/etags.c (main) [DOS_NT]:
* lib-src/movemail.c (main) [WINDOWSNT]:
Don't mess with _fmode.
* lib-src/etags.c (main, process_file_name, analyse_regex):
Use fopen/popen's "b" flag instead.
* lib-src/movemail.c (main, popmail): Use open/lk_open/mkostemp's O_BINARY
instead.
* src/callproc.c (create_temp_file): Use mkostemp's O_BINARY flag.
* src/emacs.c [MSDOS]:
* src/emacs.c (main) [DOS_NT]: Don't mess with _fmode.
(main) [MSDOS]: Use SET_BINARY instead of setmode.
* src/minibuf.c: Include binary-io.h instead of fcntl.h.
(read_minibuf_noninteractive):
Use set_binary_mode instead of handcrafted code.
Don't call emacs_set_tty if emacs_get_tty failed.
* src/sysdep.c, src/systty.h (emacs_get_tty): Return int, not void.
* src/sysdep.c (emacs_open, emacs_pipe): Use O_BINARY.
* src/w32.c (pipe2): Adjust eassert to include O_BINARY.
Fixes: debbugs:18006
2014-07-14 19:23:18 +00:00
|
|
|
|
outdesc = open (outname, O_WRONLY | O_BINARY | O_CREAT | O_EXCL, 0666);
|
1994-01-04 06:46:12 +00:00
|
|
|
|
if (outdesc < 0)
|
|
|
|
|
pfatal_with_name (outname);
|
1996-09-29 22:45:55 +00:00
|
|
|
|
|
2011-01-23 22:58:52 +00:00
|
|
|
|
if (setregid (-1, priv_gid) < 0)
|
2010-04-02 15:26:24 +00:00
|
|
|
|
fatal ("Failed to regain privileges", 0, 0);
|
|
|
|
|
|
1996-09-29 22:45:55 +00:00
|
|
|
|
/* This label exists so we can retry locking
|
|
|
|
|
after a delay, if it got EAGAIN or EBUSY. */
|
|
|
|
|
retry_lock:
|
|
|
|
|
|
|
|
|
|
/* Try to lock it. */
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#ifdef MAIL_USE_MAILLOCK
|
|
|
|
|
if (spool_name)
|
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
/* The "-" is to make it a negative number if maillock returns
|
1997-01-20 07:30:40 +00:00
|
|
|
|
non-zero. */
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
status = - maillock (spool_name, 1);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#ifdef HAVE_TOUCHLOCK
|
|
|
|
|
touched_lock = time (0);
|
|
|
|
|
#endif
|
|
|
|
|
lockcount = 5;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif /* MAIL_USE_MAILLOCK */
|
|
|
|
|
{
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#ifdef MAIL_USE_SYSTEM_LOCK
|
|
|
|
|
#ifdef MAIL_USE_LOCKF
|
1997-01-20 07:30:40 +00:00
|
|
|
|
status = lockf (indesc, F_LOCK, 0);
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#else /* not MAIL_USE_LOCKF */
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#ifdef WINDOWSNT
|
1997-01-20 07:30:40 +00:00
|
|
|
|
status = locking (indesc, LK_RLCK, -1L);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#else
|
1997-01-20 07:30:40 +00:00
|
|
|
|
status = flock (indesc, LOCK_EX);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#endif
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#endif /* not MAIL_USE_LOCKF */
|
|
|
|
|
#endif /* MAIL_USE_SYSTEM_LOCK */
|
1997-01-20 07:30:40 +00:00
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1996-09-29 22:45:55 +00:00
|
|
|
|
/* If it fails, retry up to 5 times
|
|
|
|
|
for certain failure codes. */
|
|
|
|
|
if (status < 0)
|
|
|
|
|
{
|
2012-11-27 05:17:07 +00:00
|
|
|
|
if (++lockcount <= 5 && (errno == EAGAIN || errno == EBUSY))
|
1996-09-29 22:45:55 +00:00
|
|
|
|
{
|
2012-11-27 05:17:07 +00:00
|
|
|
|
sleep (1);
|
|
|
|
|
goto retry_lock;
|
1996-09-29 22:45:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pfatal_with_name (inname);
|
|
|
|
|
}
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
1992-04-01 11:14:15 +00:00
|
|
|
|
{
|
1994-01-04 06:46:12 +00:00
|
|
|
|
char buf[1024];
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
while (true)
|
1992-04-01 11:14:15 +00:00
|
|
|
|
{
|
1994-01-04 06:46:12 +00:00
|
|
|
|
nread = read (indesc, buf, sizeof buf);
|
2006-04-29 18:55:19 +00:00
|
|
|
|
if (nread < 0)
|
|
|
|
|
pfatal_with_name (inname);
|
1994-01-04 06:46:12 +00:00
|
|
|
|
if (nread != write (outdesc, buf, nread))
|
|
|
|
|
{
|
|
|
|
|
int saved_errno = errno;
|
|
|
|
|
unlink (outname);
|
|
|
|
|
errno = saved_errno;
|
|
|
|
|
pfatal_with_name (outname);
|
|
|
|
|
}
|
|
|
|
|
if (nread < sizeof buf)
|
|
|
|
|
break;
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#if defined (MAIL_USE_MAILLOCK) && defined (HAVE_TOUCHLOCK)
|
|
|
|
|
if (spool_name)
|
|
|
|
|
{
|
2011-04-16 21:20:25 +00:00
|
|
|
|
time_t now = time (0);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
if (now - touched_lock > 60)
|
|
|
|
|
{
|
|
|
|
|
touchlock ();
|
|
|
|
|
touched_lock = now;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* MAIL_USE_MAILLOCK */
|
1992-04-01 11:14:15 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
File synchronization fixes.
* admin/CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
* admin/merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
* configure.ac (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
(fsync): Remove check; now done by gnulib.
* lib/fdatasync.c, lib/fsync.c, m4/fdatasync.m4, m4/fsync.m4:
New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib-src/Makefile.in (LIB_FDATASYNC): New macro.
(emacsclient${EXEEXT}): Use it.
* lib-src/emacsclient.c (main): Use fdatasync, not fsync, since we don't
care about metadata. Keep trying if interrupted.
* lib-src/movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
fsync is available everywhere (or there is a substitute). Don't
report an error if fsync returns EINVAL.
* nt/inc/ms-w32.h (fdatasync): New macro, suggested by Eli Zaretskii.
* src/Makefile.in (LIB_FDATASYNC): New macro.
(LIBES): Use it.
* src/conf_post.h (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
* src/fileio.c (Fwrite_region, write_region_inhibit_fsync):
Don't worry about HAVE_FSYNC, since a substitute fsync is
available if the system lacks one.
(Fwrite_regin): Retry fsync if interrupted.
Fixes: debbugs:13944
2013-03-13 18:42:22 +00:00
|
|
|
|
if (fsync (outdesc) != 0 && errno != EINVAL)
|
1994-01-04 06:46:12 +00:00
|
|
|
|
pfatal_and_delete (outname);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
2010-04-02 15:26:24 +00:00
|
|
|
|
/* Prevent symlink attacks truncating other users' mailboxes */
|
2011-01-23 22:58:52 +00:00
|
|
|
|
if (setregid (-1, real_gid) < 0)
|
2010-04-02 15:26:24 +00:00
|
|
|
|
fatal ("Failed to drop privileges", 0, 0);
|
|
|
|
|
|
1994-01-04 06:46:12 +00:00
|
|
|
|
/* Check to make sure no errors before we zap the inbox. */
|
|
|
|
|
if (close (outdesc) != 0)
|
|
|
|
|
pfatal_and_delete (outname);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#ifdef MAIL_USE_SYSTEM_LOCK
|
1997-01-21 01:54:39 +00:00
|
|
|
|
if (! preserve_mail)
|
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (ftruncate (indesc, 0) != 0)
|
2011-01-23 07:30:19 +00:00
|
|
|
|
pfatal_with_name (inname);
|
1998-01-23 11:06:49 +00:00
|
|
|
|
}
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#endif /* MAIL_USE_SYSTEM_LOCK */
|
1989-05-14 22:52:53 +00:00
|
|
|
|
|
1994-01-04 06:46:12 +00:00
|
|
|
|
close (indesc);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#ifndef MAIL_USE_SYSTEM_LOCK
|
1997-01-21 01:54:39 +00:00
|
|
|
|
if (! preserve_mail)
|
|
|
|
|
{
|
|
|
|
|
/* Delete the input file; if we can't, at least get rid of its
|
|
|
|
|
contents. */
|
1992-03-09 17:40:11 +00:00
|
|
|
|
#ifdef MAIL_UNLINK_SPOOL
|
1997-01-21 01:54:39 +00:00
|
|
|
|
/* This is generally bad to do, because it destroys the permissions
|
|
|
|
|
that were set on the file. Better to just empty the file. */
|
|
|
|
|
if (unlink (inname) < 0 && errno != ENOENT)
|
1992-03-09 17:40:11 +00:00
|
|
|
|
#endif /* MAIL_UNLINK_SPOOL */
|
1997-01-21 01:54:39 +00:00
|
|
|
|
creat (inname, 0600);
|
|
|
|
|
}
|
1994-04-05 23:04:36 +00:00
|
|
|
|
#endif /* not MAIL_USE_SYSTEM_LOCK */
|
1994-01-04 06:46:12 +00:00
|
|
|
|
|
2010-04-02 15:26:24 +00:00
|
|
|
|
/* End of mailbox truncation */
|
2011-01-23 22:58:52 +00:00
|
|
|
|
if (setregid (-1, priv_gid) < 0)
|
2010-04-02 15:26:24 +00:00
|
|
|
|
fatal ("Failed to regain privileges", 0, 0);
|
|
|
|
|
|
1997-01-20 07:30:40 +00:00
|
|
|
|
#ifdef MAIL_USE_MAILLOCK
|
|
|
|
|
/* This has to occur in the child, i.e., in the process that
|
|
|
|
|
acquired the lock! */
|
|
|
|
|
if (spool_name)
|
|
|
|
|
mailunlock ();
|
|
|
|
|
#endif
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return EXIT_SUCCESS;
|
1994-01-04 06:46:12 +00:00
|
|
|
|
}
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (waitpid (child, &wait_status, 0) < 0)
|
|
|
|
|
fatal ("Error in waitpid; %s", strerror (errno), 0);
|
2011-02-21 18:22:20 +00:00
|
|
|
|
if (!WIFEXITED (wait_status))
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return EXIT_FAILURE;
|
2012-08-02 04:14:48 +00:00
|
|
|
|
else if (WEXITSTATUS (wait_status) != 0)
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return WEXITSTATUS (wait_status);
|
1994-01-04 06:46:12 +00:00
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (lockname)
|
1997-01-20 07:30:40 +00:00
|
|
|
|
unlink (lockname);
|
1996-04-28 19:07:35 +00:00
|
|
|
|
|
|
|
|
|
#endif /* ! DISABLE_DIRECT_ACCESS */
|
|
|
|
|
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_SUCCESS;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
1997-01-20 07:30:40 +00:00
|
|
|
|
|
|
|
|
|
#ifdef MAIL_USE_MAILLOCK
|
|
|
|
|
/* This function uses stat to confirm that the mail directory is
|
|
|
|
|
identical to the directory of the input file, rather than just
|
|
|
|
|
string-comparing the two paths, because one or both of them might
|
|
|
|
|
be symbolic links pointing to some other directory. */
|
|
|
|
|
static char *
|
2010-10-03 23:35:22 +00:00
|
|
|
|
mail_spool_name (char *inname)
|
1997-01-20 07:30:40 +00:00
|
|
|
|
{
|
|
|
|
|
struct stat stat1, stat2;
|
|
|
|
|
char *indir, *fname;
|
|
|
|
|
int status;
|
|
|
|
|
|
Use strchr, strrchr instead of index, rindex
* callint.c (Fcall_interactively): Use strchr, strrchr instead of
index, rindex.
* doc.c (get_doc_string, Fsnarf_documentation): Likewise.
* editfns.c (Fuser_full_name, Fformat): Likewise.
* emacs.c (argmatch, sort_args, decode_env_path): Likewise.
* fileio.c (Ffile_symlink_p): Likewise.
* filelock.c (current_lock_owner): Likewise.
* font.c (font_parse_name, font_parse_family_registry): Likewise.
* fontset.c (fontset_pattern_regexp): Likewise.
* lread.c (read1): Likewise.
* sysdep.c (init_system_name): Likewise.
* xfns.c (select_visual): Likewise.
* s/hpux10-20.h (index, rindex): Don't define.
* s/ms-w32.h (index): Likewise.
* s/usg5-4.h: Likewise.
* sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
(HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.
* emacsclient.c (set_local_socket): Use strchr, strrchr instead of
index, rindex.
* movemail.c (mail_spool_name, popmail): Likewise.
* pop.c (pop_list): Likewise.
* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
* configure.in: Don't check for index and rindex, check for strchr
and strrchr. Define strchr and strrchr as index and rindex,
resp., in src/config.h if not available.
2010-07-11 10:31:10 +00:00
|
|
|
|
if (! (fname = strrchr (inname, '/')))
|
1997-01-20 07:30:40 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
fname++;
|
|
|
|
|
|
|
|
|
|
if (stat (MAILDIR, &stat1) < 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2012-07-10 21:48:34 +00:00
|
|
|
|
indir = xmalloc (fname - inname + 1);
|
|
|
|
|
memcpy (indir, inname, fname - inname);
|
1997-01-20 07:30:40 +00:00
|
|
|
|
indir[fname-inname] = '\0';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
status = stat (indir, &stat2);
|
|
|
|
|
|
|
|
|
|
free (indir);
|
|
|
|
|
|
|
|
|
|
if (status < 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
1997-07-05 03:19:16 +00:00
|
|
|
|
if (stat1.st_dev == stat2.st_dev
|
|
|
|
|
&& stat1.st_ino == stat2.st_ino)
|
1997-01-20 07:30:40 +00:00
|
|
|
|
return fname;
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
#endif /* MAIL_USE_MAILLOCK */
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
|
|
|
|
/* Print error message and exit. */
|
|
|
|
|
|
2010-07-06 11:50:35 +00:00
|
|
|
|
static void
|
Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
* b2m.c (concat, fatal): Use const char*.
(main): Don't assign labels a string literal.
* ebrowse.c (struct member): filename, def_filename is const.
(struct sym): filename, sfilename is const.
(struct kw): name is const.
(add_sym, yyerror, token_string, insert_keyword, main): Use const char*.
* emacsclient.c (message, sock_err_message, send_to_emacs)
(quote_argument, set_local_socket)
(start_daemon_and_retry_set_socket): Use const char*.
* etags.c (compressor, language, Ada_suffix, Ada_help, Asm_suffixes)
(Asm_help, default_C_suffixes, default_C_help, Cplusplus_suffixes)
(Cplusplus_help, Cjava_suffixes, Cobol_suffixes, Cstar_suffixes)
(Erlang_suffixes, Erlang_help, Forth_suffixes, Forth_help)
(Fortran_suffixes, Fortran_help, HTML_suffixes, HTML_help)
(Lisp_suffixes, Lisp_help, Lua_suffixes, Lua_help)
(Makefile_filenames, Makefile_help, Objc_suffixes, Objc_help)
(Pascal_suffixes, Pascal_help, Perl_suffixes, Perl_interpreters)
(Perl_help, PHP_suffixes, PHP_help, plain_C_suffixses, PS_suffixes)
(PS_help, Prolog_suffixes, Prolog_help, Python_suffixes, Python_help)
(Scheme_suffixes, Scheme_help, TeX_suffixes, TeX_help, Texinfo_suffixes)
(Texinfo_help, Yacc_suffixes, Yacc_help, auto_help, none_help)
(no_lang_help, print_language_names)
(get_language_from_interpreter, get_language_from_filename)
(init, make_tag, struct C_stab_entry, write_classname, TEX_defenv)
(TEX_decode_env, nocase_tail, savestr, savenstr, fatal, pfatal)
(concat): Use const char*.
* make-docfile.c (error, fatal, scan_c_file, scan_lisp_file): Use
const char *.
* movemail.c (fatal, error, concat): Use const char *.
* pop.c (pop_multi_first, socket_connection, sendline): Use conat char*.
* pop.h (pop_multi_first): Use const char *.
(_ARGS): Remove.
* sorted-doc.c (error, fatal, states): Use const char *.
* update-game-score.c (get_prefix, write_scores, main): Use const char*.
2010-08-11 08:20:34 +00:00
|
|
|
|
fatal (const char *s1, const char *s2, const char *s3)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
|
|
|
|
if (delete_lockname)
|
|
|
|
|
unlink (delete_lockname);
|
2005-02-04 22:11:43 +00:00
|
|
|
|
error (s1, s2, s3);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
exit (EXIT_FAILURE);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2000-08-28 18:56:15 +00:00
|
|
|
|
/* Print error message. `s1' is printf control string, `s2' and `s3'
|
|
|
|
|
are args for it or null. */
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
2010-07-06 11:50:35 +00:00
|
|
|
|
static void
|
Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
* b2m.c (concat, fatal): Use const char*.
(main): Don't assign labels a string literal.
* ebrowse.c (struct member): filename, def_filename is const.
(struct sym): filename, sfilename is const.
(struct kw): name is const.
(add_sym, yyerror, token_string, insert_keyword, main): Use const char*.
* emacsclient.c (message, sock_err_message, send_to_emacs)
(quote_argument, set_local_socket)
(start_daemon_and_retry_set_socket): Use const char*.
* etags.c (compressor, language, Ada_suffix, Ada_help, Asm_suffixes)
(Asm_help, default_C_suffixes, default_C_help, Cplusplus_suffixes)
(Cplusplus_help, Cjava_suffixes, Cobol_suffixes, Cstar_suffixes)
(Erlang_suffixes, Erlang_help, Forth_suffixes, Forth_help)
(Fortran_suffixes, Fortran_help, HTML_suffixes, HTML_help)
(Lisp_suffixes, Lisp_help, Lua_suffixes, Lua_help)
(Makefile_filenames, Makefile_help, Objc_suffixes, Objc_help)
(Pascal_suffixes, Pascal_help, Perl_suffixes, Perl_interpreters)
(Perl_help, PHP_suffixes, PHP_help, plain_C_suffixses, PS_suffixes)
(PS_help, Prolog_suffixes, Prolog_help, Python_suffixes, Python_help)
(Scheme_suffixes, Scheme_help, TeX_suffixes, TeX_help, Texinfo_suffixes)
(Texinfo_help, Yacc_suffixes, Yacc_help, auto_help, none_help)
(no_lang_help, print_language_names)
(get_language_from_interpreter, get_language_from_filename)
(init, make_tag, struct C_stab_entry, write_classname, TEX_defenv)
(TEX_decode_env, nocase_tail, savestr, savenstr, fatal, pfatal)
(concat): Use const char*.
* make-docfile.c (error, fatal, scan_c_file, scan_lisp_file): Use
const char *.
* movemail.c (fatal, error, concat): Use const char *.
* pop.c (pop_multi_first, socket_connection, sendline): Use conat char*.
* pop.h (pop_multi_first): Use const char *.
(_ARGS): Remove.
* sorted-doc.c (error, fatal, states): Use const char *.
* update-game-score.c (get_prefix, write_scores, main): Use const char*.
2010-08-11 08:20:34 +00:00
|
|
|
|
error (const char *s1, const char *s2, const char *s3)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
1994-10-12 19:20:24 +00:00
|
|
|
|
fprintf (stderr, "movemail: ");
|
2000-08-28 18:56:15 +00:00
|
|
|
|
if (s3)
|
|
|
|
|
fprintf (stderr, s1, s2, s3);
|
|
|
|
|
else if (s2)
|
|
|
|
|
fprintf (stderr, s1, s2);
|
|
|
|
|
else
|
2010-06-24 16:12:35 +00:00
|
|
|
|
fprintf (stderr, "%s", s1);
|
1994-10-12 19:20:24 +00:00
|
|
|
|
fprintf (stderr, "\n");
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-06 11:50:35 +00:00
|
|
|
|
static void
|
2010-07-03 00:50:23 +00:00
|
|
|
|
pfatal_with_name (char *name)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
2005-02-04 22:11:43 +00:00
|
|
|
|
fatal ("%s for %s", strerror (errno), name);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-06 11:50:35 +00:00
|
|
|
|
static void
|
2010-07-03 00:50:23 +00:00
|
|
|
|
pfatal_and_delete (char *name)
|
1991-12-07 22:01:44 +00:00
|
|
|
|
{
|
2005-02-04 22:11:43 +00:00
|
|
|
|
char *s = strerror (errno);
|
1991-12-07 22:01:44 +00:00
|
|
|
|
unlink (name);
|
2005-02-04 22:11:43 +00:00
|
|
|
|
fatal ("%s for %s", s, name);
|
1991-12-07 22:01:44 +00:00
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
|
|
|
|
/* This is the guts of the interface to the Post Office Protocol. */
|
|
|
|
|
|
|
|
|
|
#ifdef MAIL_USE_POP
|
|
|
|
|
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#ifndef WINDOWSNT
|
1989-04-28 03:54:04 +00:00
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
|
#include <netdb.h>
|
1996-04-28 19:07:35 +00:00
|
|
|
|
#else
|
|
|
|
|
#undef _WINSOCKAPI_
|
|
|
|
|
#include <winsock.h>
|
|
|
|
|
#endif
|
1992-05-07 20:13:17 +00:00
|
|
|
|
#include <pwd.h>
|
2009-02-11 03:59:52 +00:00
|
|
|
|
#include <string.h>
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1999-12-10 09:53:01 +00:00
|
|
|
|
/*
|
2008-02-05 02:30:41 +00:00
|
|
|
|
* The full valid syntax for a POP mailbox specification for movemail
|
1999-12-10 09:53:01 +00:00
|
|
|
|
* is "po:username:hostname". The ":hostname" is optional; if it is
|
|
|
|
|
* omitted, the MAILHOST environment variable will be consulted. Note
|
|
|
|
|
* that by the time popmail() is called the "po:" has been stripped
|
|
|
|
|
* off of the front of the mailbox name.
|
|
|
|
|
*
|
|
|
|
|
* If the mailbox is in the form "po:username:hostname", then it is
|
|
|
|
|
* modified by this function -- the second colon is replaced by a
|
|
|
|
|
* null.
|
2004-05-08 15:26:33 +00:00
|
|
|
|
*
|
|
|
|
|
* Return a value suitable for passing to `exit'.
|
1999-12-10 09:53:01 +00:00
|
|
|
|
*/
|
|
|
|
|
|
2010-07-06 11:50:35 +00:00
|
|
|
|
static int
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
popmail (char *mailbox, char *outfile, bool preserve, char *password,
|
|
|
|
|
bool reverse_order)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
1990-11-13 05:11:43 +00:00
|
|
|
|
int nmsgs, nbytes;
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
int i;
|
1990-11-13 05:11:43 +00:00
|
|
|
|
int mbfi;
|
|
|
|
|
FILE *mbf;
|
1994-10-20 20:35:57 +00:00
|
|
|
|
popserver server;
|
1998-09-04 20:14:16 +00:00
|
|
|
|
int start, end, increment;
|
1999-12-10 09:53:01 +00:00
|
|
|
|
char *user, *hostname;
|
|
|
|
|
|
|
|
|
|
user = mailbox;
|
Use strchr, strrchr instead of index, rindex
* callint.c (Fcall_interactively): Use strchr, strrchr instead of
index, rindex.
* doc.c (get_doc_string, Fsnarf_documentation): Likewise.
* editfns.c (Fuser_full_name, Fformat): Likewise.
* emacs.c (argmatch, sort_args, decode_env_path): Likewise.
* fileio.c (Ffile_symlink_p): Likewise.
* filelock.c (current_lock_owner): Likewise.
* font.c (font_parse_name, font_parse_family_registry): Likewise.
* fontset.c (fontset_pattern_regexp): Likewise.
* lread.c (read1): Likewise.
* sysdep.c (init_system_name): Likewise.
* xfns.c (select_visual): Likewise.
* s/hpux10-20.h (index, rindex): Don't define.
* s/ms-w32.h (index): Likewise.
* s/usg5-4.h: Likewise.
* sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
(HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.
* emacsclient.c (set_local_socket): Use strchr, strrchr instead of
index, rindex.
* movemail.c (mail_spool_name, popmail): Likewise.
* pop.c (pop_list): Likewise.
* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
* configure.in: Don't check for index and rindex, check for strchr
and strrchr. Define strchr and strrchr as index and rindex,
resp., in src/config.h if not available.
2010-07-11 10:31:10 +00:00
|
|
|
|
if ((hostname = strchr (mailbox, ':')))
|
1999-12-10 09:53:01 +00:00
|
|
|
|
*hostname++ = '\0';
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1999-12-10 09:53:01 +00:00
|
|
|
|
server = pop_open (hostname, user, password, POP_NO_GETPASS);
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (! server)
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
2000-08-28 18:56:15 +00:00
|
|
|
|
error ("Error connecting to POP server: %s", pop_error, 0);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (pop_stat (server, &nmsgs, &nbytes))
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
2000-08-28 18:56:15 +00:00
|
|
|
|
error ("Error getting message count from POP server: %s", pop_error, 0);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
1990-11-13 05:11:43 +00:00
|
|
|
|
if (!nmsgs)
|
|
|
|
|
{
|
1994-09-27 19:45:00 +00:00
|
|
|
|
pop_close (server);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_SUCCESS;
|
1990-11-13 05:11:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
Use binary-io module, O_BINARY, and "b" flag.
* admin/merge-gnulib (GNULIB_MODULES): Add binary-io. It was already
present implicitly; this just makes the dependence explicit.
* lib-src/etags.c, lib-src/hexl.c, lib-src/make-docfile.c:
Include binary-io.h instead of fcntl.h and/or io.h.
(main): Use set_binary_mode or SET_BINARY
in place of handcrafted code.
* lib-src/etags.c (main) [DOS_NT]:
* lib-src/movemail.c (main) [WINDOWSNT]:
Don't mess with _fmode.
* lib-src/etags.c (main, process_file_name, analyse_regex):
Use fopen/popen's "b" flag instead.
* lib-src/movemail.c (main, popmail): Use open/lk_open/mkostemp's O_BINARY
instead.
* src/callproc.c (create_temp_file): Use mkostemp's O_BINARY flag.
* src/emacs.c [MSDOS]:
* src/emacs.c (main) [DOS_NT]: Don't mess with _fmode.
(main) [MSDOS]: Use SET_BINARY instead of setmode.
* src/minibuf.c: Include binary-io.h instead of fcntl.h.
(read_minibuf_noninteractive):
Use set_binary_mode instead of handcrafted code.
Don't call emacs_set_tty if emacs_get_tty failed.
* src/sysdep.c, src/systty.h (emacs_get_tty): Return int, not void.
* src/sysdep.c (emacs_open, emacs_pipe): Use O_BINARY.
* src/w32.c (pipe2): Adjust eassert to include O_BINARY.
Fixes: debbugs:18006
2014-07-14 19:23:18 +00:00
|
|
|
|
mbfi = open (outfile, O_WRONLY | O_BINARY | O_CREAT | O_EXCL, 0666);
|
1990-11-13 05:11:43 +00:00
|
|
|
|
if (mbfi < 0)
|
|
|
|
|
{
|
1994-09-27 19:45:00 +00:00
|
|
|
|
pop_close (server);
|
|
|
|
|
error ("Error in open: %s, %s", strerror (errno), outfile);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1990-11-13 05:11:43 +00:00
|
|
|
|
}
|
2011-02-21 22:31:55 +00:00
|
|
|
|
|
|
|
|
|
if (fchown (mbfi, getuid (), -1) != 0)
|
|
|
|
|
{
|
|
|
|
|
int fchown_errno = errno;
|
|
|
|
|
struct stat st;
|
|
|
|
|
if (fstat (mbfi, &st) != 0 || st.st_uid != getuid ())
|
|
|
|
|
{
|
|
|
|
|
pop_close (server);
|
|
|
|
|
error ("Error in fchown: %s, %s", strerror (fchown_errno), outfile);
|
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
}
|
|
|
|
|
}
|
1990-11-13 05:11:43 +00:00
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
mbf = fdopen (mbfi, "wb");
|
|
|
|
|
if (!mbf)
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
1994-09-27 19:45:00 +00:00
|
|
|
|
pop_close (server);
|
2000-08-28 18:56:15 +00:00
|
|
|
|
error ("Error in fdopen: %s", strerror (errno), 0);
|
1994-09-27 19:45:00 +00:00
|
|
|
|
close (mbfi);
|
|
|
|
|
unlink (outfile);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1990-11-13 05:11:43 +00:00
|
|
|
|
}
|
|
|
|
|
|
1998-09-04 20:14:16 +00:00
|
|
|
|
if (reverse_order)
|
|
|
|
|
{
|
|
|
|
|
start = nmsgs;
|
|
|
|
|
end = 1;
|
|
|
|
|
increment = -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
start = 1;
|
|
|
|
|
end = nmsgs;
|
|
|
|
|
increment = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = start; i * increment <= end * increment; i += increment)
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (! (mbx_delimit_begin (mbf)
|
|
|
|
|
&& pop_retr (server, i, mbf)
|
|
|
|
|
&& mbx_delimit_end (mbf)
|
|
|
|
|
&& fflush (mbf) == 0))
|
|
|
|
|
{
|
|
|
|
|
if (errno)
|
|
|
|
|
error ("Error in POP retrieving: %s", strerror (errno), 0);
|
|
|
|
|
pop_close (server);
|
|
|
|
|
fclose (mbf);
|
|
|
|
|
return EXIT_FAILURE;
|
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
File synchronization fixes.
* admin/CPP-DEFINES (BSD_SYSTEM, HAVE_FSYNC): Remove.
* admin/merge-gnulib (GNULIB_MODULES): Add fsync, fdatasync.
* configure.ac (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
(fsync): Remove check; now done by gnulib.
* lib/fdatasync.c, lib/fsync.c, m4/fdatasync.m4, m4/fsync.m4:
New files, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib-src/Makefile.in (LIB_FDATASYNC): New macro.
(emacsclient${EXEEXT}): Use it.
* lib-src/emacsclient.c (main): Use fdatasync, not fsync, since we don't
care about metadata. Keep trying if interrupted.
* lib-src/movemail.c (main, popmail): Don't worry about BSD_SYSTEM, since
fsync is available everywhere (or there is a substitute). Don't
report an error if fsync returns EINVAL.
* nt/inc/ms-w32.h (fdatasync): New macro, suggested by Eli Zaretskii.
* src/Makefile.in (LIB_FDATASYNC): New macro.
(LIBES): Use it.
* src/conf_post.h (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
* src/fileio.c (Fwrite_region, write_region_inhibit_fsync):
Don't worry about HAVE_FSYNC, since a substitute fsync is
available if the system lacks one.
(Fwrite_regin): Retry fsync if interrupted.
Fixes: debbugs:13944
2013-03-13 18:42:22 +00:00
|
|
|
|
if (fsync (mbfi) != 0 && errno != EINVAL)
|
1991-12-07 22:01:44 +00:00
|
|
|
|
{
|
2001-11-03 19:03:48 +00:00
|
|
|
|
error ("Error in fsync: %s", strerror (errno), 0);
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
fclose (mbf);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1991-12-07 22:01:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (fclose (mbf) != 0)
|
1991-12-07 22:01:44 +00:00
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
error ("Error in fclose: %s", strerror (errno), 0);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1991-12-07 22:01:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
1997-01-21 01:54:39 +00:00
|
|
|
|
if (! preserve)
|
|
|
|
|
for (i = 1; i <= nmsgs; i++)
|
|
|
|
|
{
|
|
|
|
|
if (pop_delete (server, i))
|
|
|
|
|
{
|
2000-08-28 18:56:15 +00:00
|
|
|
|
error ("Error from POP server: %s", pop_error, 0);
|
1997-01-21 01:54:39 +00:00
|
|
|
|
pop_close (server);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1997-01-21 01:54:39 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (pop_quit (server))
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
2000-08-28 18:56:15 +00:00
|
|
|
|
error ("Error from POP server: %s", pop_error, 0);
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_FAILURE;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
2003-02-04 14:56:31 +00:00
|
|
|
|
|
2004-05-08 15:26:33 +00:00
|
|
|
|
return EXIT_SUCCESS;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
static bool
|
2010-07-03 00:50:23 +00:00
|
|
|
|
pop_retr (popserver server, int msgno, FILE *arg)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
1994-09-27 19:45:00 +00:00
|
|
|
|
char *line;
|
|
|
|
|
int ret;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (pop_retrieve_first (server, msgno, &line))
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
error ("Error from POP server: %s", pop_error, 0);
|
|
|
|
|
errno = 0;
|
|
|
|
|
return false;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
1997-12-04 06:44:56 +00:00
|
|
|
|
while ((ret = pop_retrieve_next (server, &line)) >= 0)
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (! line)
|
|
|
|
|
break;
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (! mbx_write (line, ret, arg))
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
int write_errno = errno;
|
1994-09-27 19:45:00 +00:00
|
|
|
|
pop_close (server);
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
errno = write_errno;
|
|
|
|
|
return false;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (ret)
|
1990-11-13 05:11:43 +00:00
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
error ("Error from POP server: %s", pop_error, 0);
|
|
|
|
|
errno = 0;
|
|
|
|
|
return false;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return true;
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
static bool
|
2010-07-03 00:50:23 +00:00
|
|
|
|
mbx_write (char *line, int len, FILE *mbf)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
1997-12-03 07:11:43 +00:00
|
|
|
|
#ifdef MOVEMAIL_QUOTE_POP_FROM_LINES
|
2011-02-22 00:11:56 +00:00
|
|
|
|
/* 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] == ' '))
|
1994-09-27 19:45:00 +00:00
|
|
|
|
if (IS_FROM_LINE (line))
|
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (fputc ('>', mbf) < 0)
|
|
|
|
|
return false;
|
1994-09-27 19:45:00 +00:00
|
|
|
|
}
|
1997-12-03 07:11:43 +00:00
|
|
|
|
#endif
|
|
|
|
|
if (line[0] == '\037')
|
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
if (fputs ("^_", mbf) < 0)
|
|
|
|
|
return false;
|
1997-12-03 07:11:43 +00:00
|
|
|
|
line++;
|
|
|
|
|
len--;
|
|
|
|
|
}
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return fwrite (line, 1, len, mbf) == len && 0 <= fputc ('\n', mbf);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2016-03-05 19:30:51 +00:00
|
|
|
|
#ifdef WINDOWSNT
|
|
|
|
|
/* Work around MS-Windows lack of support for %e or %T with a
|
|
|
|
|
special-purpose strftime that assumes the exact format that
|
|
|
|
|
movemail uses. */
|
|
|
|
|
static size_t
|
|
|
|
|
movemail_strftime (char *s, size_t size, char const *format,
|
|
|
|
|
struct tm const *tm)
|
|
|
|
|
{
|
2016-03-06 16:27:16 +00:00
|
|
|
|
char fmt[size + 6], *q;
|
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
|
|
for (p = format, q = &fmt[0]; *p; )
|
|
|
|
|
{
|
|
|
|
|
if (*p == '%' && p[1] == 'e')
|
|
|
|
|
{
|
|
|
|
|
memcpy (q, "%d", 2);
|
|
|
|
|
q += 2;
|
|
|
|
|
p += 2;
|
|
|
|
|
}
|
|
|
|
|
else if (*p == '%' && p[1] == 'T')
|
|
|
|
|
{
|
|
|
|
|
memcpy (q, "%H:%M:%S", 8);
|
|
|
|
|
q += 8;
|
|
|
|
|
p += 2;
|
|
|
|
|
}
|
|
|
|
|
else if (*p == '%' && p[1] == '%')
|
|
|
|
|
{
|
|
|
|
|
memcpy (q, p, 2);
|
|
|
|
|
q += 2;
|
|
|
|
|
p += 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*q++ = *p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size_t n = strftime (s, size, fmt, tm);
|
2016-03-05 19:30:51 +00:00
|
|
|
|
char *mday = s + sizeof "From movemail Sun Jan " - 1;
|
|
|
|
|
if (*mday == '0')
|
|
|
|
|
*mday = ' ';
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
# undef strftime
|
|
|
|
|
# define strftime movemail_strftime
|
|
|
|
|
#endif
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
static bool
|
2010-07-03 00:50:23 +00:00
|
|
|
|
mbx_delimit_begin (FILE *mbf)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
2014-09-23 19:21:54 +00:00
|
|
|
|
time_t now = time (NULL);
|
|
|
|
|
struct tm *ltime = localtime (&now);
|
|
|
|
|
if (!ltime)
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return false;
|
2014-09-23 19:21:54 +00:00
|
|
|
|
|
|
|
|
|
char fromline[100];
|
|
|
|
|
if (! strftime (fromline, sizeof fromline,
|
2016-03-05 19:30:51 +00:00
|
|
|
|
"From movemail %a %b %e %T %Y\n", ltime))
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
{
|
|
|
|
|
errno = EOVERFLOW;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return 0 <= fputs (fromline, mbf);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
static bool
|
2010-07-03 00:50:23 +00:00
|
|
|
|
mbx_delimit_end (FILE *mbf)
|
1989-04-28 03:54:04 +00:00
|
|
|
|
{
|
Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1. Prefer 'return' to 'exit'. Don't
possibly unlink lockname twice, as that's a race condition. Set
SIGCHLD to SIG_DFL to work around SysV misfeature. Check for fork
failure. Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 23:41:09 +00:00
|
|
|
|
return 0 <= putc ('\n', mbf);
|
1989-04-28 03:54:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* MAIL_USE_POP */
|