*/
/*
- * This file is part of GNU enscript.
+ * This file is part of GNU Enscript.
*
- * This program is free software; you can redistribute it and/or modify
+ * Enscript is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * Enscript is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * along with Enscript. If not, see <http://www.gnu.org/licenses/>.
*/
#include "gsint.h"
}
/* 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 = "-";
process_file (_("Table of Contents"), &is, 1);
is_close (&is);
}
-
- /* Clean up toc file. */
- fclose (toc_fp);
}
/* Give trailer a chance to dump itself. */
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)
{
--word-wrap wrap long lines from word boundaries\n\
"));
- printf (_("\nReport bugs to mtr@iki.fi.\n"));
+ printf (_("\nReport bugs to %s.\n"), PACKAGE_BUGREPORT);
}