Don't canonicalise pathnames of included files.

Fixes bug #24553

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index d7b102836e460cf0f05650d201d718b546bb0db5..8e69dab50c6260f63795d569c910ab48cd743c47 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -26,7 +26,6 @@
 #include <data/file-name.h>
 
 #include "dirname.h"
-#include "canonicalize.h"
 #include "xalloc.h"
 
 #include "gettext.h"
@@ -191,8 +190,7 @@ parse_insert (struct lexer *lexer, char **filename)
       return CMD_FAILURE;
     }
 
-  *filename = canonicalize_file_name (relative_filename);
-  free (relative_filename);
+  *filename = relative_filename;
 
   return CMD_SUCCESS;
 }

diff --git a/tests/command/insert.sh b/tests/command/insert.sh
index 354a54f898497c8bcdccaf1ec1af8aae6ec0bf8f..be7f9e08c565c52677a4e0704f92acd86b84a948 100755 (executable)
--- a/tests/command/insert.sh
+++ b/tests/command/insert.sh
@@ -2,7 +2,8 @@
 
 # This program tests the INSERT command
 
-TEMPDIR=/tmp/pspp-tst-$$
+BASETEMPDIR=/tmp/pspp-tst-$$
+TEMPDIR=$BASETEMPDIR/link
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
 # ensure that top_srcdir and top_builddir  are absolute
@@ -23,11 +24,11 @@ export LANG
 cleanup()
 {
      if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
-       echo "NOT cleaning $TEMPDIR"
+       echo "NOT cleaning $BASETEMPDIR"
        return ; 
      fi
      cd /
-     rm -rf $TEMPDIR
+     rm -rf $BASETEMPDIR
 }
 
 
@@ -54,7 +55,9 @@ pass()
     exit 0;
 }
 
-mkdir -p $TEMPDIR
+mkdir -p $BASETEMPDIR/target
+
+ln -s $BASETEMPDIR/target $TEMPDIR
 
 cd $TEMPDIR
 
@@ -249,6 +252,4 @@ $TEMPDIR/foo.sps:10: error: DISPLAY: AKSDJ is not a variable name.
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
-
-
 pass;