aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--gnulib.modules2
-rw-r--r--src/pies.c11
-rw-r--r--src/pies.h1
-rw-r--r--src/progman.c17
5 files changed, 15 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index 5fa520b..e7659ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ IU_CHECK_MEMBERS([struct msghdr.msg_control, struct msghdr.msg_accrights], , ,
# Checks for library functions.
AC_FUNC_CHOWN
AC_FUNC_FORK
-AC_CHECK_FUNCS([alarm dup2 gethostbyname isascii memmove memset select setenv socket strchr strcspn strtol strtoul sysconf getdtablesize vsyslog])
+AC_CHECK_FUNCS([alarm dup2 gethostbyname memmove memset select setenv socket strchr strcspn strtol strtoul sysconf getdtablesize vsyslog])
# Gnulib
gl_INIT
diff --git a/gnulib.modules b/gnulib.modules
index 54ea90c..d62e1a3 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -4,13 +4,13 @@
argp
c-ctype
c-strcase
+fprintftime
gettext
gitlog-to-changelog
inttostr
inttypes
obstack
progname
-quote
quotearg
sysexits
xalloc
diff --git a/src/pies.c b/src/pies.c
index 52abc80..cc2ac53 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1510,9 +1510,10 @@ pidfile_read (int must_exist)
fclose (fp);
if (n && kill (n, 0))
{
- logmsg (LOG_ERR,
- _("cannot signal master process %lu: %s"),
- (unsigned long) n, strerror (errno));
+ if (errno != ESRCH)
+ logmsg (LOG_ERR,
+ _("cannot signal master process %lu: %s"),
+ (unsigned long) n, strerror (errno));
if (errno == EPERM)
return n; /* be on the safe side */
return -1;
@@ -1824,7 +1825,9 @@ main (int argc, char **argv)
textdomain (PACKAGE);
#endif
mf_proctitle_init (argc, argv, environ);
-
+
+ set_quoting_style (NULL, shell_quoting_style);
+
/* Set default logging */
log_to_stderr = !stderr_closed_p ();
log_setup (log_to_stderr);
diff --git a/src/pies.h b/src/pies.h
index f1cb13e..885d252 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -52,6 +52,7 @@
#include "obstack.h"
#include "xvasprintf.h"
#include "quotearg.h"
+#include "fprintftime.h"
#include "acl.h"
#include "libpies.h"
diff --git a/src/progman.c b/src/progman.c
index cc107f7..411fc8c 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -706,10 +706,8 @@ prog_start (struct prog *prog)
int i;
logmsg_printf (LOG_DEBUG, "executing");
for (i = 0; i < prog->v.p.argc; i++)
- {
- /* FIXME: quote */
- logmsg_printf (LOG_DEBUG, " %s", prog->v.p.comp->argv[i]);
- }
+ logmsg_printf (LOG_DEBUG, " %s",
+ quotearg (prog->v.p.comp->argv[i]));
logmsg_printf (LOG_DEBUG, "\n");
}
@@ -1783,11 +1781,9 @@ progman_dump_stats (const char *filename)
}
else if (prog->v.p.status == status_sleeping)
{
- char buf[48];
time_t t = prog->v.p.timestamp + SLEEPTIME;
- strftime (buf, sizeof buf, "%c",
- localtime (&t));
- fprintf (fp, _("[disabled; scheduled for %s]"), buf);
+ fprintftime (fp, _("[disabled; scheduled for %c]"),
+ localtime (&t), 0, 0);
}
else if (prog->v.p.status == status_disabled)
fprintf (fp, _("[disabled]"));
@@ -1796,10 +1792,7 @@ progman_dump_stats (const char *filename)
else
fprintf (fp, _("[not running]"));
for (i = 0; i < prog->v.p.argc; i++)
- {
- /* FIXME: quote as appropriate */
- fprintf (fp, " %s", prog->v.p.comp->argv[i]);
- }
+ fprintf (fp, " %s", quotearg (prog->v.p.comp->argv[i]));
fputc ('\n', fp);
break;

Return to:

Send suggestions and report system problems to the System administrator.