[Toybox] [PATCH] Make ls.test work without awk.

[enh]

---
 tests/ls.test | 4 
 1 file changed, 4 insertions(+)
From 07389a6dca9572e4377d9fbd6c3d82a0610229d4 Mon Sep 17 00:00:00 2001
From: Elliott Hughes 
Date: Wed, 5 Apr 2017 10:27:58 -0700
Subject: [PATCH] Make ls.test work without awk.

---
 tests/ls.test | 4 
 1 file changed, 4 insertions(+)

diff --git a/tests/ls.test b/tests/ls.test
index b29c478..86116cb 100755
--- a/tests/ls.test
+++ b/tests/ls.test
@@ -33,6 +33,10 @@ testing "with -F" "$IN && ls -F; $OUT" "dir1/\ndir2/\nfile1.txt\nfile2.txt\n" ""
 testing "with -dk *" "$IN && ls -dk *; $OUT" "dir1\ndir2\nfile1.txt\nfile2.txt\n" "" ""
 
 ln -s file1.txt lstest/slink
+testing "softlink - long listing" \
+"$IN && ls -l slink | grep -q -- ' slink -> file1.txt' && echo ok ; $OUT" \
+"ok\n" "" ""
+
 testing "softlink - long listing" "$IN && ls -l slink | awk '{ print \$NF }' ; $OUT" \
   "file1.txt\n" "" ""
 rm -f lstest/slink
-- 
2.12.2.715.g7642488e1d-goog

___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Re: [Toybox] [PATCH] Make fdisk buildable.

[enh]

(someone was asking about fdisk. if it doesn't build, they can't even kick
the tires...)

On Wed, Apr 5, 2017 at 10:14 AM, enh  wrote:

>
> The argument to help_exit is a char*, not a FILE*.
> ---
>  toys/pending/fdisk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
>


-- 
Elliott Hughes - http://who/enh - http://jessies.org/~enh/
Android native code/tools questions? Mail me/drop by/add me as a reviewer.
___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

[Toybox] [PATCH] Make fdisk buildable.

[enh]

The argument to help_exit is a char*, not a FILE*.
---
 toys/pending/fdisk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
From 5bdf187cba299ed2837e5ad0cd7d6b553b447384 Mon Sep 17 00:00:00 2001
From: Elliott Hughes 
Date: Wed, 5 Apr 2017 10:13:47 -0700
Subject: [PATCH] Make fdisk buildable.

The argument to help_exit is a char*, not a FILE*.
---
 toys/pending/fdisk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toys/pending/fdisk.c b/toys/pending/fdisk.c
index d000c05..08cfa71 100644
--- a/toys/pending/fdisk.c
+++ b/toys/pending/fdisk.c
@@ -1486,7 +1486,7 @@ void fdisk_main(void)
 toys.exitval = 0;
 return;
   } else {
-if (toys.optc != 1) help_exit(stdout);
+if (toys.optc != 1) help_exit(0);
 if (read_mbr(toys.optargs[0], 1)) return;
 while (1) {
   xputc('\n');
-- 
2.12.2.715.g7642488e1d-goog

___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net