diff options
| author | Bernhard Voelker <mail@bernhard-voelker.de> | 2014-07-04 01:54:45 +0200 |
|---|---|---|
| committer | Bernhard Voelker <mail@bernhard-voelker.de> | 2014-07-04 01:54:45 +0200 |
| commit | 9c128c0e4943421a73fb0cde4b06a2baa751fdeb (patch) | |
| tree | 26adc0e76cd686e45fedbf9794d93a7b2f951607 /src | |
| parent | 8e2219b09c513e6e0e8f83cca73baa05cd876f12 (diff) | |
| download | coreutils-9c128c0e4943421a73fb0cde4b06a2baa751fdeb.tar.xz | |
maint: simplify parsing df's output in shell scripts
Avoid complicated and error-prone parsing of df's output via
sed(1), cut(1), etc., and instead use df's more modern --output
option.
* src/ioblksize.h (in a comment): Simplify the extraction of the
device name of the mounted file system from df's output.
* tests/dd/skip-seek-past-dev.sh: Likewise.
* tests/du/2g.sh: Likewise for the 'avail' column here.
Also avoid the deprecated use of "tail -NUM".
* tests/misc/stat-mount.sh: While at it, remove the determination
of the mount point of "." via df(1) plus sed(1) as it is unused
since commit v8.5-159-gf57cb37 anyway. Instead, improve this test
by verifying that the output of "stat -c%m ." at least starts with
a slash '/'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ioblksize.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ioblksize.h b/src/ioblksize.h index 276d38fe6..55aaeae11 100644 --- a/src/ioblksize.h +++ b/src/ioblksize.h @@ -63,7 +63,7 @@ the readahead setting is 128KiB which was read using: file="." - device=$(df -P --local "$file" | tail -n1 | cut -d' ' -f1) + device=$(df --output=source --local "$file" | tail -n1) echo $(( $(blockdev --getra $device) * 512 )) However there isn't a portable way to get the above. |