Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coreutils
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
coreutils
Commits
9262dc17
Commit
9262dc17
authored
Jul 07, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed coreutils build on aarch64
parent
b06d2885
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
118 additions
and
0 deletions
+118
-0
Makefile
Makefile
+1
-0
build.xml
build.xml
+3
-0
coreutils-8.32-ls-restore-8.31-behavior-on-removed-directories.patch
....32-ls-restore-8.31-behavior-on-removed-directories.patch
+114
-0
No files found.
Makefile
View file @
9262dc17
...
@@ -2,6 +2,7 @@ all: export FORCE_UNSAFE_CONFIGURE := 1
...
@@ -2,6 +2,7 @@ all: export FORCE_UNSAFE_CONFIGURE := 1
all
:
all
:
tar
xf coreutils-8.32.tar.xz
tar
xf coreutils-8.32.tar.xz
patch
-Np1
-d
coreutils-8.32 < coreutils-8.32-i18n-1.patch
patch
-Np1
-d
coreutils-8.32 < coreutils-8.32-i18n-1.patch
patch
-Np1
-d
coreutils-8.32 < coreutils-8.32-ls-restore-8.31-behavior-on-removed-directories.patch
cd
coreutils-8.32
&&
sed
-i
'/test.lock/s/^/#/'
gnulib-tests/gnulib.mk
cd
coreutils-8.32
&&
sed
-i
'/test.lock/s/^/#/'
gnulib-tests/gnulib.mk
cd
coreutils-8.32
&&
autoreconf
-fiv
cd
coreutils-8.32
&&
autoreconf
-fiv
cd
coreutils-8.32
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--enable-no-install-program
=
kill
,uptime
cd
coreutils-8.32
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--enable-no-install-program
=
kill
,uptime
...
...
build.xml
View file @
9262dc17
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
<exec
executable=
"patch"
dir=
"${makedir}"
failonerror=
"true"
>
<exec
executable=
"patch"
dir=
"${makedir}"
failonerror=
"true"
>
<arg
line=
"-Np1 -i ${basedir}/packages/coreutils/coreutils-8.32-noman.patch"
/>
<arg
line=
"-Np1 -i ${basedir}/packages/coreutils/coreutils-8.32-noman.patch"
/>
</exec>
</exec>
<exec
executable=
"patch"
dir=
"${makedir}"
failonerror=
"true"
>
<arg
line=
"-Np1 -i ${basedir}/packages/coreutils/coreutils-8.32-ls-restore-8.31-behavior-on-removed-directories.patch"
/>
</exec>
<echo
file=
"${makedir}/config.cache"
>
fu_cv_sys_stat_statfs2_bsize=yes
<echo
file=
"${makedir}/config.cache"
>
fu_cv_sys_stat_statfs2_bsize=yes
gl_cv_func_working_mkstemp=yes
gl_cv_func_working_mkstemp=yes
</echo>
</echo>
...
...
coreutils-8.32-ls-restore-8.31-behavior-on-removed-directories.patch
0 → 100644
View file @
9262dc17
From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 5 Mar 2020 17:25:29 -0800
Subject: [PATCH] ls: restore 8.31 behavior on removed directories
* NEWS: Mention this.
*
src/ls.c: Do not include <sys/sycall.h>
(print_dir):
Don't worry about whether the directory is removed.
*
tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
behavior.
---
NEWS | 6 ++++++
src/ls.c | 22 ----------------------
tests/ls/removed-directory.sh | 10 ++--------
3 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/NEWS b/NEWS
index fdc8bf5db..653e7178b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@
GNU coreutils NEWS -*- outline -*-
* Noteworthy changes in release ?.? (????-??-??) [?]
+** Changes in behavior
+
+ On GNU/Linux systems, ls no longer issues an error message on
+ directory merely because it was removed. This reverts a change
+ that was made in release 8.32.
+
* Noteworthy changes in release 8.32 (2020-03-05) [stable]
diff --git a/src/ls.c b/src/ls.c
index 24b983287..4acf5f44d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -49,10 +49,6 @@
# include <sys/ptem.h>
#endif
-#ifdef __linux__
-# include <sys/syscall.h>
-#endif
-
#include <stdio.h>
#include <assert.h>
#include <setjmp.h>
@@ -2896,7 +2892,6 @@
print_dir (char const *name, char const *realname, bool command_line_arg)
struct dirent *next;
uintmax_t total_blocks = 0;
static bool first = true;
- bool found_any_entries = false;
errno = 0;
dirp = opendir (name);
@@ -2972,7 +2967,6 @@
print_dir (char const *name, char const *realname, bool command_line_arg)
next = readdir (dirp);
if (next)
{
- found_any_entries = true;
if (! file_ignored (next->d_name))
{
enum filetype type = unknown;
@@ -3018,22 +3012,6 @@
print_dir (char const *name, char const *realname, bool command_line_arg)
if (errno != EOVERFLOW)
break;
}
-#ifdef __linux__
- else if (! found_any_entries)
- {
- /* If readdir finds no directory entries at all, not even "." or
- "..", then double check that the directory exists. */
- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
- && errno != EINVAL)
- {
- /* We exclude EINVAL as that pertains to buffer handling,
- and we've passed NULL as the buffer for simplicity.
- ENOENT is returned if appropriate before buffer handling. */
- file_failure (command_line_arg, _("reading directory %s"), name);
- }
- break;
- }
-#endif
else
break;
diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
index e8c835dab..fe8f929a1 100755
--- a/tests/ls/removed-directory.sh
+++ b/tests/ls/removed-directory.sh
@@ -26,20 +26,14 @@
case $host_triplet in
*) skip_ 'non linux kernel' ;;
esac
-LS_FAILURE=2
-
-cat <<\EOF >exp-err || framework_failure_
-ls: reading directory '.': No such file or directory
-EOF
-
cwd=$(pwd)
mkdir d || framework_failure_
cd d || framework_failure_
rmdir ../d || framework_failure_
-returns_ $LS_FAILURE ls >../out 2>../err || fail=1
+ls >../out 2>../err || fail=1
cd "$cwd" || framework_failure_
compare /dev/null out || fail=1
-compare exp-err err || fail=1
+compare /dev/null err || fail=1
Exit $fail
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment