Mercurial > masqmail

annotate src/queue.c @ 323:29de6a1c4538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed an important bug with folded headers! g_strconcat() returns a *copy* of the string, but hdr->value still pointed to the old header (which probably was a memory leak, too). If the folded part had been quite small it was likely that the new string was at the same position as the old one, thus making everything go well. But if pretty long headers were folded several times it was likely that the new string was allocated somewhere else in memory, thus breaking things. In result mails to lots of recipients (folded header) were frequently only sent to the ones in the first line. Sorry for the inconvenience.
author meillo@marmaro.de
date Fri, 03 Jun 2011 09:47:27 +0200
parents 5f559921391a
children a7a387253b2f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
1 /* MasqMail
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
2 Copyright (C) 1999-2001 Oliver Kurth
224
996b53a50f55 added my copyright to files I worked on
meillo@marmaro.de
parents: 114
diff changeset
3 Copyright (C) 2010 markus schnalke <meillo@marmaro.de>
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
4
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
5 This program is free software; you can redistribute it and/or modify
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
6 it under the terms of the GNU General Public License as published by
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
7 the Free Software Foundation; either version 2 of the License, or
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
8 (at your option) any later version.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
9
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
10 This program is distributed in the hope that it will be useful,
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
13 GNU General Public License for more details.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
14
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
16 along with this program; if not, write to the Free Software
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
18 */
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
19
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
20 #include <sys/stat.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
21 #include <glob.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
22
15
f671821d8222 code beautifying; 0 -> \0 if appropriate
meillo@marmaro.de
parents: 10
diff changeset
23 #include "masqmail.h"
f671821d8222 code beautifying; 0 -> \0 if appropriate
meillo@marmaro.de
parents: 10
diff changeset
24
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
25 static void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
26 mix_arr(int *buf, int len)
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
27 {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
28 int i;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
29
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
30 for (i = 0; i < len; i++)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
31 buf[i] = i;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
32 for (i = 0; i < len - 1; i++) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
33 int j = (int) ((float) (len - i) * ((float) rand()) / (RAND_MAX + 1.0));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
34 int tmp;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
35
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
36 if (i != j) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
37 tmp = buf[i];
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
38 buf[i] = buf[j];
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
39 buf[j] = tmp;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
40 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
41 }
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
42 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
43
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
44 GList*
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
45 read_queue(gboolean do_readdata)
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
46 {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
47 GList *msg_list = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
48 glob_t gl;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
49 gchar *pattern;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
50 int i, *idx_arr;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
51
38
ac0233b5f6f8 removed trigraph warning
meillo@marmaro.de
parents: 15
diff changeset
52 /* Escaping the question marks prevents them from being
ac0233b5f6f8 removed trigraph warning
meillo@marmaro.de
parents: 15
diff changeset
53 interpreted as trigraphs */
ac0233b5f6f8 removed trigraph warning
meillo@marmaro.de
parents: 15
diff changeset
54 pattern = g_strdup_printf("%s/input/?????\?-??\?-?\?-H", conf.spool_dir);
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
55 gl.gl_offs = 0;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
56 glob(pattern, 0, NULL, &gl);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
57
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
58 g_free(pattern);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
59
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
60 DEBUG(4) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
61 int i;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
62 for (i = 0; i < gl.gl_pathc; i++) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
63 debugf("spoolfile: %s\n", gl.gl_pathv[i]);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
64 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
65 }
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
66
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
67 idx_arr = g_malloc(sizeof(int) * gl.gl_pathc);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
68 mix_arr(idx_arr, gl.gl_pathc);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
69
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
70 for (i = 0; i < gl.gl_pathc; i++) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
71 gchar *uid;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
72
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
73 /* copy 13 chars, offset spooldir path + 7 chars for /input/ */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
74 /* uid length = 6 chars + '-' + 3 chars + '-' + 2 = 13 chars */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
75 uid = g_strndup(&(gl.gl_pathv[idx_arr[i]][strlen(conf.spool_dir) + 7]), 13);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
76
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
77 DEBUG(5) debugf("uid: %s\n", uid);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
78
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
79 msg_list = g_list_append(msg_list, msg_spool_read(uid, do_readdata));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
80
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
81 DEBUG(5) debugf("after read spool file for %s\n", uid);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
82
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
83 g_free(uid);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
84 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
85 return msg_list;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
86 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
87
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
88 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
89 queue_run()
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
90 {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
91 GList *msg_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
92 gboolean ok = TRUE;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
93
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
94 logwrite(LOG_NOTICE, "Starting queue run.\n");
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
95 msg_list = read_queue(FALSE);
277
5f559921391a minor refactorings and cleanups
markus schnalke <meillo@marmaro.de>
parents: 236
diff changeset
96 if (msg_list) {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
97 ok = deliver_msg_list(msg_list, DLVR_ALL);
277
5f559921391a minor refactorings and cleanups
markus schnalke <meillo@marmaro.de>
parents: 236
diff changeset
98 DEBUG(5) debugf(" deliver_msg_list() returned: %d\n", ok);
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
99 destroy_msg_list(msg_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
100 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
101 logwrite(LOG_NOTICE, "Finished queue run.\n");
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
102
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
103 return ok;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
104 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
105
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
106 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
107 queue_run_online()
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
108 {
277
5f559921391a minor refactorings and cleanups
markus schnalke <meillo@marmaro.de>
parents: 236
diff changeset
109 GList *msg_list;
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
110 gboolean ok = TRUE;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
111
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
112 logwrite(LOG_NOTICE, "Starting online queue run.\n");
277
5f559921391a minor refactorings and cleanups
markus schnalke <meillo@marmaro.de>
parents: 236
diff changeset
113 msg_list = read_queue(FALSE);
5f559921391a minor refactorings and cleanups
markus schnalke <meillo@marmaro.de>
parents: 236
diff changeset
114 if (msg_list) {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
115 ok = deliver_msg_list(msg_list, DLVR_ONLINE);
277
5f559921391a minor refactorings and cleanups
markus schnalke <meillo@marmaro.de>
parents: 236
diff changeset
116 DEBUG(5) debugf(" deliver_msg_list() returned: %d\n", ok);
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
117 destroy_msg_list(msg_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
118 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
119 logwrite(LOG_NOTICE, "Finished online queue run.\n");
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
120
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
121 return ok;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
122 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
123
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
124 static gchar*
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
125 format_difftime(double secs)
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
126 {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
127 if (secs > 86400)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
128 return g_strdup_printf("%.1fd", secs / 86400);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
129 else if (secs > 3600)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
130 return g_strdup_printf("%.1fh", secs / 3600);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
131 else if (secs > 60)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
132 return g_strdup_printf("%.1fm", secs / 60);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
133 else
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
134 return g_strdup_printf("%.0fs", secs);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
135 }
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
136
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
137 void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
138 queue_list()
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
139 {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
140 GList *msg_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
141 GList *msg_node;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
142
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
143 msg_list = read_queue(FALSE);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
144
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
145 if (msg_list == NULL) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
146 printf("mail queue is empty.\n");
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
147 return;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
148 }
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
149
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
150 foreach(msg_list, msg_node) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
151 message *msg = (message *) (msg_node->data);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
152 GList *rcpt_node;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
153 gchar *size_str = NULL;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
154 gchar *time_str = NULL;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
155 gchar *host_str = NULL;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
156 gchar *ident_str = NULL;
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
157
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
158 if (msg->data_size >= 0)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
159 size_str = g_strdup_printf(" size=%d", msg->data_size);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
160 if (msg->received_time > 0) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
161 gchar *tmp_str;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
162 time_str = g_strdup_printf(" age=%s", tmp_str = format_difftime(difftime(time(NULL), msg->received_time)));
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
163 g_free(tmp_str);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
164 }
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
165 if (msg->received_host != NULL)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
166 host_str = g_strdup_printf(" host=%s", msg->received_host);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
167 if (msg->ident != NULL)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
168 ident_str = g_strdup_printf(" ident=%s", msg->ident);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
169
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
170 printf("%s <= %s%s%s%s%s\n", msg->uid, addr_string(msg->return_path), size_str ? size_str : "",
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
171 time_str ? time_str : "", host_str ? host_str : "", ident_str ? ident_str : "");
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
172
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
173 if (size_str)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
174 g_free(size_str);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
175 if (time_str)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
176 g_free(time_str);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
177 if (host_str)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
178 g_free(host_str);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
179 if (ident_str)
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
180 g_free(ident_str);
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
181
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
182 foreach(msg->rcpt_list, rcpt_node) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
183 address *rcpt = (address *) (rcpt_node->data);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
184
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
185 printf(" %s %s\n", addr_is_delivered(rcpt) ? "=>" : (addr_is_failed(rcpt) ? "!=" : "=="), addr_string(rcpt));
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
186 }
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
187 g_free(msg);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
188 }
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
189 }
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
190
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
191 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
192 queue_delete(gchar * uid)
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
193 {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
194 gboolean hdr_ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
195 gboolean dat_ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
196 gchar *hdr_name = g_strdup_printf("%s/input/%s-H", conf.spool_dir, uid);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
197 gchar *dat_name = g_strdup_printf("%s/input/%s-D", conf.spool_dir, uid);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
198 struct stat stat_buf;
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
199
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
200 if (!spool_lock(uid)) {
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
201 fprintf(stderr, "message %s is locked.\n", uid);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
202 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
203 }
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
204
82
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
205 if (stat(hdr_name, &stat_buf) == 0) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
206 if (unlink(hdr_name) != 0) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
207 fprintf(stderr, "could not unlink %s: %s\n", hdr_name, strerror(errno));
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
208 hdr_ok = FALSE;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
209 }
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
210 } else {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
211 fprintf(stderr, "could not stat file %s: %s\n", hdr_name, strerror(errno));
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
212 hdr_ok = FALSE;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
213 }
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
214 if (stat(dat_name, &stat_buf) == 0) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
215 if (unlink(dat_name) != 0) {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
216 fprintf(stderr, "could not unlink %s: %s\n", dat_name, strerror(errno));
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
217 dat_ok = FALSE;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
218 }
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
219 } else {
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
220 fprintf(stderr, "could not stat file %s: %s\n", dat_name, strerror(errno));
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
221 dat_ok = FALSE;
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
222 }
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
223 printf("message %s deleted\n", uid);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
224
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
225 spool_unlock(uid);
83a182793503 refactoring
meillo@marmaro.de
parents: 38
diff changeset
226
10
26e34ae9a3e3 changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents: 0
diff changeset
227 return (dat_ok && hdr_ok);
0
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth
meillo@marmaro.de
parents:
diff changeset
228 }