Patch from vodz:

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

diff --git a/libbb/mtab.c b/libbb/mtab.c
index 28c9978ef75b61d33189bb2bb2780991ce6ffb6f..a62169a2632ad1a6bf5fa5213d8de0d5f8786f11 100644 (file)
--- a/libbb/mtab.c
+++ b/libbb/mtab.c
@@ -1,4 +1,24 @@
 /* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 1999-2003 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
+ */
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -7,21 +27,20 @@
 #include <mntent.h>
 #include "libbb.h"
 
-extern const char mtab_file[]; /* Defined in utility.c */
 static const int MS_RDONLY = 1;        /* Mount read-only.  */
 
 void erase_mtab(const char *name)
 {
        struct mntent entries[20];
        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;
        }
 
@@ -35,7 +54,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++) {
@@ -49,17 +68,17 @@ void erase_mtab(const char *name)
                }
                endmntent(mountTable);
        } else if (errno != EROFS)
-               perror_msg("%s", mtab_file);
+               bb_perror_msg(bb_path_mtab_file);
 }
 
 void write_mtab(char *blockDevice, char *directory,
                                char *filesystemType, long flags, char *string_flags)
 {
-       FILE *mountTable = setmntent(mtab_file, "a+");
+       FILE *mountTable = setmntent(bb_path_mtab_file, "a+");
        struct mntent m;
 
        if (mountTable == 0) {
-               perror_msg("%s", mtab_file);
+               bb_perror_msg(bb_path_mtab_file);
                return;
        }
        if (mountTable) {