last nail into error_msg() (de)capitalization

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

diff --git a/libbb/mtab.c b/libbb/mtab.c
index c521b1e057eed1ce8b2302dc3d91be0d47730c0c..cce1aac5c45396212bd60c678de523017cd8357e 100644 (file)
--- a/libbb/mtab.c
+++ b/libbb/mtab.c
@@ -2,21 +2,9 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdlib.h>
@@ -27,25 +15,26 @@
 #include <mntent.h>
 #include "libbb.h"
 
-extern const char mtab_file[]; /* Defined in utility.c */
-static const int MS_RDONLY = 1;        /* Mount read-only.  */
+#define MTAB_MAX_ENTRIES 40
 
+#ifdef CONFIG_FEATURE_MTAB_SUPPORT
 void erase_mtab(const char *name)
 {
-       struct mntent entries[20];
+       struct mntent entries[MTAB_MAX_ENTRIES];
        int count = 0;
-       FILE *mountTable = setmntent(mtab_file, "r");
+       FILE *mountTable = setmntent(bb_path_mtab_file, "r");
        struct mntent *m;
 
        /* Check if reading the mtab file failed */
        if (mountTable == 0
                        /* Bummer.  fall back on trying the /proc filesystem */
                        && (mountTable = setmntent("/proc/mounts", "r")) == 0) {
-               perror_msg("%s", mtab_file);
+               bb_perror_msg(bb_path_mtab_file);
                return;
        }
 
-       while ((m = getmntent(mountTable)) != 0) {
+       while (((m = getmntent(mountTable)) != 0) && (count < MTAB_MAX_ENTRIES))
+       {
                entries[count].mnt_fsname = strdup(m->mnt_fsname);
                entries[count].mnt_dir = strdup(m->mnt_dir);
                entries[count].mnt_type = strdup(m->mnt_type);
@@ -55,7 +44,7 @@ void erase_mtab(const char *name)
                count++;
        }
        endmntent(mountTable);
-       if ((mountTable = setmntent(mtab_file, "w"))) {
+       if ((mountTable = setmntent(bb_path_mtab_file, "w"))) {
                int i;
 
                for (i = 0; i < count; i++) {
@@ -69,47 +58,6 @@ void erase_mtab(const char *name)
                }
                endmntent(mountTable);
        } else if (errno != EROFS)
-               perror_msg("%s", mtab_file);
-}
-
-void write_mtab(char *blockDevice, char *directory,
-                               char *filesystemType, long flags, char *string_flags)
-{
-       FILE *mountTable = setmntent(mtab_file, "a+");
-       struct mntent m;
-
-       if (mountTable == 0) {
-               perror_msg("%s", mtab_file);
-               return;
-       }
-       if (mountTable) {
-               int length = strlen(directory);
-
-               if (length > 1 && directory[length - 1] == '/')
-                       directory[length - 1] = '\0';
-
-               if (filesystemType == 0) {
-                       struct mntent *p = find_mount_point(blockDevice, "/proc/mounts");
-
-                       if (p && p->mnt_type)
-                               filesystemType = p->mnt_type;
-               }
-               m.mnt_fsname = blockDevice;
-               m.mnt_dir = directory;
-               m.mnt_type = filesystemType ? filesystemType : "default";
-
-               if (*string_flags) {
-                       m.mnt_opts = string_flags;
-               } else {
-                       if ((flags | MS_RDONLY) == flags)
-                               m.mnt_opts = "ro";
-                       else
-                               m.mnt_opts = "rw";
-               }
-
-               m.mnt_freq = 0;
-               m.mnt_passno = 0;
-               addmntent(mountTable, &m);
-               endmntent(mountTable);
-       }
+               bb_perror_msg(bb_path_mtab_file);
 }
+#endif