Shutdown sending on the socket when stdin closes.

[oweals/busybox.git] / mtab.c

diff --git a/mtab.c b/mtab.c
index e855717cef76e4e50ed1f519406c1961a86b78d0..1f2083709f9612a4fe00ca41504eaafb07461138 100644 (file)
--- a/mtab.c
+++ b/mtab.c
@@ -1,106 +1,103 @@
-#include "internal.h"
+/* vi: set sw=4 ts=4: */
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <mntent.h>
+#include <fstab.h>
 #include <sys/mount.h>
 
-extern const char mtab_file[]; /* Defined in utility.c */
+extern const char mtab_file[]; /* Defined in utility.c */
 
-static char *
-stralloc(const char * string)
-{
-       int     length = strlen(string) + 1;
-       char *  n = malloc(length);
-       memcpy(n, string, length);
-       return n;
-}
 
-extern void
-erase_mtab(const char * name)
+void erase_mtab(const char *name)
 {
-       struct mntent   entries[20];
-       int     count = 0;
+       struct mntent entries[20];
+       int count = 0;
        FILE *mountTable = setmntent(mtab_file, "r");
-       struct mntent * m;
+       struct mntent *m;
 
-       if ( mountTable == 0
-        && (mountTable = setmntent("/proc/mounts", "r")) == 0 ) {
+       /* Check if reading the mtab file failed */
+       if (mountTable == 0
+#if ! defined BB_FEATURE_USE_PROCFS
+               ) {
+#else
+               /* Bummer.  fall back on trying the /proc filesystem */
+               && (mountTable = setmntent("/proc/mounts", "r")) == 0) {
+#endif
                perror(mtab_file);
                return;
        }
 
-       while ( (m = getmntent(mountTable)) != 0 ) {
-               entries[count].mnt_fsname = stralloc(m->mnt_fsname);
-               entries[count].mnt_dir = stralloc(m->mnt_dir);
-               entries[count].mnt_type = stralloc(m->mnt_type);
-               entries[count].mnt_opts = stralloc(m->mnt_opts);
+       while ((m = getmntent(mountTable)) != 0) {
+               entries[count].mnt_fsname = strdup(m->mnt_fsname);
+               entries[count].mnt_dir = strdup(m->mnt_dir);
+               entries[count].mnt_type = strdup(m->mnt_type);
+               entries[count].mnt_opts = strdup(m->mnt_opts);
                entries[count].mnt_freq = m->mnt_freq;
                entries[count].mnt_passno = m->mnt_passno;
                count++;
        }
        endmntent(mountTable);
-       if ( (mountTable = setmntent(mtab_file, "w")) ) {
-               int     i;
-               for ( i = 0; i < count; i++ ) {
-                       int result = ( strcmp(entries[i].mnt_fsname, name) == 0
-                        || strcmp(entries[i].mnt_dir, name) == 0 );
+       if ((mountTable = setmntent(mtab_file, "w"))) {
+               int i;
+
+               for (i = 0; i < count; i++) {
+                       int result = (strcmp(entries[i].mnt_fsname, name) == 0
+                                                 || strcmp(entries[i].mnt_dir, name) == 0);
 
-                       if ( result )
+                       if (result)
                                continue;
                        else
                                addmntent(mountTable, &entries[i]);
                }
                endmntent(mountTable);
-       }
-       else if ( errno != EROFS )
+       } else if (errno != EROFS)
                perror(mtab_file);
 }
 
-extern void 
-write_mtab(char* blockDevice, char* directory, 
-       char* filesystemType, long flags, char* string_flags)
+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 ) {
+       if (mountTable == 0) {
                perror(mtab_file);
                return;
        }
        if (mountTable) {
-           int length = strlen(directory);
+               int length = strlen(directory);
 
-           if ( length > 1 && directory[length - 1] == '/' )
-                   directory[length - 1] = '\0';
+               if (length > 1 && directory[length - 1] == '/')
+                       directory[length - 1] = '\0';
 
-           if ( filesystemType == 0 ) {
-                   struct mntent *     p
-                    = findMountPoint(blockDevice, "/proc/mounts");
+#ifdef BB_FEATURE_USE_PROCFS
+               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);
-    }
-}
+                       if (p && p->mnt_type)
+                               filesystemType = p->mnt_type;
+               }
+#endif
+               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);
+       }
+}