From 974c355c595598a219785b6661bb6b030aaef4df Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Mon, 29 Dec 2014 22:33:25 +0000 Subject: 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". --- tests/df/skip-duplicates.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/df/skip-duplicates.sh b/tests/df/skip-duplicates.sh index 6b984ad21..1de01322f 100755 --- a/tests/df/skip-duplicates.sh +++ b/tests/df/skip-duplicates.sh @@ -90,6 +90,8 @@ struct mntent *getmntent (FILE *fp) { if (!mntents[done-2].mnt_type) mntents[done-2].mnt_type = "-"; + if (!mntents[done-2].mnt_opts) + mntents[done-2].mnt_opts = "-"; if (STREQ (mntents[done-2].mnt_dir, "/NONROOT")) mntents[done-2].mnt_dir = nonroot_fs; if (STREQ (mntents[done-2].mnt_dir, "/REMOTE")) -- cgit v1.2.3-70-g09d2