Start 1.33.0 development cycle

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

diff --git a/libbb/mtab.c b/libbb/mtab.c
index 57654a695442fdf0e72f618e578a520b175aa41d..aa1a2a103b05d1b46e62a817bd117c203e5e6820 100644 (file)
--- a/libbb/mtab.c
+++ b/libbb/mtab.c
@@ -4,17 +4,16 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include <mntent.h>
 #include "libbb.h"
 
 #if ENABLE_FEATURE_MTAB_SUPPORT
 void FAST_FUNC erase_mtab(const char *name)
 {
-       struct mntent *entries = NULL;
-       int i, count = 0;
+       struct mntent *entries;
+       int i, count;
        FILE *mountTable;
        struct mntent *m;
 
@@ -22,22 +21,25 @@ void FAST_FUNC erase_mtab(const char *name)
        /* Bummer. Fall back on trying the /proc filesystem */
        if (!mountTable) mountTable = setmntent("/proc/mounts", "r");
        if (!mountTable) {
-               bb_perror_msg(bb_path_mtab_file);
+               bb_simple_perror_msg(bb_path_mtab_file);
                return;
        }
 
+       entries = NULL;
+       count = 0;
        while ((m = getmntent(mountTable)) != 0) {
-               i = count++;
-               entries = xrealloc(entries, count * sizeof(entries[0]));
-               entries[i].mnt_fsname = xstrdup(m->mnt_fsname);
-               entries[i].mnt_dir = xstrdup(m->mnt_dir);
-               entries[i].mnt_type = xstrdup(m->mnt_type);
-               entries[i].mnt_opts = xstrdup(m->mnt_opts);
-               entries[i].mnt_freq = m->mnt_freq;
-               entries[i].mnt_passno = m->mnt_passno;
+               entries = xrealloc_vector(entries, 3, count);
+               entries[count].mnt_fsname = xstrdup(m->mnt_fsname);
+               entries[count].mnt_dir = xstrdup(m->mnt_dir);
+               entries[count].mnt_type = xstrdup(m->mnt_type);
+               entries[count].mnt_opts = xstrdup(m->mnt_opts);
+               entries[count].mnt_freq = m->mnt_freq;
+               entries[count].mnt_passno = m->mnt_passno;
+               count++;
        }
        endmntent(mountTable);
 
+//TODO: make update atomic
        mountTable = setmntent(bb_path_mtab_file, "w");
        if (mountTable) {
                for (i = 0; i < count; i++) {
@@ -47,6 +49,6 @@ void FAST_FUNC erase_mtab(const char *name)
                }
                endmntent(mountTable);
        } else if (errno != EROFS)
-               bb_perror_msg(bb_path_mtab_file);
+               bb_simple_perror_msg(bb_path_mtab_file);
 }
 #endif