findmnt: make --poll more robust

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 300fe4de16654e5a38f14e4e89dd83aec14ff15c..29760d42f5387a928e4fd64875581e9689449910 100644 (file)
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -47,4 +47,4 @@ $(ul_libmount_la):
 # smatch scan -- smatch and cgcc are expected in $PATH
 #
 checksmatch:
-       $(MAKE) CHECK="smatch --data=$(top_srcdir)/tools/smatch-data" CC=cgcc
+       $(MAKE) CHECK="smatch --data=$(abs_top_srcdir)/tools/smatch-data" CC=cgcc

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 083cfea2caf7a562f827fc9390d442777c9cb7bf..4a65df990b2b8a0bda0f070cfa37d5891eb37bb1 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1150,11 +1150,12 @@ int main(int argc, char *argv[])
        /*
         * Fill in data to the output table
         */
-       if (flags & FL_POLL)
+       if (flags & FL_POLL) {
                /* poll mode (accept the first tabfile only) */
-               rc = poll_table(tb, *tabfiles, timeout, tt, direction);
+               if (tabfiles && ntabfiles > 0)
+                       rc = poll_table(tb, *tabfiles, timeout, tt, direction);
 
-       else if ((tt_flags & TT_FL_TREE) && is_listall_mode())
+       } else if ((tt_flags & TT_FL_TREE) && is_listall_mode())
                /* whole tree */
                rc = create_treenode(tt, tb, NULL, NULL);
        else