projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformatted.
[chise/xemacs-chise.git-]
/
lib-src
/
movemail.c
diff --git
a/lib-src/movemail.c
b/lib-src/movemail.c
index
941ada9
..
f7a572c
100644
(file)
--- a/
lib-src/movemail.c
+++ b/
lib-src/movemail.c
@@
-69,7
+69,7
@@
Boston, MA 02111-1307, USA.
#include <errno.h>
#include "../src/sysfile.h"
#include "../src/syswait.h"
#include <errno.h>
#include "../src/sysfile.h"
#include "../src/syswait.h"
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
#include "../src/systime.h"
#endif
#include <stdlib.h>
#include "../src/systime.h"
#endif
#include <stdlib.h>
@@
-87,10
+87,6
@@
extern int optind, opterr;
char * strerror (int errnum);
#endif /* HAVE_STRERROR */
char * strerror (int errnum);
#endif /* HAVE_STRERROR */
-#ifdef MSDOS
-#undef access
-#endif /* MSDOS */
-
#ifndef DIRECTORY_SEP
#define DIRECTORY_SEP '/'
#endif
#ifndef DIRECTORY_SEP
#define DIRECTORY_SEP '/'
#endif
@@
-98,7
+94,7
@@
char * strerror (int errnum);
#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
#endif
#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
#endif
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
#undef access
#undef unlink
#define fork() 0
#undef access
#undef unlink
#define fork() 0
@@
-110,7
+106,7
@@
char * strerror (int errnum);
properly - make sure it does before you enable this! */
#define DISABLE_DIRECT_ACCESS
#include <io.h>
properly - make sure it does before you enable this! */
#define DISABLE_DIRECT_ACCESS
#include <io.h>
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
#if defined (HAVE_UNISTD_H)
#include <unistd.h>
#if defined (HAVE_UNISTD_H)
#include <unistd.h>
@@
-204,7
+200,9
@@
struct option longopts[] =
#define DEFAULT_LOCKING DOTLOCKING
#endif
#define DEFAULT_LOCKING DOTLOCKING
#endif
+#ifndef DISABLE_DIRECT_ACCESS
static void lock_dot(char *);
static void lock_dot(char *);
+#endif
static void unlock_dot(char *);
static int parse_lock_method(char *);
static char *unparse_lock_method(int);
static void unlock_dot(char *);
static int parse_lock_method(char *);
static char *unparse_lock_method(int);
@@
-341,7
+339,7
@@
main (int argc, char *argv[])
exit (retcode);
}
exit (retcode);
}
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
setuid (getuid ());
#endif
#endif /* MAIL_USE_POP */
setuid (getuid ());
#endif
#endif /* MAIL_USE_POP */
@@
-442,7
+440,7
@@
main (int argc, char *argv[])
errno = saved_errno;
pfatal_with_name (outname);
}
errno = saved_errno;
pfatal_with_name (outname);
}
- if (nread < sizeof buf)
+ if (nread < (int) sizeof buf)
break;
}
}
break;
}
}
@@
-566,6
+564,7
@@
dot_filename(char *filename)
static char *dotlock_filename = NULL;
static char *dotlock_filename = NULL;
+#ifndef DISABLE_DIRECT_ACCESS
static void
lock_dot(char *filename)
{
static void
lock_dot(char *filename)
{
@@
-625,6
+624,7
@@
lock_dot(char *filename)
}
strcpy(dotlock_filename, filename);
}
}
strcpy(dotlock_filename, filename);
}
+#endif /* not DISABLE_DIRECT_ACCESS */
static void
unlock_dot(char *filename)
static void
unlock_dot(char *filename)
@@
-705,7
+705,7
@@
xmalloc (unsigned int size)
#ifdef MAIL_USE_POP
#ifdef MAIL_USE_POP
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
@@
-714,7
+714,7
@@
xmalloc (unsigned int size)
#include <winsock.h>
#endif
#include <stdio.h>
#include <winsock.h>
#endif
#include <stdio.h>
-#include <pwd.h>
+#include "../src/syspwd.h"
#define POP_ERROR (-1)
#define POP_RETRIEVED (0)
#define POP_ERROR (-1)
#define POP_RETRIEVED (0)
@@
-741,14
+741,14
@@
popmail (char *user, char *outfile, char *password)
server = pop_open (0, user, password, POP_NO_GETPASS);
if (! server)
{
server = pop_open (0, user, password, POP_NO_GETPASS);
if (! server)
{
- error (pop_error, NULL, NULL);
+ error ("%s", pop_error, NULL);
return (1);
}
VERBOSE(("stat'ing messages\n"));
if (pop_stat (server, &nmsgs, &nbytes))
{
return (1);
}
VERBOSE(("stat'ing messages\n"));
if (pop_stat (server, &nmsgs, &nbytes))
{
- error (pop_error, NULL, NULL);
+ error ("%s", pop_error, NULL);
return (1);
}
return (1);
}
@@
-770,7
+770,7
@@
popmail (char *user, char *outfile, char *password)
error ("Error in open: %s, %s", strerror (errno), outfile);
return (1);
}
error ("Error in open: %s, %s", strerror (errno), outfile);
return (1);
}
-#if !defined(__CYGWIN32__) && !defined(WINDOWSNT)
+#if !defined(CYGWIN) && !defined(WIN32_NATIVE)
fchown (mbfi, getuid (), (gid_t) -1);
#endif
fchown (mbfi, getuid (), (gid_t) -1);
#endif
@@
-796,7
+796,7
@@
popmail (char *user, char *outfile, char *password)
mbx_delimit_begin (mbf);
if (pop_retr (server, i, mbx_write, mbf) != POP_RETRIEVED)
{
mbx_delimit_begin (mbf);
if (pop_retr (server, i, mbx_write, mbf) != POP_RETRIEVED)
{
- error (Errmsg, NULL, NULL);
+ error ("%s", Errmsg, NULL);
close (mbfi);
return (1);
}
close (mbfi);
return (1);
}
@@
-844,7
+844,7
@@
popmail (char *user, char *outfile, char *password)
VERBOSE(("deleting message %d \n", i));
if (pop_delete (server, i))
{
VERBOSE(("deleting message %d \n", i));
if (pop_delete (server, i))
{
- error (pop_error, NULL, NULL);
+ error ("%s", pop_error, NULL);
pop_close (server);
return (1);
}
pop_close (server);
return (1);
}
@@
-855,7
+855,7
@@
popmail (char *user, char *outfile, char *password)
VERBOSE(("closing server \n"));
if (pop_quit (server))
{
VERBOSE(("closing server \n"));
if (pop_quit (server))
{
- error (pop_error, NULL, NULL);
+ error ("%s", pop_error, NULL);
return (1);
}
return (1);
}