diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-10 08:03:21 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-10 08:03:21 +0000 |
| commit | 266775d746eea5e1b96a79f9924b8c4c7eabb4cb (patch) | |
| tree | 2c62dc2726b7b0f1d068c417d9031e8c81b960f3 | |
| parent | d1521f166761e0c20064b85a64008fab59cd4a5d (diff) | |
| download | FreeBSD-src-266775d746eea5e1b96a79f9924b8c4c7eabb4cb.zip FreeBSD-src-266775d746eea5e1b96a79f9924b8c4c7eabb4cb.tar.gz | |
Make sure that mountpoints start with a /.
| -rw-r--r-- | release/sysinstall/disks.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sade/disks.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/disks.c | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 77337ba..729bb80 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.12 1995/05/08 10:20:49 jkh Exp $ + * $Id: disks.c,v 1.13 1995/05/08 18:41:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -218,7 +218,11 @@ get_mountpoint(struct chunk *c) "Please specify a mount point for the partition"); if (val) { if (check_conflict(val)) { - msgConfirm("You already have a mountpoint for %s assigned!", val); + msgConfirm("You already have a mount point for %s assigned!", val); + return NULL; + } + else if (*val != '/') { + msgConfirm("Mount point must start with a / character"); return NULL; } else if (!strcmp(val, "/")) { diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 77337ba..729bb80 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.12 1995/05/08 10:20:49 jkh Exp $ + * $Id: disks.c,v 1.13 1995/05/08 18:41:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -218,7 +218,11 @@ get_mountpoint(struct chunk *c) "Please specify a mount point for the partition"); if (val) { if (check_conflict(val)) { - msgConfirm("You already have a mountpoint for %s assigned!", val); + msgConfirm("You already have a mount point for %s assigned!", val); + return NULL; + } + else if (*val != '/') { + msgConfirm("Mount point must start with a / character"); return NULL; } else if (!strcmp(val, "/")) { diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 77337ba..729bb80 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.12 1995/05/08 10:20:49 jkh Exp $ + * $Id: disks.c,v 1.13 1995/05/08 18:41:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -218,7 +218,11 @@ get_mountpoint(struct chunk *c) "Please specify a mount point for the partition"); if (val) { if (check_conflict(val)) { - msgConfirm("You already have a mountpoint for %s assigned!", val); + msgConfirm("You already have a mount point for %s assigned!", val); + return NULL; + } + else if (*val != '/') { + msgConfirm("Mount point must start with a / character"); return NULL; } else if (!strcmp(val, "/")) { |
