summaryrefslogtreecommitdiff
path: root/src/ls.c
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-12-29 22:33:25 +0000
committerPádraig Brady <P@draigBrady.com>2014-12-30 02:21:47 +0000
commit974c355c595598a219785b6661bb6b030aaef4df (patch)
tree732f78fb9473ad56b0a485905c19cd31e442f7ff /src/ls.c
parentfe14d42ec93b25b244b2061fd1236911c0a5b0e1 (diff)
downloadcoreutils-974c355c595598a219785b6661bb6b030aaef4df.tar.xz
build: update to latest gnulib
Included in this are gnulib changes 3ea43e02 2768ceb7 which make the device IDs from /proc/self/mountinfo available to df. This can be leveraged by a subsequent change to df to present a more accurate list of file systems. * bootstrap: Merge from gnulib. * src/ls.c (dev_ino_pop): s/obstack_blank/obstack_blank_fast/ as this API/ABI has changed, giving memory exhausted errors if negative (large positive) numbers are passed to obstack_blank(). * tests/df/skip-duplicates.sh: Adjust as the new gnulib code requires a non NULL mnt_opts even when mnt_type is not "none".
Diffstat (limited to 'src/ls.c')
-rw-r--r--src/ls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ls.c b/src/ls.c
index 82402ee77..5bee5e683 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -990,7 +990,7 @@ dev_ino_pop (void)
struct dev_ino *di;
int dev_ino_size = sizeof *di;
assert (dev_ino_size <= obstack_object_size (&dev_ino_obstack));
- obstack_blank (&dev_ino_obstack, -dev_ino_size);
+ obstack_blank_fast (&dev_ino_obstack, -dev_ino_size);
vdi = obstack_next_free (&dev_ino_obstack);
di = vdi;
return *di;