diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-12-02 11:01:43 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-12-02 11:01:43 +0000 |
| commit | 32c45b7219d894b5578a75ab0239122f432785fe (patch) | |
| tree | 363b3514a8e11ab36113e0737546488e4630c5f8 | |
| parent | e210ca89ca9825a10a94e170244360c2670d9c97 (diff) | |
Notes
| -rw-r--r-- | usr.sbin/diskpart/diskpart.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/diskpart/diskpart.c b/usr.sbin/diskpart/diskpart.c index 932b76a1fdaa..5cc71666c95c 100644 --- a/usr.sbin/diskpart/diskpart.c +++ b/usr.sbin/diskpart/diskpart.c @@ -358,9 +358,9 @@ struct disklabel * promptfordisk(name) char *name; { - register struct disklabel *dp = &disk; - register struct field *fp; - register i; + struct disklabel *dp = &disk; + struct field *fp; + int i, len; char buf[BUFSIZ], **tp, *cp; strncpy(dp->d_typename, name, sizeof(dp->d_typename)); @@ -376,8 +376,7 @@ promptfordisk(name) if (buf[0] == 0) dp->d_type = 1; else { - int len = strlen(buf); - + len = strlen(buf); if (buf[len - 1] == '\n') buf[len - 1] = '\0'; dp->d_type = gettype(buf, dktypenames); @@ -394,6 +393,9 @@ gettype: dp->d_flags = 0; fprintf(stderr, "type (winchester|removable|simulated)? "); (void) fgets(buf, BUFSIZ, stdin); + len = strlen(buf); + if (buf[len - 1] == '\n') + buf[len - 1] = '\0'; if (strcmp(buf, "removable") == 0) dp->d_flags = D_REMOVABLE; else if (strcmp(buf, "simulated") == 0) |