Mercurial > masqmail-0.2
annotate src/online.c @ 75:257a9e6d1a8e
fixed correct processing of mails with data lines longer 4096 chars
Mail messages with lines longer than 4096 chars were already read
correctly, i.e. the spool files were correct. This commit fixes the
reading of spool files with long lines.
The old behavior was that the message body was truncated right
before the first line longer 4096 chars. The number comes from
MAX_DATALINE.
| author | meillo@marmaro.de |
|---|---|
| date | Wed, 16 Jun 2010 19:06:34 +0200 |
| parents | 8a92de5e8907 |
| children | 3b344bf57162 |
| rev | line source |
|---|---|
| 0 | 1 /* MasqMail |
| 2 Copyright (C) 1999-2001 Oliver Kurth | |
|
19
7354c2e0eb31
added myself to AUTHORS and the source files I improved
meillo@marmaro.de
parents:
18
diff
changeset
|
3 Copyright 2008 markus schnalke <meillo@marmaro.de> |
| 0 | 4 |
| 5 This program is free software; you can redistribute it and/or modify | |
| 6 it under the terms of the GNU General Public License as published by | |
| 7 the Free Software Foundation; either version 2 of the License, or | |
| 8 (at your option) any later version. | |
| 9 | |
| 10 This program is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 GNU General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with this program; if not, write to the Free Software | |
| 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
| 18 */ | |
| 19 | |
| 20 #include <sys/stat.h> | |
| 21 #include <sys/wait.h> | |
| 15 | 22 |
| 0 | 23 #include "masqmail.h" |
| 24 #include "mserver.h" | |
| 25 #include "peopen.h" | |
| 26 | |
| 27 gchar *connection_name; | |
| 28 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
29 void |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
30 set_online_name(gchar * name) |
| 0 | 31 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
32 connection_name = g_strdup(name); |
| 0 | 33 } |
| 34 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
35 static gchar* |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
36 detect_online_pipe(const gchar * pipe) |
| 0 | 37 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
38 pid_t pid; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
39 void (*old_signal) (int); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
40 int status; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
41 FILE *in; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
42 gchar *name = NULL; |
| 0 | 43 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
44 old_signal = signal(SIGCHLD, SIG_DFL); |
| 0 | 45 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
46 in = peopen(pipe, "r", environ, &pid); |
| 33 | 47 if (in == NULL) { |
| 48 logwrite(LOG_ALERT, "could not open pipe '%s': %s\n", pipe, strerror(errno)); | |
| 49 signal(SIGCHLD, old_signal); | |
| 50 return NULL; | |
| 51 } | |
| 52 | |
| 53 gchar output[256]; | |
| 54 if (fgets(output, 255, in)) { | |
| 55 g_strchomp(g_strchug(output)); | |
| 56 if (strlen(output) == 0) { | |
| 57 logwrite(LOG_ALERT, "only whitespace connection name\n"); | |
| 58 name = NULL; | |
|
18
99c09ed776c1
fixed empty or only-whitespace connection names
meillo@marmaro.de
parents:
15
diff
changeset
|
59 } else { |
| 33 | 60 name = g_strdup(output); |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
61 } |
| 33 | 62 } else { |
| 63 logwrite(LOG_ALERT, "nothing read from pipe %s\n", pipe); | |
| 64 name = NULL; | |
| 65 } | |
| 66 fclose(in); | |
| 67 waitpid(pid, &status, 0); | |
| 68 if (WEXITSTATUS(status) != EXIT_SUCCESS) { | |
| 69 g_free(name); | |
| 70 name = NULL; | |
| 71 } | |
| 0 | 72 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
73 signal(SIGCHLD, old_signal); |
| 0 | 74 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
75 return name; |
| 0 | 76 } |
| 77 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
78 gchar* |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
79 detect_online() |
| 0 | 80 { |
| 33 | 81 if (conf.online_detect == NULL) { |
| 82 return NULL; | |
| 83 } | |
| 84 | |
| 85 if (strcmp(conf.online_detect, "file") == 0) { | |
| 86 DEBUG(3) debugf("online detection method 'file'\n"); | |
|
51
8a92de5e8907
fixed inverted condition for undefined online_file
meillo@marmaro.de
parents:
33
diff
changeset
|
87 if (conf.online_file == NULL) { |
| 33 | 88 logwrite(LOG_ALERT, "online detection mode is 'file', but online_file is undefined\n"); |
| 89 return NULL; | |
| 90 } | |
| 91 | |
| 92 struct stat st; | |
| 93 if (stat(conf.online_file, &st) == 0) { | |
| 94 FILE *fptr = fopen(conf.online_file, "r"); | |
| 95 if (!fptr) { | |
| 96 logwrite(LOG_ALERT, "opening of %s failed: %s\n", conf.online_file, strerror(errno)); | |
| 97 return NULL; | |
| 98 } | |
| 99 char buf[256]; | |
| 100 if (fgets(buf, 256, fptr) == NULL) { | |
| 101 logwrite(LOG_ALERT, "empty online file %s\n", conf.online_file); | |
| 102 fclose(fptr); | |
| 103 return NULL; | |
| 104 } | |
| 105 g_strchomp(g_strchug(buf)); | |
| 106 fclose(fptr); | |
| 107 if (strlen(buf) == 0) { | |
| 108 logwrite(LOG_ALERT, "only whitespace connection name in %s\n", conf.online_file); | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
109 return NULL; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
110 } |
| 33 | 111 return g_strdup(buf); |
| 112 } else if (errno == ENOENT) { | |
| 113 logwrite(LOG_NOTICE, "not online.\n"); | |
| 114 return NULL; | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
115 } else { |
| 33 | 116 logwrite(LOG_ALERT, "stat of %s failed: %s", conf.online_file, strerror(errno)); |
| 117 return NULL; | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
118 } |
| 33 | 119 |
| 120 #ifdef ENABLE_MSERVER | |
| 121 } else if (strcmp(conf.online_detect, "mserver") == 0) { | |
| 122 DEBUG(3) debugf("connection method 'mserver'\n"); | |
| 123 return mserver_detect_online(conf.mserver_iface); | |
| 124 #endif | |
| 125 } else if (strcmp(conf.online_detect, "pipe") == 0) { | |
| 126 DEBUG(3) debugf("connection method 'pipe'\n"); | |
| 127 if (conf.online_pipe) | |
| 128 return detect_online_pipe(conf.online_pipe); | |
| 129 else { | |
| 130 logwrite(LOG_ALERT, "online detection mode is 'pipe', but online_pipe is undefined\n"); | |
| 131 return NULL; | |
| 132 } | |
| 133 } else if (strcmp(conf.online_detect, "argument") == 0) { | |
| 134 return connection_name; | |
| 135 } else { | |
| 136 DEBUG(3) debugf("no connection method selected\n"); | |
| 0 | 137 } |
| 33 | 138 |
| 0 | 139 return NULL; |
| 140 } |