aboutsummaryrefslogtreecommitdiff
path: root/src/pies.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pies.c')
-rw-r--r--src/pies.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/pies.c b/src/pies.c
index 3d7f593..36b869a 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -682,7 +682,7 @@ cb_syslog_facility (enum grecs_callback_command cmd,
*(int *) varptr = n;
}
else if (string_to_syslog_facility (str, varptr))
- grecs_error (locus, 0, _("unknown syslog facility `%s'"), str);
+ grecs_error (locus, 0, _("unknown syslog facility %s"), str);
return 0;
}
@@ -711,7 +711,7 @@ _cb_redir (enum grecs_callback_command cmd,
rp->type = redir_syslog;
if (string_to_syslog_priority (value->v.string, &rp->v.prio))
{
- grecs_error (locus, 0, _("unknown syslog priority `%s'"),
+ grecs_error (locus, 0, _("unknown syslog priority %s"),
value->v.string);
return 0;
}
@@ -747,7 +747,7 @@ _cb_redir (enum grecs_callback_command cmd,
&rp->v.prio))
{
grecs_error (locus, 0,
- _("unknown syslog priority `%s'"),
+ _("unknown syslog priority %s"),
value->v.arg.v[1]->v.string);
return 0;
}
@@ -1555,9 +1555,9 @@ void
config_help ()
{
static char docstring[] =
- /* TRANSLATORS: do not translate words between ` and ' */
+ /* TRANSLATORS: do not translate words in quotes */
N_("Configuration file structure for pies.\n"
- "For more information, use `info pies configuration'.");
+ "For more information, use command \"info pies configuration\".");
grecs_print_docstring (docstring, 0, stdout);
grecs_print_statement_array (pies_keywords, 1, 0, stdout);
pies_config_identity_mechanisms_help ();
@@ -1704,8 +1704,7 @@ pidfile_read (int must_exist)
if (!fp)
{
if (must_exist && errno != ENOENT)
- logmsg (LOG_ERR,
- _("cannot open pid file `%s': %s"),
+ logmsg (LOG_ERR, _("cannot open file %s: %s"),
pidfile, strerror (errno));
return -1;
}
@@ -1719,7 +1718,7 @@ pidfile_read (int must_exist)
else
{
logmsg (LOG_ERR,
- _("unexpected character %#03o in pidfile `%s'"),
+ _("unexpected character %#03o in pidfile %s"),
c, pidfile);
return -1;
}
@@ -1873,7 +1872,7 @@ check_pidfile (char *name)
{
if (errno == ENOENT)
return;
- logmsg (LOG_ERR, _("cannot open pidfile `%s': %s"),
+ logmsg (LOG_ERR, _("cannot open file %s: %s"),
name, strerror (errno));
exit (EX_TEMPFAIL);
}
@@ -1887,7 +1886,7 @@ check_pidfile (char *name)
{
logmsg (LOG_ERR,
_
- ("%s appears to run with pid %lu. If it does not, remove `%s' and retry."),
+ ("%s appears to run with pid %lu. If it does not, remove %s and retry."),
program_name, pid, name);
exit (EX_USAGE);
}
@@ -1895,8 +1894,7 @@ check_pidfile (char *name)
fclose (fp);
if (unlink (pidfile))
{
- logmsg (LOG_ERR, _("cannot unlink pidfile `%s': %s"),
- name, strerror (errno));
+ logfuncall ("unlink", name, errno);
exit (EX_USAGE);
}
}
@@ -1919,8 +1917,7 @@ void
remove_pidfile (char *name)
{
if (unlink (name))
- logmsg (LOG_ERR, _("cannot unlink pidfile `%s': %s"),
- name, strerror (errno));
+ logfuncall ("unlink", name, errno);
}
@@ -1984,6 +1981,8 @@ main (int argc, char **argv)
#endif
mf_proctitle_init (argc, argv, environ);
+ grecs_print_diag_fun = pies_diag_printer;
+
pies_master_argc = argc;
pies_master_argv = argv;
@@ -2193,7 +2192,7 @@ main (int argc, char **argv)
check_pidfile (pidfile);
if (daemon (0, 0) == -1)
{
- logmsg (LOG_ERR, _("cannot become a daemon: %s"), strerror (errno));
+ logfuncall ("daemon", NULL, errno);
exit (EX_SOFTWARE);
}
diag_setup (DIAG_TO_SYSLOG);

Return to:

Send suggestions and report system problems to the System administrator.