moved whitespace around

[citadel.git] / citadel / utils / citmail.c

diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index 924b67571caccfd7daaeb54a0765fb70f7092e29..7d89d4ea64186e26a8a3a50d206f6370cd9a0fd5 100644 (file)
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -1,4 +1,4 @@
-// This program attempts to act like a local MDA if you're using sendmail or
+// This program attempts to act like a local MDA if you're using postfix or
 // some other non-Citadel MTA.  It basically just contacts the Citadel LMTP
 // listener on a unix domain socket and transmits the message.  Really though,
 // if your MTA supports LMTP then you definitely should be using that instead.
@@ -7,9 +7,7 @@
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
-// The program is distributed without any warranty, expressed or implied.
 
-#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -25,8 +23,10 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "citadel_dirs.h"
+#include "../server/sysdep.h"
+#include "../server/citadel_defs.h"
+#include "../server/server.h"
+#include "../server/citadel_dirs.h"
 
 int serv_sock;
 int debug = 0;
@@ -248,7 +248,7 @@ int main(int argc, char **argv) {
                                for (i=0; i<num_recp_on_this_line; ++i) {
                                        extract_token(this_recp, add_these_recipients,
                                                i, ',', sizeof this_recp);
-                                       striplt(this_recp);
+                                       string_trim(this_recp);
                                        if (!IsEmptyStr(this_recp)) {
                                                ++num_recipients;
                                                recipients = realloc(recipients,