aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-07-04 13:56:25 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2011-07-04 13:56:25 +0300
commit389df35de865d8218a36dde9cf25a0c8692b9807 (patch)
treee65222b4cb1368d0f35c308a8bac69bb49ed7e50
parent644958871b7c1f353b4981860b9f7b04900940e5 (diff)
downloadmailfromd-389df35de865d8218a36dde9cf25a0c8692b9807.tar.gz
mailfromd-389df35de865d8218a36dde9cf25a0c8692b9807.tar.bz2
Bugfix
* lib/syslog_async.c (find_percent_m): Fix endless loop.
-rw-r--r--lib/syslog_async.c2
-rw-r--r--src/main.c10
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)
while (*p && (p = strchr(p, '%')))
if (p[1] == 'm')
return p - format;
+ else
+ p++;
return -1;
}
diff --git a/src/main.c b/src/main.c
index d99183a9..090be692 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1145,14 +1145,14 @@ open_strecho (int daemon_mode)
mu_stream_ref(mf_strecho);
rc = 0;
#else
- rc = mu_stdio_stream_create (&mf_strecho, MU_STDERR_FD, 0);
+ rc = mu_stdio_stream_create(&mf_strecho, MU_STDERR_FD, 0);
#endif
}
if (rc) {
- mu_diag_output (MU_LOG_CRIT,
- _("cannot create echo output stream: %s"),
- mu_strerror (rc));
- exit (EX_UNAVAILABLE);
+ mu_diag_output(MU_LOG_CRIT,
+ _("cannot create echo output stream: %s"),
+ mu_strerror(rc));
+ exit(EX_UNAVAILABLE);
}
}

Return to:

Send suggestions and report system problems to the System administrator.