summaryrefslogtreecommitdiff
path: root/mtab.c
diff options
context:
space:
mode:
authorErik Andersen2000-02-08 19:58:47 +0000
committerErik Andersen2000-02-08 19:58:47 +0000
commite49d5ecbbe51718fa925b6890a735e5937cc2aa2 (patch)
treec90bda10731ad9333ce3b404f993354c9fc104b8 /mtab.c
parentc0bf817bbc5c7867fbe8fb76d5c39f8ee802692f (diff)
downloadbusybox-e49d5ecbbe51718fa925b6890a735e5937cc2aa2.zip
busybox-e49d5ecbbe51718fa925b6890a735e5937cc2aa2.tar.gz
Some formatting updates (ran the code through indent)
-Erik
Diffstat (limited to 'mtab.c')
-rw-r--r--mtab.c98
1 files changed, 49 insertions, 49 deletions
diff --git a/mtab.c b/mtab.c
index 41d8818..27489cf 100644
--- a/mtab.c
+++ b/mtab.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
#include "internal.h"
#include <stdlib.h>
#include <unistd.h>
@@ -8,29 +9,29 @@
#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 */
-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;
/* Check if reading the mtab file failed */
- if ( mountTable == 0
+ if (mountTable == 0
#if ! defined BB_FEATURE_USE_PROCFS
- ) {
-#else
- /* Bummer. fall back on trying the /proc filesystem */
- && (mountTable = setmntent("/proc/mounts", "r")) == 0 ) {
+ ) {
+#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 ) {
+ 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);
@@ -40,64 +41,63 @@ void erase_mtab(const char * name)
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;
- if ( result )
+ for (i = 0; i < count; i++) {
+ int result = (strcmp(entries[i].mnt_fsname, name) == 0
+ || strcmp(entries[i].mnt_dir, name) == 0);
+
+ if (result)
continue;
else
addmntent(mountTable, &entries[i]);
}
endmntent(mountTable);
- }
- else if ( errno != EROFS )
+ } else if (errno != EROFS)
perror(mtab_file);
}
-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';
#ifdef BB_FEATURE_USE_PROCFS
- if ( filesystemType == 0 ) {
- struct mntent *p = findMountPoint(blockDevice, "/proc/mounts");
+ if (filesystemType == 0) {
+ struct mntent *p = findMountPoint(blockDevice, "/proc/mounts");
- if ( p && p->mnt_type )
- filesystemType = p->mnt_type;
- }
+ 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);
- }
-}
+ 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);
+ }
+}