mirror of
https://https.git.savannah.gnu.org/git/coreutils.git
synced 2026-01-27 01:44:21 +00:00
readlink,realpath: promptly diagnose write errors
The 'readlink' and 'realpath' programs have an uncommon case where they
can run for a very long time. When canonicalizing file names longer than
PATH_MAX, we have to call 'openat' for each directory up the tree until
we reach root which takes a long time. Here is an example of the current
behavior:
$ mkdir -p $(yes a/ | head -n $((32 * 1024)) | tr -d '\n')
$ while cd $(yes a/ | head -n 1024 | tr -d '\n'); do :; \
done 2>/dev/null
$ pwd | tr '/' '\n' | wc -l
32771
$ env time --format=%E readlink -f $(yes . | head -n 5) > /dev/full
readlink: write error: No space left on device
Command exited with non-zero status 1
0:59.72
$ env time --format=%E realpath $(yes . | head -n 5) > /dev/full
realpath: write error: No space left on device
Command exited with non-zero status 1
1:00.32
It is better to exit as soon as there is an error writing to standard
output:
$ env time --format=%E readlink -f $(yes . | head -n 5) > /dev/full
readlink: write error: No space left on device
Command exited with non-zero status 1
0:11.88
$ env time --format=%E realpath $(yes . | head -n 5) > /dev/full
realpath: write error: No space left on device
Command exited with non-zero status 1
0:12.04
* src/readlink.c (main): Check if standard output has it's error flag
set after printing a file name.
* src/realpath.c (process_path): Likewise.
* NEWS: Mention the improvement.
This commit is contained in:
parent
9200747f65
commit
b34e329f75
4
NEWS
4
NEWS
@ -81,6 +81,10 @@ GNU coreutils NEWS -*- outline -*-
|
||||
'pinky' will now exit immediately upon receiving a write error, which is
|
||||
significant when reading large plan or project files.
|
||||
|
||||
'readlink' and 'realpath' will now exit promptly upon receiving a write error,
|
||||
which is significant when canonicalizing multiple file names longer than
|
||||
PATH_MAX.
|
||||
|
||||
'timeout' on Linux will always terminate the child in the case where the
|
||||
timeout process itself dies, like when it receives a KILL signal for example.
|
||||
|
||||
|
||||
@ -171,6 +171,8 @@ main (int argc, char **argv)
|
||||
if (! no_newline)
|
||||
putchar (use_nuls ? '\0' : '\n');
|
||||
free (value);
|
||||
if (ferror (stdout))
|
||||
write_error ();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -166,6 +166,9 @@ process_path (char const *fname, int can_mode)
|
||||
|
||||
free (can_fname);
|
||||
|
||||
if (ferror (stdout))
|
||||
write_error ();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user