Add readsymlink(), followsymlink(), and try_followsymlink()

2 files changed, 33 insertions, 17 deletions

diff --git a/tests/path-entry/driver.cxx b/tests/path-entry/driver.cxx
index 51ac04d..30aae92 100644
--- a/tests/path-entry/driver.cxx
+++ b/tests/path-entry/driver.cxx
@@ -18,12 +18,14 @@ import std.core;
 import std.io;
 #endif
 import butl.path;
+import butl.path-io;
 import butl.utility;    // operator<<(ostream, exception)
 import butl.optional;
 import butl.timestamp;
 import butl.filesystem;
 #else
 #include <libbutl/path.mxx>
+#include <libbutl/path-io.mxx>
 #include <libbutl/utility.mxx>
 #include <libbutl/optional.mxx>
 #include <libbutl/timestamp.mxx>
@@ -36,11 +38,12 @@ using namespace butl;
 // Usage: argv[0] [-l] [-t] [-p <permissions>] [-m <time>] [-a <time>] <path>
 //
 // If path entry exists then optionally modify its meta-information and print
-// its type, size (meaningful for the regular file only), permissions,
-// modification and access times to STDOUT, one value per line, and exit with
+// its type, size (meaningful for the regular file only), target path if the
+// specified entry is a symlink and its path otherwise, permissions,
+// modification and access times to stdout, one value per line, and exit with
 // the zero code. Otherwise exit with the one code. Don't follow symlink by
-// default. On failure print the error description to STDERR and exit with
-// the two code.
+// default. On failure print the error description to stderr and exit with the
+// two code.
 //
 // -l
 //    Follow symlinks.
@@ -136,6 +139,10 @@ main (int argc, const char* argv[])
     if (!es.first)
       return 1;
 
+    stage = "lstat entry";
+    pair<bool, entry_stat> ls (path_entry (p));
+    assert (ls.first);
+
     // The entry is a directory with a symlink followed.
     //
     bool tdir;
@@ -188,7 +195,6 @@ main (int argc, const char* argv[])
     }
 
     cout << "type: ";
-
     switch (es.second.type)
     {
     case entry_type::unknown:   cout << "unknown"; break;
@@ -197,13 +203,18 @@ main (int argc, const char* argv[])
     case entry_type::symlink:   cout << "symlink"; break;
     case entry_type::other:     cout << "other"; break;
     }
+    cout << endl;
+
+    cout << "size: " << es.second.size << endl
+         << "target: "
+         << (ls.second.type == entry_type::symlink
+             ? readsymlink (p)
+             : p) << endl;
 
     stage = "get permissions";
 
-    cout << endl
-         << "size: " << es.second.size << endl
-         << "permissions: " << oct
-         << static_cast<size_t> (path_permissions (p)) << endl;
+    cout << "permissions: "
+         << oct << static_cast<size_t> (path_permissions (p)) << endl;
 
     stage = tdir ? "get directory times" : "get file times";
 
diff --git a/tests/path-entry/testscript b/tests/path-entry/testscript
index 0424dff..1d6911f 100644
--- a/tests/path-entry/testscript
+++ b/tests/path-entry/testscript
@@ -12,10 +12,10 @@
   :
   {
     cat <:'abc' >=f;
-    $* f >>~/EOO/
+    $* f >>~%EOO%
       type: regular
       size: 3
-      /.+
+      %.+
       EOO
   }
 
@@ -25,9 +25,9 @@
   :
   {
     mkdir -p d;
-    $* d >>~/EOO/
+    $* d >>~%EOO%
       type: directory
-      /.+
+      %.+
       EOO
   }
 
@@ -36,10 +36,10 @@
   {
     cat <:'abc' >=f;
     ln -s f l;
-    $* -l l >>~/EOO/
+    $* -l l >>~%EOO%
       type: regular
       size: 3
-      /.+
+      %.+
       EOO
   }
 
@@ -54,7 +54,7 @@
   if ($test.target == $build.host)
   {
     +if ($cxx.target.class != 'windows')
-      lnf = ln -s t l &l
+      lnf = ^ln -s t l &l
       lnd = $lnf
     else
       echo 'yes' >=t
@@ -156,7 +156,12 @@
       {
         mkdir t;
         $jnc;
-        $* -p 400 -m '2020-03-05 00:00:00' -a '2020-03-05 00:00:01' t | set ti;
+
+        # Pass the absolute path so the junction's target path matches.
+        #
+        $* -p 400 -m '2020-03-05 00:00:00' -a '2020-03-05 00:00:01' $~/t | \
+        set ti;
+
         $* -l l >"$ti"
       }