summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorwlemb <wlemb>2000-11-13 16:51:26 +0000
committerwlemb <wlemb>2000-11-13 16:51:26 +0000
commitb4daf3b0fd8f8efd95141f6375003e26b822da36 (patch)
tree9310440a358a56eb9a73662e730fcb434ab5fe06 /Makefile.in
parent9ab09435852a552b6ea5acb3879d398c743ea44e (diff)
downloadgroff-b4daf3b0fd8f8efd95141f6375003e26b822da36.tar.gz
For security reasons, don't use the current directory but the home
directory while searching and scanning troffrc and troffrc-end. Similarly, replace the current directory with the home directory in the font path. * Makefile.in (fontpath, tmacpath): Remove current directory. * src/libs/libgroff/searchpath.cc (search_path::search_path): Add two parameters `add_home' and `add_current'. (search_path::~search_path, search_path::command_line_dir, search_path::open_file): Remove tests for `dirs' being zero. * src/include/searchpath.h: Adjust. * src/libs/libgroff/macropath.cc, src/include/macropath.h: Add `safer_macro_path'. * src/libs/libgroff/fontfile.cc: Adjust `font_path'. * src/roff/troff/troff.h: Add `searchpath.h' and `mac_path'. * src/roff/troff/input.cc: Use `mac_path', initialized with `macro_path'. (process_startup_file): Set `mac_path' to `safer_macro_path'. * src/roff/troff/env.cc: Use `mac_path'. * src/preproc/eqn/main.cc (main): Use `safer_macro_path'. * NEWS, man/roff.man, src/roff/troff/troff.man, src/rof/groff/groff.man, tmac/groff_tmac.man, arch/djgpp/README: Updated. * src/include/lib.h: Don't include groff-getopt.h for OSF/1. * aclocal.m4 (GROFF_SYS_ERRLIST): Do test in C, not in C++. * configure.in: Fix typo in comment. * configure: Regenerated. * src/libgroff/*, src/include/*, src/roff/troff/*: Fixing copyright dates.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 61690796..e43b0686 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,7 +98,8 @@ datasubdir=$(dataprogramdir)/$(version)$(revision)
fontdir=$(datasubdir)/font
# fontpath says where to look for dev*/*.
-fontpath=.:$(fontdir):/usr/lib/font
+# $HOME will be always prepended.
+fontpath=$(fontdir):/usr/lib/font
# tmacdir says where to install macros.
tmacdir=$(datasubdir)/tmac
@@ -110,7 +111,9 @@ systemtmacdir=$(libprogramdir)/site-tmac
localtmacdir=$(dataprogramdir)/site-tmac
# tmacpath says where to look for macro files.
-tmacpath=.:$(systemtmacdir):$(localtmacdir):$(tmacdir)
+# The current directory will always be prepended except for searching and
+# scanning troffrc and troffrc-end which prepend the home directory instead.
+tmacpath=$(systemtmacdir):$(localtmacdir):$(tmacdir)
# sys_tmac_prefix is prefix (if any) for system macro packages
sys_tmac_prefix=@sys_tmac_prefix@