Changeset 1825 for trunk

Timestamp:

05/27/00 10:21:59 (9 years ago)

Author:

graham

Message:

Use \r\n instead of just \n so qmail is happy.

Files:

• trunk/email/src/forwarder.cpp (modified) (8 diffs)

trunk/email/src/forwarder.cpp

@@ -17 +17 @@
 #include "licq_file.h"
 #include "licq_user.h"
+#include "licq_constants.h"
 #include "licq_socket.h"
-#include "licq_constants.h"
+#include "licq_translate.h"
 
 extern "C" { const char *LP_Version(); }
@@ -345 +346 @@
   }
   sprintf (szDate, "Date: %s", ctime(&t));
+  int l = strlen(szDate);
+  szDate[l - 1] = '\r';
+  szDate[l] = '\n';
+  szDate[l + 1] = '\0';
 
   switch (e->SubCommand())
@@ -410 +415 @@
   }
 
-  fprintf(fs, "HELO %s\n", m_szSMTPDomain);
+  fprintf(fs, "HELO %s\r\n", m_szSMTPDomain);
   fgets(fin, 256, fs);
   code = atoi(fin);
@@ -420 +425 @@
   }
 
-  fprintf (fs, "MAIL From: %s\n", m_szSMTPFrom);
+  fprintf (fs, "MAIL From: %s\r\n", m_szSMTPFrom);
   fgets(fin, 256, fs);
   code = atoi(fin);
@@ -430 +435 @@
   }
 
-  fprintf(fs, "RCPT TO: %s\n", m_szSMTPTo);
+  fprintf(fs, "RCPT TO: %s\r\n", m_szSMTPTo);
   fgets(fin, 256, fs);
   code = atoi(fin);
@@ -440 +445 @@
   }
 
-  fprintf(fs, "DATA\n");
+  fprintf(fs, "DATA\r\n");
   fgets(fin, 256, fs);
   code = atoi(fin);
@@ -450 +455 @@
   }
 
+  char *szTextRN = gTranslator.NToRN(e->Text());
   fprintf(fs, "%s"
-              "%s\n"
-              "%s\n"
-              "%s\n"
-              "%s\n"
-              "\n"
-              "%s\n.\n",
-              szDate, szFrom, szTo, szReplyTo, szSubject, e->Text());
+              "%s\r\n"
+              "%s\r\n"
+              "%s\r\n"
+              "%s\r\n"
+              "\r\n"
+              "%s\r\n.\r\n",
+              szDate, szFrom, szTo, szReplyTo, szSubject, szTextRN);
+  delete [] szTextRN;
 
   fgets(fin, 256, fs);
@@ -468 +475 @@
   }
 
-  fprintf(fs, "quit\n");
+  fprintf(fs, "quit\r\n");
 
   // Close our connection