libbb/mtab: fix xrealloc_vector fallout

[oweals/busybox.git] / libbb / find_mount_point.c

diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 8341612d4034fa5d9e38767f1ba4629437eacb67..4cd6b161894ca1069a5df3ebd2ef0ddbe63a1fb7 100644 (file)
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -7,12 +7,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "libbb.h"
-
-
 #include <mntent.h>
+
 /*
  * Given a block device, find the mount table entry if that block device
  * is mounted.
@@ -20,7 +17,7 @@
  * Given any other file (or directory), find the mount table entry for its
  * filesystem.
  */
-struct mntent *find_mount_point(const char *name, const char *table)
+struct mntent* FAST_FUNC find_mount_point(const char *name, const char *table)
 {
        struct stat s;
        dev_t mountDevice;
@@ -36,14 +33,16 @@ struct mntent *find_mount_point(const char *name, const char *table)
                mountDevice = s.st_dev;
 
 
-       if ((mountTable = setmntent(table ? table : bb_path_mtab_file, "r")) == 0)
+       mountTable = setmntent(table ? table : bb_path_mtab_file, "r");
+       if (!mountTable)
                return 0;
 
        while ((mountEntry = getmntent(mountTable)) != 0) {
-
-                       if(strcmp(name, mountEntry->mnt_dir) == 0
-                       || strcmp(name, mountEntry->mnt_fsname) == 0)   /* String match. */
+               if (strcmp(name, mountEntry->mnt_dir) == 0
+                || strcmp(name, mountEntry->mnt_fsname) == 0
+               ) { /* String match. */
                        break;
+               }
                if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice)  /* Match the device. */
                        break;
                if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice)      /* Match the directory's mount point. */