Change old get_Jobxxx to getJobxxx

[bacula/bacula] / bacula / src / tools / bsmtp.c

diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index 83b0e552dc9c55bc81b874420342ddc24f9ccef4..acb4cf25dcfc8e477f9994000277d1e4655ce4d6 100644 (file)
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -107,7 +107,7 @@ static char *cleanup_addr(char *addr, char *buf, int buf_len)
 {
    char *p, *q;
 
-   if ((p = strchr(from_addr, '<')) == NULL) {
+   if ((p = strchr(addr, '<')) == NULL) {
       snprintf(buf, buf_len, "<%s>", addr);
    } else {
       /* Copy <addr> */
@@ -185,14 +185,15 @@ static void usage()
    fprintf(stderr,
 _("\n"
 "Usage: %s [-f from] [-h mailhost] [-s subject] [-c copy] [recipient ...]\n"
-"       -8          set charset utf-8\n"
+"       -8          set charset to 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 a 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"
 "       -r          set the Reply-To: field\n"
-"       -l          set the maximum number of lines that should be sent (default: unlimited)\n"
+"       -l          set the maximum number of lines to send (default: unlimited)\n"
 "       -?          print this message.\n"
 "\n"), MY_NAME);
 
@@ -211,12 +212,16 @@ static long tz_offset(time_t lnow, struct tm &tm)
 #if defined(HAVE_MINGW)
 __MINGW_IMPORT long     _dstbias;
 #endif
-
+#if defined(MINGW64)
+# define _tzset tzset
+#endif
    /* Win32 code */
    long offset;
    _tzset();
    offset = _timezone;
-   offset += _dstbias;
+   if (tm.tm_isdst) {
+      offset += _dstbias;
+   }
    return offset /= 60;
 #else
 
@@ -286,9 +291,13 @@ int main (int argc, char *argv[])
          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;
@@ -473,19 +482,19 @@ hp:
     *   we do.
     */
    get_response(); /* banner */
-   chat("helo %s\r\n", my_hostname);
-   chat("mail from:%s\r\n", cleanup_addr(from_addr, buf, sizeof(buf)));
+   chat("HELO %s\r\n", my_hostname);
+   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]);
-      chat("rcpt to:%s\r\n", cleanup_addr(argv[i], buf, sizeof(buf)));
+      chat("RCPT TO:%s\r\n", cleanup_addr(argv[i], buf, sizeof(buf)));
    }
 
    if (cc_addr) {
-      chat("rcpt to:%s\r\n", cleanup_addr(cc_addr, buf, sizeof(buf)));
+      chat("RCPT TO:%s\r\n", cleanup_addr(cc_addr, buf, sizeof(buf)));
    }
    Dmsg0(20, "Data\n");
-   chat("data\r\n");
+   chat("DATA\r\n");
 
    /*
     *  Send message header
@@ -558,28 +567,30 @@ hp:
    while (fgets(buf, sizeof(buf), stdin)) {
       if (maxlines > 0 && ++lines > maxlines) {
          Dmsg1(20, "skip line because of maxlines limit: %lu\n", maxlines);
+         while (fgets(buf, sizeof(buf), stdin)) {
+            ++lines;
+         }
          break;
       }
       buf[sizeof(buf)-1] = '\0';
       buf[strlen(buf)-1] = '\0';
-      if (buf[0] == '.' && buf[1] == '\0') { /* quote lone dots */
-         fputs("..\r\n", sfp);
-      } else {                     /* pass body through unchanged */
-         fputs(buf, sfp);
-         fputs("\r\n", sfp);
+      if (buf[0] == '.') {         /* add extra . see RFC 2821 4.5.2 */
+         fputs(".", sfp);
       }
+      fputs(buf, sfp);
+      fputs("\r\n", sfp);
    }
 
    if (lines > maxlines) {
       Dmsg1(10, "hit maxlines limit: %lu\n", maxlines);
-      fprintf(sfp, "\r\n[maximum of %lu lines exceeded, skipped %lu lines of output]\r\n", maxlines, lines-maxlines);
+      fprintf(sfp, "\r\n\r\n[maximum of %lu lines exceeded, skipped %lu lines of output]\r\n", maxlines, lines-maxlines);
    }
 
    /*
     *  Send SMTP quit command
     */
    chat(".\r\n");
-   chat("quit\r\n");
+   chat("QUIT\r\n");
 
    /*
     *  Go away gracefully ...