many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
/*
Derived from a SMTPclient:
+ ======== Original copyrights ==========
+
SMTPclient -- simple SMTP client
- Copyright (C) 1997 Ralf S. Engelschall, All Rights Reserved.
- rse@engelschall.com
- www.engelschall.com
+ Copyright (c) 1997 Ralf S. Engelschall, All rights reserved.
+
+ This program is free software; it may be redistributed and/or modified
+ only under the terms of either the Artistic License or the GNU General
+ Public License, which may be found in the SMTP source distribution.
+ Look at the file COPYING.
+
+ This program is distributed in the hope that it will be useful, 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.
+
+ ======================================================================
+
+ smtpclient_main.c -- program source
+
+ Based on smtp.c as of August 11, 1995 from
+ W.Z. Venema,
+ Eindhoven University of Technology,
+ Department of Mathematics and Computer Science,
+ Den Dolech 2, P.O. Box 513, 5600 MB Eindhoven, The Netherlands.
+
+ =========
+
Kern Sibbald, July 2001
+ Note, the original W.Z. Venema smtp.c had no license and no
+ copyright. See:
+ http://archives.neohapsis.com/archives/postfix/2000-05/1520.html
+
+
Version $Id$
*/
static char my_hostname[MAXSTRING];
static bool content_utf8 = false;
+/*
+ * Take input that may have names and other stuff and strip
+ * it down to the mail box address ... i.e. what is enclosed
+ * in < >. Otherwise add < >.
+ */
+static char *cleanup_addr(char *addr, char *buf, int buf_len)
+{
+ char *p, *q;
+
+ if ((p = strchr(addr, '<')) == NULL) {
+ snprintf(buf, buf_len, "<%s>", addr);
+ } else {
+ /* Copy <addr> */
+ for (q=buf; *p && *p!='>'; ) {
+ *q++ = *p++;
+ }
+ if (*p) {
+ *q++ = *p;
+ }
+ *q = 0;
+ }
+ Dmsg2(100, "cleanup in=%s out=%s\n", addr, buf);
+ return buf;
+}
/*
* examine message from server
*/
static void get_response(void)
{
- char buf[MAXSTRING];
+ char buf[1000];
Dmsg0(50, "Calling fgets on read socket rfp.\n");
buf[3] = 0;
va_start(ap, fmt);
vfprintf(sfp, fmt, ap);
+ va_end(ap);
if (debug_level >= 10) {
fprintf(stdout, "%s --> ", my_hostname);
+ va_start(ap, fmt);
vfprintf(stdout, fmt, ap);
+ va_end(ap);
}
- va_end(ap);
fflush(sfp);
if (debug_level >= 10) {
"Usage: %s [-f from] [-h mailhost] [-s subject] [-c copy] [recipient ...]\n"
" -8 set charset utf-8\n"
" -c set the Cc: field\n"
-" -dnn set debug level to nn\n"
+" -d <nn> set debug level to <nn>\n"
+" -dt print timestamp in debug output\n"
" -f set the From: field\n"
" -h use mailhost:port as the SMTP server\n"
" -s set the Subject: field\n"
exit(1);
}
+/*
+ * Return the offset west from localtime to UTC in minutes
+ * Same as timezone.tz_minuteswest
+ * Unix tz_offset coded by: Attila Fülöp
+ */
+
+static long tz_offset(time_t lnow, struct tm &tm)
+{
+#if defined(HAVE_WIN32)
+#if defined(HAVE_MINGW)
+__MINGW_IMPORT long _dstbias;
+#endif
+
+ /* Win32 code */
+ long offset;
+ _tzset();
+ offset = _timezone;
+ if (tm.tm_isdst) {
+ offset += _dstbias;
+ }
+ return offset /= 60;
+#else
+
+ /* Unix/Linux code */
+ struct tm tm_utc;
+ time_t now = lnow;
+
+ (void)gmtime_r(&now, &tm_utc);
+ tm_utc.tm_isdst = tm.tm_isdst;
+ return (long)difftime(mktime(&tm_utc), now) / 60;
+#endif
+}
+
+static void get_date_string(char *buf, int buf_len)
+{
+ time_t now = time(NULL);
+ struct tm tm;
+ char tzbuf[MAXSTRING];
+ long my_timezone;
+
+ /* Add RFC822 date */
+ (void)localtime_r(&now, &tm);
+
+ my_timezone = tz_offset(now, tm);
+ strftime(buf, buf_len, "%a, %d %b %Y %H:%M:%S", &tm);
+ sprintf(tzbuf, " %+2.2ld%2.2u", -my_timezone / 60, abs(my_timezone) % 60);
+ strcat(buf, tzbuf); /* add +0100 */
+ strftime(tzbuf, sizeof(tzbuf), " (%Z)", &tm);
+ strcat(buf, tzbuf); /* add (CEST) */
+}
+
/*********************************************************************
*
*/
int main (int argc, char *argv[])
{
- char buf[MAXSTRING];
+ char buf[1000];
struct sockaddr_in sin;
struct hostent *hp;
int i, ch;
struct passwd *pwd;
#endif
char *cp, *p;
- time_t now = time(NULL);
- struct tm tm;
setlocale(LC_ALL, "en_US");
bindtextdomain("bacula", LOCALEDIR);
break;
case 'd': /* set debug level */
- debug_level = atoi(optarg);
- if (debug_level <= 0) {
- debug_level = 1;
+ if (*optarg == 't') {
+ dbg_timestamp = true;
+ } else {
+ debug_level = atoi(optarg);
+ if (debug_level <= 0) {
+ debug_level = 1;
+ }
}
Dmsg1(20, "Debug level = %d\n", debug_level);
break;
exit(1);
}
-#if defined(HAVE_WIN32)
- _setmode(0, _O_BINARY);
-#endif
/*
* Determine SMTP server
#if defined(HAVE_WIN32)
WSADATA wsaData;
+ _setmode(0, _O_BINARY);
WSAStartup(MAKEWORD(2,2), &wsaData);
#endif
*/
get_response(); /* banner */
chat("helo %s\r\n", my_hostname);
- if (strchr(from_addr, '<') == NULL) {
- chat("mail from:<%s>\r\n", from_addr);
- } else {
- chat("mail from:%s\r\n", from_addr);
- }
-
+ chat("mail from:%s\r\n", cleanup_addr(from_addr, buf, sizeof(buf)));
+
for (i = 0; i < argc; i++) {
Dmsg1(20, "rcpt to: %s\n", argv[i]);
- if (strchr(argv[i], '<') == NULL) {
- chat("rcpt to:<%s>\r\n", argv[i]);
- } else {
- chat("rcpt to:%s\r\n", argv[i]);
- }
+ chat("rcpt to:%s\r\n", cleanup_addr(argv[i], buf, sizeof(buf)));
}
if (cc_addr) {
- if (strchr(cc_addr, '<') == NULL) {
- chat("rcpt to:<%s>\r\n", cc_addr);
- } else {
- chat("rcpt to:%s\r\n", cc_addr);
- }
+ chat("rcpt to:%s\r\n", cleanup_addr(cc_addr, buf, sizeof(buf)));
}
Dmsg0(20, "Data\n");
chat("data\r\n");
Dmsg0(10, "Content-Type: text/plain; charset=UTF-8\r\n");
}
- /* Add RFC822 date */
- (void)localtime_r(&now, &tm);
-#if defined(HAVE_WIN32)
-#if defined(HAVE_MINGW)
-__MINGW_IMPORT long _dstbias;
-#endif
- long tzoffset = 0;
-
- _tzset();
-
- tzoffset = _timezone;
- tzoffset += _dstbias;
- tzoffset /= 60;
-
- size_t length = strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", &tm);
- sprintf(&buf[length], " %+2.2ld%2.2u", -tzoffset / 60, abs(tzoffset) % 60);
-#else
-#ifdef HAVE_SUN_OS
- strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S (%Z)", &tm);
-#else
- strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %z (%Z)", &tm);
-#endif
-#endif
+ get_date_string(buf, sizeof(buf));
fprintf(sfp, "Date: %s\r\n", buf);
Dmsg1(10, "Date: %s\r\n", buf);
projects / bacula / bacula / blobdiff