15f798d785
- drop 8bit, fix15, devutf8, grn patches - sync the rest of patches with current release - spec cleanup
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
--- groff-1.19.1/src/roff/troff/input.cpp.gzext 2005-01-12 14:17:15.469480712 +0100
|
|
+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 14:22:57.666458864 +0100
|
|
@@ -5590,16 +5590,20 @@ void source()
|
|
else {
|
|
char cbuf[PATH_MAX], * cwd;
|
|
char pbuf[PATH_MAX], * path;
|
|
+ char tmp[PATH_MAX];
|
|
struct stat st;
|
|
|
|
+ snprintf(tmp, PATH_MAX, "%s.gz", nm.contents());
|
|
+
|
|
while (!tok.newline() && !tok.eof())
|
|
tok.next();
|
|
|
|
if ((cwd = realpath(".", cbuf)) == NULL)
|
|
error("realpath on `%1' failed: %2", ".", strerror(errno));
|
|
- else if ((path = realpath(nm.contents(), pbuf)) == NULL)
|
|
- error("realpath on `%1' failed: %2", nm.contents(), strerror(errno));
|
|
- else if (safer_flag && strncmp(cwd, path, strlen(cwd)))
|
|
+ else if ((path = realpath(nm.contents(), pbuf)) == NULL &&
|
|
+ (path = realpath(tmp, pbuf)) == NULL) {
|
|
+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno));
|
|
+ } else if (safer_flag && strncmp(cwd, path, strlen(cwd)))
|
|
error("won't source `%1' outside of `%2' without -U flag", path, cwd);
|
|
else if (stat(path, &st) < 0)
|
|
error("can't stat `%1': %2", path, strerror(errno));
|