summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordownsj <downsj@openbsd.org>1996-06-17 08:27:26 +0000
committerdownsj <downsj@openbsd.org>1996-06-17 08:27:26 +0000
commite001f3cede1cb33b4a86b8f06926a246f7ea6713 (patch)
tree93efad790192ac0fc305626c1acae02fdfc96866
parentopendev.3: opendev(3) man page (diff)
downloadwireguard-openbsd-e001f3cede1cb33b4a86b8f06926a246f7ea6713.tar.xz
wireguard-openbsd-e001f3cede1cb33b4a86b8f06926a246f7ea6713.zip
Switched to generic opendev(3)
-rw-r--r--sbin/fdisk/Makefile3
-rw-r--r--sbin/fdisk/fdisk.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 4f9961cc10a..7e3b33fb73a 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,7 +1,10 @@
+# $OpenBSD: Makefile,v 1.2 1996/06/17 08:27:26 downsj Exp $
# $NetBSD: Makefile,v 1.4 1995/03/18 14:55:33 cgd Exp $
PROG= fdisk
SRCS= fdisk.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
MAN= fdisk.8
.include <bsd.prog.mk>
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index ce378a35eab..46e7b44bec7 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,3 +1,4 @@
+/* $OpenBSD */
/* $NetBSD: fdisk.c,v 1.11 1995/10/04 23:11:19 ghudson Exp $ */
/*
@@ -42,6 +43,7 @@ static char rcsid[] = "$NetBSD: fdisk.c,v 1.11 1995/10/04 23:11:19 ghudson Exp $
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <util.h>
#define LBUF 100
static char lbuf[LBUF];
@@ -595,7 +597,8 @@ open_disk(u_flag)
{
struct stat st;
- if ((fd = open(disk, u_flag ? O_RDWR : O_RDONLY)) == -1) {
+ fd = opendev(disk, (u_flag ? O_RDWR : O_RDONLY), OPENDEV_PART, &disk);
+ if (fd == -1) {
warn("%s", disk);
return (-1);
}