diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2000-04-20 08:00:29 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-04-20 08:00:29 +0000 |
| commit | 43c6c959b9a37713218e8a53ebd6792640005889 (patch) | |
| tree | 3a1079c57d56a81a282d18fb7b005ff0d4b278d7 | |
| parent | 7eaef3ae4b180b849d559bc14c1a4a37591cfc87 (diff) | |
Notes
| -rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 12 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 8715538f62e5..b795e2917920 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -133,13 +133,14 @@ enum { UNSPEC, EDIT, NOWRITE, READ, RESTORE, WRITE, WRITEABLE, WRITEBOOT } op = UNSPEC; +int mflag; int rflag; #ifdef DEBUG int debug; -#define OPTIONS "BNRWb:ders:w" +#define OPTIONS "BNRWb:demrs:w" #else -#define OPTIONS "BNRWb:ers:w" +#define OPTIONS "BNRWb:emrs:w" #endif int @@ -187,6 +188,9 @@ main(argc, argv) usage(); op = EDIT; break; + case 'm': + ++mflag; + break; case 'r': ++rflag; break; @@ -232,7 +236,7 @@ main(argc, argv) specname = dkname; f = open(specname, op == READ ? O_RDONLY : O_RDWR); if (f < 0 && errno == ENOENT && dkname[0] != '/') { - (void)sprintf(specname, "%sr%s", _PATH_DEV, dkname); + (void)sprintf(specname, "%s%s", _PATH_DEV, dkname); np = namebuf + strlen(specname) + 1; f = open(specname, op == READ ? O_RDONLY : O_RDWR); } @@ -1342,7 +1346,7 @@ getvirginlabel(void) warnx("\"auto\" requires the usage of a canonical disk name"); return (NULL); } - (void)snprintf(namebuf, BBSIZE, "%sr%s", _PATH_DEV, dkname); + (void)snprintf(namebuf, BBSIZE, "%s%s", _PATH_DEV, dkname); if ((f = open(namebuf, O_RDONLY)) == -1) { warn("cannot open %s", namebuf); return (NULL); diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 8715538f62e5..b795e2917920 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -133,13 +133,14 @@ enum { UNSPEC, EDIT, NOWRITE, READ, RESTORE, WRITE, WRITEABLE, WRITEBOOT } op = UNSPEC; +int mflag; int rflag; #ifdef DEBUG int debug; -#define OPTIONS "BNRWb:ders:w" +#define OPTIONS "BNRWb:demrs:w" #else -#define OPTIONS "BNRWb:ers:w" +#define OPTIONS "BNRWb:emrs:w" #endif int @@ -187,6 +188,9 @@ main(argc, argv) usage(); op = EDIT; break; + case 'm': + ++mflag; + break; case 'r': ++rflag; break; @@ -232,7 +236,7 @@ main(argc, argv) specname = dkname; f = open(specname, op == READ ? O_RDONLY : O_RDWR); if (f < 0 && errno == ENOENT && dkname[0] != '/') { - (void)sprintf(specname, "%sr%s", _PATH_DEV, dkname); + (void)sprintf(specname, "%s%s", _PATH_DEV, dkname); np = namebuf + strlen(specname) + 1; f = open(specname, op == READ ? O_RDONLY : O_RDWR); } @@ -1342,7 +1346,7 @@ getvirginlabel(void) warnx("\"auto\" requires the usage of a canonical disk name"); return (NULL); } - (void)snprintf(namebuf, BBSIZE, "%sr%s", _PATH_DEV, dkname); + (void)snprintf(namebuf, BBSIZE, "%s%s", _PATH_DEV, dkname); if ((f = open(namebuf, O_RDONLY)) == -1) { warn("cannot open %s", namebuf); return (NULL); |