d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the specification of a mountpoint, and resolve it s disk device

Browse Source 
using the fstab.

Closes  PR bin/129.

Submitted by:	jmg@nike.efn.org (John-Mark Gurney)
This commit is contained in:
Joerg Wunsch 1996-10-25 20:38:40 +00:00
parent 4f6653b930
commit 2f77dcf6ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=19185
4 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/fsck/preen.c
View File

@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)preen.c 8.1 (Berkeley) 6/5/93";
#include <unistd.h>
#include <stdlib.h>
#include <ctype.h>
#include <fstab.h>
#include "fsck.h"
struct part {
@ -292,7 +293,8 @@ blockcheck(name)
{
struct stat stslash, stblock, stchar;
char *raw;
int retried = 0;
struct fstab *fsinfo;
int retried = 0, l;
hotroot = 0;
if (stat("/", &stslash) < 0) {
@ -325,6 +327,19 @@ blockcheck(name)
name = unrawname(name);
retried++;
goto retry;
} else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
l = strlen(name) - 1;
if (l > 0 && name[l] == '/')
/* remove trailing slash */
name[l] = '\0';
if(!(fsinfo=getfsfile(name))) {
printf("Can't resolve %s to character special device",
name);
return (0);
}
name = fsinfo->fs_spec;
retried++;
goto retry;
}
printf("Can't make sense out of name %s\n", name);
return (0);

17
sbin/fsck_ffs/preen.c
View File

@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)preen.c 8.1 (Berkeley) 6/5/93";
#include <unistd.h>
#include <stdlib.h>
#include <ctype.h>
#include <fstab.h>
#include "fsck.h"
struct part {
@ -292,7 +293,8 @@ blockcheck(name)
{
struct stat stslash, stblock, stchar;
char *raw;
int retried = 0;
struct fstab *fsinfo;
int retried = 0, l;
hotroot = 0;
if (stat("/", &stslash) < 0) {
@ -325,6 +327,19 @@ blockcheck(name)
name = unrawname(name);
retried++;
goto retry;
} else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
l = strlen(name) - 1;
if (l > 0 && name[l] == '/')
/* remove trailing slash */
name[l] = '\0';
if(!(fsinfo=getfsfile(name))) {
printf("Can't resolve %s to character special device",
name);
return (0);
}
name = fsinfo->fs_spec;
retried++;
goto retry;
}
printf("Can't make sense out of name %s\n", name);
return (0);

17
sbin/fsck_ifs/preen.c
View File

@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)preen.c 8.1 (Berkeley) 6/5/93";
#include <unistd.h>
#include <stdlib.h>
#include <ctype.h>
#include <fstab.h>
#include "fsck.h"
struct part {
@ -292,7 +293,8 @@ blockcheck(name)
{
struct stat stslash, stblock, stchar;
char *raw;
int retried = 0;
struct fstab *fsinfo;
int retried = 0, l;
hotroot = 0;
if (stat("/", &stslash) < 0) {
@ -325,6 +327,19 @@ blockcheck(name)
name = unrawname(name);
retried++;
goto retry;
} else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
l = strlen(name) - 1;
if (l > 0 && name[l] == '/')
/* remove trailing slash */
name[l] = '\0';
if(!(fsinfo=getfsfile(name))) {
printf("Can't resolve %s to character special device",
name);
return (0);
}
name = fsinfo->fs_spec;
retried++;
goto retry;
}
printf("Can't make sense out of name %s\n", name);
return (0);

17
sbin/quotacheck/preen.c
View File

@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)preen.c 8.1 (Berkeley) 6/5/93";
#include <unistd.h>
#include <stdlib.h>
#include <ctype.h>
#include <fstab.h>
#include "fsck.h"
struct part {
@ -292,7 +293,8 @@ blockcheck(name)
{
struct stat stslash, stblock, stchar;
char *raw;
int retried = 0;
struct fstab *fsinfo;
int retried = 0, l;
hotroot = 0;
if (stat("/", &stslash) < 0) {
@ -325,6 +327,19 @@ blockcheck(name)
name = unrawname(name);
retried++;
goto retry;
} else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
l = strlen(name) - 1;
if (l > 0 && name[l] == '/')
/* remove trailing slash */
name[l] = '\0';
if(!(fsinfo=getfsfile(name))) {
printf("Can't resolve %s to character special device",
name);
return (0);
}
name = fsinfo->fs_spec;
retried++;
goto retry;
}
printf("Can't make sense out of name %s\n", name);
return (0);