Add errno.h

[oweals/busybox.git] / mount.c

diff --git a/mount.c b/mount.c
index 06673f942843184fc8916a861f692f2faff609ca..f78786ebc012e73a288a110350f42fdd6d047939 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -55,21 +55,21 @@
 #include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
 #endif
 
-
-#define MS_MGC_VAL             0xc0ed0000 /* Magic number indicatng "new" flags */
-#define MS_RDONLY        1      /* Mount read-only */
-#define MS_NOSUID        2      /* Ignore suid and sgid bits */
-#define MS_NODEV         4      /* Disallow access to device special files */
-#define MS_NOEXEC        8      /* Disallow program execution */
-#define MS_SYNCHRONOUS  16      /* Writes are synced at once */
-#define MS_REMOUNT      32      /* Alter flags of a mounted FS */
-#define MS_MANDLOCK     64      /* Allow mandatory locks on an FS */
-#define S_QUOTA         128     /* Quota initialized for file/directory/symlink */
-#define S_APPEND        256     /* Append-only file */
-#define S_IMMUTABLE     512     /* Immutable file */
-#define MS_NOATIME      1024    /* Do not update access times. */
-#define MS_NODIRATIME   2048    /* Do not update directory access times */
-
+enum {
+       MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
+       MS_RDONLY = 1,      /* Mount read-only */
+       MS_NOSUID = 2,      /* Ignore suid and sgid bits */
+       MS_NODEV = 4,      /* Disallow access to device special files */
+       MS_NOEXEC = 8,      /* Disallow program execution */
+       MS_SYNCHRONOUS = 16,      /* Writes are synced at once */
+       MS_REMOUNT = 32,      /* Alter flags of a mounted FS */
+       MS_MANDLOCK = 64,      /* Allow mandatory locks on an FS */
+       S_QUOTA = 128,     /* Quota initialized for file/directory/symlink */
+       S_APPEND = 256,     /* Append-only file */
+       S_IMMUTABLE = 512,     /* Immutable file */
+       MS_NOATIME = 1024,    /* Do not update access times. */
+       MS_NODIRATIME = 2048,    /* Do not update directory access times */
+};
 
 
 #if defined BB_FEATURE_MOUNT_LOOP
@@ -271,18 +271,18 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
                /* open device */ 
                fd = open(device, O_RDONLY);
                if (fd < 0)
-                       error_msg_and_die("open failed for `%s': %s\n", device, strerror (errno));
+                       perror_msg_and_die("open failed for `%s'", device);
 
                /* How many filesystems?  We need to know to allocate enough space */
                numfilesystems = ioctl (fd, DEVMTAB_COUNT_FILESYSTEMS);
                if (numfilesystems<0)
-                       error_msg_and_die("\nDEVMTAB_COUNT_FILESYSTEMS: %s\n", strerror (errno));
+                       perror_msg_and_die("\nDEVMTAB_COUNT_FILESYSTEMS");
                fslist = (struct k_fstype *) xcalloc ( numfilesystems, sizeof(struct k_fstype));
 
                /* Grab the list of available filesystems */
                status = ioctl (fd, DEVMTAB_GET_FILESYSTEMS, fslist);
                if (status<0)
-                       error_msg_and_die("\nDEVMTAB_GET_FILESYSTEMS: %s\n", strerror (errno));
+                       perror_msg_and_die("\nDEVMTAB_GET_FILESYSTEMS");
 
                /* Walk the list trying to mount filesystems 
                 * that do not claim to be nodev filesystems */
@@ -307,8 +307,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
 
        if (status == FALSE) {
                if (whineOnErrors == TRUE) {
-                       error_msg("Mounting %s on %s failed: %s\n",
-                                       blockDevice, directory, strerror(errno));
+                       perror_msg("Mounting %s on %s failed", blockDevice, directory);
                }
                return (FALSE);
        }
@@ -340,21 +339,21 @@ extern int mount_main(int argc, char **argv)
                /* open device */ 
                fd = open(device, O_RDONLY);
                if (fd < 0)
-                       error_msg_and_die("open failed for `%s': %s\n", device, strerror (errno));
+                       perror_msg_and_die("open failed for `%s'", device);
 
                /* How many mounted filesystems?  We need to know to 
                 * allocate enough space for later... */
                numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
                if (numfilesystems<0)
-                       error_msg_and_die( "\nDEVMTAB_COUNT_MOUNTS: %s\n", strerror (errno));
+                       perror_msg_and_die( "\nDEVMTAB_COUNT_MOUNTS");
                mntentlist = (struct k_mntent *) xcalloc ( numfilesystems, sizeof(struct k_mntent));
                
                /* Grab the list of mounted filesystems */
                if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
-                       error_msg_and_die( "\nDEVMTAB_GET_MOUNTS: %s\n", strerror (errno));
+                       perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
 
                for( i = 0 ; i < numfilesystems ; i++) {
-                       fprintf( stdout, "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
+                       printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
                                        mntentlist[i].mnt_dir, mntentlist[i].mnt_type, 
                                        mntentlist[i].mnt_opts, mntentlist[i].mnt_freq, 
                                        mntentlist[i].mnt_passno);
@@ -384,7 +383,7 @@ extern int mount_main(int argc, char **argv)
                        }
                        endmntent(mountTable);
                } else {
-                       perror(mtab_file);
+                       perror_msg_and_die("%s", mtab_file);
                }
                return EXIT_SUCCESS;
        }
@@ -453,7 +452,7 @@ extern int mount_main(int argc, char **argv)
                fstabmount = TRUE;
 
                if (f == NULL)
-                       error_msg_and_die( "\nCannot read /etc/fstab: %s\n", strerror (errno));
+                       perror_msg_and_die( "\nCannot read /etc/fstab");
 
                while ((m = getmntent(f)) != NULL) {
                        if (all == FALSE && directory == NULL && (
@@ -487,7 +486,7 @@ singlemount:
                                rc = nfsmount (device, directory, &flags,
                                        &extra_opts, &string_flags, 1);
                                if ( rc != 0) {
-                                       error_msg_and_die("nfsmount failed: %s\n", strerror(errno));    
+                                       perror_msg_and_die("nfsmount failed");  
                                        rc = EXIT_FAILURE;
                                }
                        }