Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/mtab.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/mtab.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/mtab.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -12 +12 @@
 
 #if ENABLE_FEATURE_MTAB_SUPPORT
-void erase_mtab(const char *name)
+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;
@@ -27 +27 @@
     }
 
+    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) {