aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-10-02 18:46:36 -0700
committerRob Landley <rob@landley.net>2019-10-04 16:16:57 -0500
commit86c25f5335bd664a4f6dc7255c7556df707fe086 (patch)
tree10746b4a366d46025e4f1d79215d61ed5e7415f8
parent09c7c9ee1020ebb915c4fbaf4a55127f40ef3daa (diff)
downloadtoybox-86c25f5335bd664a4f6dc7255c7556df707fe086.tar.gz
readlink: add missing line, plus a test.
I must have lost this line somehow when I moved the patch from my AOSP tree to a toybox tree. (But the ln tests passed on the host because I was using coreutils ln there :-( )
-rwxr-xr-xtests/readlink.test1
-rw-r--r--toys/other/readlink.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/readlink.test b/tests/readlink.test
index 52121770..cc728dbf 100755
--- a/tests/readlink.test
+++ b/tests/readlink.test
@@ -17,6 +17,7 @@ testing "-f missing" "readlink -f notfound" "$APWD/notfound\n" "" ""
ln -sf notfound link
testing "link" "readlink link" "notfound\n" "" ""
+testing "links" "readlink link link" "notfound\nnotfound\n" "" ""
testing "link->missing" "readlink -f link" "$APWD/notfound\n" "" ""
ln -sf ../../ link
testing "stays relative" "readlink link" "../../\n" "" ""
diff --git a/toys/other/readlink.c b/toys/other/readlink.c
index eb63d7f4..9ebf68d7 100644
--- a/toys/other/readlink.c
+++ b/toys/other/readlink.c
@@ -2,7 +2,7 @@
*
* Copyright 2007 Rob Landley <rob@landley.net>
-USE_READLINK(NEWTOY(readlink, "<1>1nqmef(canonicalize)[-mef]", TOYFLAG_USR|TOYFLAG_BIN))
+USE_READLINK(NEWTOY(readlink, "<1nqmef(canonicalize)[-mef]", TOYFLAG_USR|TOYFLAG_BIN))
config READLINK
bool "readlink"