sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mount: don't always autodetect

Browse source
This commit is contained in:
David van Moolenbroek 2010-08-03 13:46:00 +00:00
parent 42bbd56673
commit 256c37f7fa
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
commands/mount/mount.c
View file

@ -26,7 +26,7 @@ int main(argc, argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
int i, n, v, mountflags; int i, n, v = 0, mountflags;
char **ap, *vs, *opt, *err, *type, *args, *device; char **ap, *vs, *opt, *err, *type, *args, *device;
char special[PATH_MAX+1], mounted_on[PATH_MAX+1], version[10], rw_flag[10]; char special[PATH_MAX+1], mounted_on[PATH_MAX+1], version[10], rw_flag[10];
@ -61,13 +61,13 @@ char *argv[];
device = argv[1]; device = argv[1];
if (!strcmp(device, "none")) device = NULL; if (!strcmp(device, "none")) device = NULL;
/* auto-detect type */ if ((type == NULL || !strcmp(type, MINIX_FS_TYPE)) && device != NULL) {
v = fsversion(argv[1], "mount"); /* auto-detect type and/or version */
if (type == NULL) { v = fsversion(device, "mount");
switch (v) { switch (v) {
case FSVERSION_MFS1: case FSVERSION_MFS1:
case FSVERSION_MFS2: case FSVERSION_MFS2:
case FSVERSION_MFS3: type = "mfs"; break; case FSVERSION_MFS3: type = MINIX_FS_TYPE; break;
case FSVERSION_EXT2: type = "ext2"; break; case FSVERSION_EXT2: type = "ext2"; break;
} }
} }
@ -98,7 +98,7 @@ char *argv[];
} }
} }
/* For MFS, use a version number. Otherwise, use the FS type name. */ /* For MFS, use a version number. Otherwise, use the FS type name. */
if (type == NULL || !strcmp(type, MINIX_FS_TYPE)) { if (!strcmp(type, MINIX_FS_TYPE)) {
switch (v) { switch (v) {
case FSVERSION_MFS1: vs = "1"; break; case FSVERSION_MFS1: vs = "1"; break;
case FSVERSION_MFS2: vs = "2"; break; case FSVERSION_MFS2: vs = "2"; break;