}
/* Site config. */
- (void) read_config (SYSCONFDIR, "enscriptsite.cfg");
+ read_config (SYSCONFDIR, "enscriptsite.cfg");
/* Personal config. */
- (void) read_config (passwd->pw_dir, ".enscriptrc");
+ read_config (cp, ".enscriptrc");
/*
* Options.
buffer_append (&cmd, intbuf);
buffer_append (&cmd, " ");
- buffer_append (&cmd, "-Ddocument_title=\"");
- buffer_append (&cmd, title);
- buffer_append (&cmd, "\" ");
+ buffer_append (&cmd, "-Ddocument_title=\'");
+ if ((cp = shell_escape (title)) != NULL)
+ {
+ buffer_append (&cmd, cp);
+ free (cp);
+ }
+ buffer_append (&cmd, "\' ");
buffer_append (&cmd, "-Dtoc=");
buffer_append (&cmd, toc ? "1" : "0");
/* Append input files. */
for (i = optind; i < argc; i++)
{
- buffer_append (&cmd, " ");
- buffer_append (&cmd, argv[i]);
+ char *cp;
+ if ((cp = shell_escape (argv[i])) != NULL)
+ {
+ buffer_append (&cmd, " \'");
+ buffer_append (&cmd, cp);
+ buffer_append (&cmd, "\'");
+ free (cp);
+ }
}
/* And do the job. */
buffer_ptr (opts), buffer_len (opts));
}
- buffer_append (&buffer, " \"%s\"");
+ buffer_append (&buffer, " \'%s\'");
input_filter = buffer_copy (&buffer);
input_filter_stdin = "-";
if (num_truncated_lines)
{
retval |= 2;
- MESSAGE (0, (stderr, _("%d lines were %s\n"), num_truncated_lines,
+ MESSAGE (0, (stderr,
+ ngettext("1 line was %s\n",
+ "%d lines were %s\n",
+ num_truncated_lines),
+ num_truncated_lines,
line_end == LE_TRUNCATE
? _("truncated") : _("wrapped")));
}
if (num_missing_chars)
{
retval |= 4;
- MESSAGE (0, (stderr, _("%d characters were missing\n"),
+ MESSAGE (0, (stderr,
+ ngettext("1 character was missing\n",
+ "%d characters were missing\n",
+ num_missing_chars),
num_missing_chars));
if (list_missing_characters)
{
if (num_non_printable_chars)
{
retval |= 8;
- MESSAGE (0, (stderr, _("%d non-printable characters\n"),
+ MESSAGE (0, (stderr,
+ ngettext("1 non-printable character\n",
+ "%d non-printable characters\n",
+ num_non_printable_chars),
num_non_printable_chars));
if (list_missing_characters)
{