#include "config.h"
#include <stdio.h>
#include <ctype.h>
-#if defined(STDC_HEADERS)
#include <stdlib.h>
-#endif
-#if defined(HAVE_UNISTD_H)
#include <unistd.h>
-#endif
#include <pwd.h>
#include <string.h>
-#ifdef HAVE_NET_SOCKET_H
-#include <net/socket.h>
-#endif
#include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include "fetchmail.h"
#include "getaddrinfo.h"
-#include "i18n.h"
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
+#include "gettext.h"
+#if defined(ENABLE_NLS)
#include <locale.h>
#endif
-extern char *getenv(const char *); /* needed on sysV68 R3V7.1. */
-
void envquery(int argc, char **argv)
/* set up basic stuff from the environment (including the rc file name) */
{
user = xstrdup(pwp->pw_name);
}
+ endpwent();
+
/* compute user's home directory */
home = getenv("HOME_ETC");
if (!home && !(home = getenv("HOME")))
- home = pwp->pw_dir;
+ home = xstrdup(pwp->pw_dir);
/* compute fetchmail's home directory */
if (!(fmhome = getenv("FETCHMAILHOME")))
memset(&hints, 0, sizeof hints);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags=AI_CANONNAME;
+ hints.ai_flags = AI_CANONNAME;
e = fm_getaddrinfo(tmpbuf, NULL, &hints, &res);
if (e) {
static char buf[50];
time(&now);
-#ifdef HAVE_STRFTIME
/*
* Conform to RFC822. We generate a 4-digit year here, avoiding
* Y2K hassles. Max length of this timestamp in an English locale
* weird multibyte i18n characters (such as kanji) from showing up
* in your Received headers.
*/
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
setlocale (LC_TIME, "C");
#endif
strftime(buf, sizeof(buf)-1,
"%a, %d %b %Y %H:%M:%S XXXXX (%Z)", localtime(&now));
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
setlocale (LC_TIME, "");
#endif
strncpy(strstr(buf, "XXXXX"), tzoffset(&now), 5);
-#else
- /*
- * This is really just a portability fallback, as the
- * date format ctime(3) emits is not RFC822
- * conformant.
- */
- strlcpy(buf, ctime(&now), sizeof(buf));
- buf[strlen(buf)-1] = '\0'; /* remove trailing \n */
-#endif /* HAVE_STRFTIME */
-
return(buf);
}
switch (proto)
{
case P_AUTO: return("auto");
-#ifdef POP2_ENABLE
- case P_POP2: return("POP2");
-#endif /* POP2_ENABLE */
#ifdef POP3_ENABLE
case P_POP3: return("POP3");
- case P_APOP: return("APOP");
- case P_RPOP: return("RPOP");
#endif /* POP3_ENABLE */
#ifdef IMAP_ENABLE
case P_IMAP: return("IMAP");
needed = strlen(buf) * 5 + 1; /* worst case: HEX, plus NUL byte */
- if (needed > vbufs) {
+ if (!vbuf || needed > vbufs) {
vbufs = needed;
- vbuf = xrealloc(vbuf, vbufs);
+ vbuf = (char *)xrealloc(vbuf, vbufs);
}
tp = vbuf;
buf++;
}
}
- *tp++ = '\0';
+ *tp = '\0';
return(vbuf);
}
/* env.c ends here */