From db78c6a3ccd2bfde092124eca1d3174ac3902f55 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 7 Nov 2013 22:25:22 +0200 Subject: Solaris fixes. --- test/readdir0.awk | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'test/readdir0.awk') diff --git a/test/readdir0.awk b/test/readdir0.awk index c98ac674..3a114fcd 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -11,12 +11,35 @@ BEGIN { } } -{ - ino = $1 - name = $NF - type = substr($2, 1, 1) - if (type == "-") - type = "f" +BEGIN { + ls_afi = "ls -afi .." + ls_al = "ls -la .. | sed 1d" + + for (i = 1; (ls_afi | getline) > 0; i++) { + # inode number is $1, filename is read of record + inode = $1 + $1 = "" + $0 = $0 + sub(/^ */, "") + names[i] = $0 + ino[names[i]] = inode + } + close(ls_afi) + + for (j = 1; (ls_al | getline) > 0; j++) { + type_let = substr($0, 1, 1) + if (type_let == "-") + type_let = "f" + $1 = $2 = $3 = $4 = $5 = $6 = $7 = $8 = "" + $0 = $0 + sub(/^ */, "") + type[$0] = type_let + } + close(ls_al) - printf "%s/%s/%s\n", ino, name, (ftype_unknown ? "u" : type) + if (i != j) + printf("mismatch: %d from `ls -afi' and %d from `ls -l'\n", i, j) > "/dev/stderr" + + for (i = 1; i in names; i++) + printf("%s/%s/%s\n", ino[names[i]], names[i], type[names[i]]) } -- cgit v1.2.3 From e099abb7786b66f3385deb1f55b1d58c83a0a8ba Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Wed, 20 Nov 2013 06:02:11 +0200 Subject: Make readdir test work if group name has spaces. --- test/readdir0.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/readdir0.awk') diff --git a/test/readdir0.awk b/test/readdir0.awk index 3a114fcd..f16f4818 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -13,7 +13,7 @@ BEGIN { BEGIN { ls_afi = "ls -afi .." - ls_al = "ls -la .. | sed 1d" + ls_al = "ls -lna .. | sed 1d" for (i = 1; (ls_afi | getline) > 0; i++) { # inode number is $1, filename is read of record -- cgit v1.2.3 From 7e7f5610683ea455b6d40297b0c3cd11156006da Mon Sep 17 00:00:00 2001 From: "Andrew J. Schorr" Date: Wed, 27 Nov 2013 16:57:25 -0500 Subject: Readdir test should work on filesystems lacking type info in the dirent. --- test/readdir0.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/readdir0.awk') diff --git a/test/readdir0.awk b/test/readdir0.awk index f16f4818..5aedbf70 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -41,5 +41,5 @@ BEGIN { printf("mismatch: %d from `ls -afi' and %d from `ls -l'\n", i, j) > "/dev/stderr" for (i = 1; i in names; i++) - printf("%s/%s/%s\n", ino[names[i]], names[i], type[names[i]]) + printf("%s/%s/%s\n", ino[names[i]], names[i], (ftype_unknown ? "u" : type[names[i]])) } -- cgit v1.2.3 From 44164e59a0398e5ffc2e7f5519c295aad2df6655 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 28 Nov 2013 22:27:47 +0200 Subject: Make 'make distcheck' work. --- test/readdir0.awk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test/readdir0.awk') diff --git a/test/readdir0.awk b/test/readdir0.awk index 5aedbf70..296c03c7 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -12,8 +12,10 @@ BEGIN { } BEGIN { - ls_afi = "ls -afi .." - ls_al = "ls -lna .. | sed 1d" + dir = ARGV[1] + delete ARGV[1] + ls_afi = "ls -afi " dir + ls_al = ("ls -lna " dir " | sed 1d") for (i = 1; (ls_afi | getline) > 0; i++) { # inode number is $1, filename is read of record -- cgit v1.2.3