diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-07-04 13:56:25 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-07-04 13:56:25 +0300 |
commit | 389df35de865d8218a36dde9cf25a0c8692b9807 (patch) | |
tree | e65222b4cb1368d0f35c308a8bac69bb49ed7e50 | |
parent | 644958871b7c1f353b4981860b9f7b04900940e5 (diff) | |
download | mailfromd-389df35de865d8218a36dde9cf25a0c8692b9807.tar.gz mailfromd-389df35de865d8218a36dde9cf25a0c8692b9807.tar.bz2 |
Bugfix
* lib/syslog_async.c (find_percent_m): Fix endless loop.
-rw-r--r-- | lib/syslog_async.c | 2 | ||||
-rw-r--r-- | src/main.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/syslog_async.c b/lib/syslog_async.c index 53c8f2e0..8bc57982 100644 --- a/lib/syslog_async.c +++ b/lib/syslog_async.c | |||
@@ -327,6 +327,8 @@ static int find_percent_m(const char *format) | |||
327 | while (*p && (p = strchr(p, '%'))) | 327 | while (*p && (p = strchr(p, '%'))) |
328 | if (p[1] == 'm') | 328 | if (p[1] == 'm') |
329 | return p - format; | 329 | return p - format; |
330 | else | ||
331 | p++; | ||
330 | return -1; | 332 | return -1; |
331 | } | 333 | } |
332 | 334 | ||
@@ -1145,14 +1145,14 @@ open_strecho (int daemon_mode) | |||
1145 | mu_stream_ref(mf_strecho); | 1145 | mu_stream_ref(mf_strecho); |
1146 | rc = 0; | 1146 | rc = 0; |
1147 | #else | 1147 | #else |
1148 | rc = mu_stdio_stream_create (&mf_strecho, MU_STDERR_FD, 0); | 1148 | rc = mu_stdio_stream_create(&mf_strecho, MU_STDERR_FD, 0); |
1149 | #endif | 1149 | #endif |
1150 | } | 1150 | } |
1151 | if (rc) { | 1151 | if (rc) { |
1152 | mu_diag_output (MU_LOG_CRIT, | 1152 | mu_diag_output(MU_LOG_CRIT, |
1153 | _("cannot create echo output stream: %s"), | 1153 | _("cannot create echo output stream: %s"), |
1154 | mu_strerror (rc)); | 1154 | mu_strerror(rc)); |
1155 | exit (EX_UNAVAILABLE); | 1155 | exit(EX_UNAVAILABLE); |
1156 | } | 1156 | } |
1157 | } | 1157 | } |
1158 | 1158 | ||