summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-01-16 05:48:03 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-01-16 05:48:03 +0000
commit049cc20ca62c90da9aa948aaba0efa0bf0e048ef (patch)
treed42b42ef606cf998658b89200cdfe54f144b1aac
parentea55c1cfe7c4d513ff99be7482a5a643d1ec3270 (diff)
Correct logic such that newfs w/o -t on a device w/o a label
defaults to ffs like people expect.
-rw-r--r--sbin/newfs/newfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 81b2332ce0e..415064a9618 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs.c,v 1.10 1997/01/15 23:41:31 millert Exp $ */
+/* $OpenBSD: newfs.c,v 1.11 1997/01/16 05:48:02 millert Exp $ */
/* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94";
#else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.10 1997/01/15 23:41:31 millert Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.11 1997/01/16 05:48:02 millert Exp $";
#endif
#endif /* not lint */
@@ -354,7 +354,7 @@ main(argc, argv)
if (fstype == NULL)
fstype = readlabelfs(special, 0);
- if (fstype == NULL || strcmp(fstype, "ffs")) {
+ if (fstype != NULL && strcmp(fstype, "ffs")) {
snprintf(name, sizeof name, "newfs_%s", fstype);
saveargv[0] = name;
snprintf(execname, sizeof execname, "%s/newfs_%s",