From 03b9af4e5d4ef0ec1dc1d83ea55ab454c6e0f3e9 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Thu, 22 Oct 2020 10:25:14 +0300 Subject: [PATCH] Revert "urar extfs: don't start path with ./ in file list." This reverts commit 6dc337ff9044a3ce1cac16e3a547396bd1028726. Signed-off-by: Andrew Borodin --- src/vfs/extfs/helpers/urar.in | 4 ++-- .../extfs/helpers-list/data/urar.v4,v3.output | 18 +++++++++--------- .../vfs/extfs/helpers-list/data/urar.v5.output | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/vfs/extfs/helpers/urar.in b/src/vfs/extfs/helpers/urar.in index 6742ac519..5453d3195 100644 --- a/src/vfs/extfs/helpers/urar.in +++ b/src/vfs/extfs/helpers/urar.in @@ -47,7 +47,7 @@ flag==1 { else if (index($6, ".") != 0) $6="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s %s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str + printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str }' } @@ -105,7 +105,7 @@ mcrar5fs_list () } ### and finally - printf ("%s 1 %s %s %d %02d/%02d/%02d %s %s\n", + printf ("%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", attrs, uid, gid, size, date[2], date[3], date[1], time, name); } ' diff --git a/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output b/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output index 5a162621a..95685985c 100644 --- a/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output +++ b/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output @@ -1,9 +1,9 @@ -drwx------ 1 <> <> 0 2016-06-07 20:43:00 .dosbox --rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 .dosbox/dosbox-0.74.conf --rw------- 1 <> <> 11032 2016-11-23 07:10:00 .viminfo --rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 .wget-hsts --rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 .xboardrc --rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 .xchm --rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 .xinputrc --rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 filename with spaces.txt --rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 log.txt +drwx------ 1 <> <> 0 2016-06-07 20:43:00 ./.dosbox +-rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 ./.dosbox/dosbox-0.74.conf +-rw------- 1 <> <> 11032 2016-11-23 07:10:00 ./.viminfo +-rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 ./.wget-hsts +-rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 ./.xboardrc +-rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 ./.xchm +-rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 ./.xinputrc +-rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 ./filename with spaces.txt +-rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 ./log.txt diff --git a/tests/src/vfs/extfs/helpers-list/data/urar.v5.output b/tests/src/vfs/extfs/helpers-list/data/urar.v5.output index 5a162621a..95685985c 100644 --- a/tests/src/vfs/extfs/helpers-list/data/urar.v5.output +++ b/tests/src/vfs/extfs/helpers-list/data/urar.v5.output @@ -1,9 +1,9 @@ -drwx------ 1 <> <> 0 2016-06-07 20:43:00 .dosbox --rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 .dosbox/dosbox-0.74.conf --rw------- 1 <> <> 11032 2016-11-23 07:10:00 .viminfo --rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 .wget-hsts --rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 .xboardrc --rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 .xchm --rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 .xinputrc --rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 filename with spaces.txt --rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 log.txt +drwx------ 1 <> <> 0 2016-06-07 20:43:00 ./.dosbox +-rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 ./.dosbox/dosbox-0.74.conf +-rw------- 1 <> <> 11032 2016-11-23 07:10:00 ./.viminfo +-rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 ./.wget-hsts +-rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 ./.xboardrc +-rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 ./.xchm +-rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 ./.xinputrc +-rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 ./filename with spaces.txt +-rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 ./log.txt