truncate: improve handling of non regular files

Previously we copied `dd` and suppressed error messages
when truncating neither regular files or shared mem objects.
This was valid for `dd`, as truncation is ancillary to copying
it may also do, but for `truncate` we should display all errors.
Also we used the st_size from non regular files which is undefined,
so we display an error when the user tries this.

* src/truncate (do_truncate):  Error when referencing the size
of non regular files or non shared memory objects.  Display all
errors returned by ftruncate().
(main): Error when referencing the size of non regular files or
non shared memory objects.  Don't suppress error messages for
any file types that can't be opened for writing.
* tests/misc/truncate-dir-fail: Check that referencing the
size of a directory is not supported.
* tests/misc/truncate-fifo: Ensure the test doesn't hang
by using the `timeout` command.  Don't test the return from
running ftruncate on the fifo as it's system dependent as
to whether this fails or not.
NEWS: Mention the change in behavior.
Reported by Jim Meyering.
This commit is contained in:
Pádraig Brady committed 2010-05-29 10:45:13 +01:00
1 parent 81b7585ad1
commit 200501052e
4 files changed
+27 -45

No files matched your search

+3
View File
@@ -26,4 +26,7 @@ fi
# truncate on dir not allowed
truncate -s+0 . && fail=1
# getting the size of a dir is not allowed
truncate -r. file && fail=1
Exit $fail
+4 -4
View File
@@ -1,5 +1,5 @@
#!/bin/sh
# Make sure truncate works on fifos without hanging or errors
# Make sure truncate works on fifos without hanging
# Copyright (C) 2008-2010 Free Software Foundation, Inc.
@@ -23,9 +23,9 @@ fi
. $srcdir/test-lib.sh
mkfifo_or_skip_ "fifo"
mkfifo_or_skip_ fifo
truncate -s0 "fifo" || fail=1
timeout 10 truncate -s0 fifo
test "$?" = 124 && fail=1
Exit $fail