Changeset ff381a7 in mainline for uspace/app/df/df.c

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/df/df.c (modified) (1 diff)

uspace/app/df/df.c

@@ -119 +119 @@
 
         LIST_INITIALIZE(mtab_list);
-        get_mtab_list(&mtab_list);
+        vfs_get_mtab_list(&mtab_list);
 
         print_header();
         list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
-                statfs(mtab_ent->mp, &st);
-                print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
+                if (statfs(mtab_ent->mp, &st) == 0) {
+                        print_statfs(&st, mtab_ent->fs_name, mtab_ent->mp);
+                } else {
+                        fprintf(stderr, "Cannot get information for '%s' (%d).\n",
+                            mtab_ent->mp, errno);
+                }
         }