From fd9d083e20319ea85ec64f2d144d9e7427d893b6 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 30 Aug 2019 03:57:56 +0000
Subject: [PATCH] uucplock(3) is incorrectly named in some places, it is
 actually uu_lock(3) (more unclear is if anything in ports uses this, as our
 base no longer does)

---
 src/lib/libutil/Makefile                  | 4 ++--
 src/lib/libutil/util.h                    | 4 ++--
 src/lib/libutil/{uucplock.3 => uu_lock.3} | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename src/lib/libutil/{uucplock.3 => uu_lock.3} (98%)

diff --git a/src/lib/libutil/Makefile b/src/lib/libutil/Makefile
index 75174364..24439544 100644
--- a/src/lib/libutil/Makefile
+++ b/src/lib/libutil/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.42 2019/05/15 03:11:52 rob Exp $
+#	$OpenBSD: Makefile,v 1.43 2019/08/30 03:57:56 deraadt Exp $
 #	$NetBSD: Makefile,v 1.8 1996/05/16 07:03:28 thorpej Exp $
 
 LIB=	util
@@ -17,7 +17,7 @@ MAN=	bcrypt_pbkdf.3 ber_add_string.3 ber_get_string.3 ber_oid_cmp.3 \
 	check_expire.3 getmaxpartitions.3 \
 	getrawpartition.3 \
 	isduid.3 login.3 \
-	opendev.3 openpty.3 pw_init.3 pw_lock.3 readlabelfs.3 uucplock.3 \
+	opendev.3 openpty.3 pw_init.3 pw_lock.3 readlabelfs.3 uu_lock.3 \
 	fparseln.3 opendisk.3 login_fbtab.3 pidfile.3 fmt_scaled.3 imsg_init.3 \
 	pkcs5_pbkdf2.3
 
diff --git a/src/lib/libutil/util.h b/src/lib/libutil/util.h
index 15bf32db..d7aa8fae 100644
--- a/src/lib/libutil/util.h
+++ b/src/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.35 2017/04/20 17:48:30 nicm Exp $	*/
+/*	$OpenBSD: util.h,v 1.36 2019/08/30 03:57:56 deraadt Exp $	*/
 /*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
 
 /*-
@@ -52,7 +52,7 @@
 #define OPENDEV_BLCK	0x04		/* Open block, not character device. */
 
 /*
- * uucplock(3) specific flags.
+ * uu_lock(3) specific flags.
  */
 #define UU_LOCK_INUSE (1)
 #define UU_LOCK_OK (0)
diff --git a/src/lib/libutil/uucplock.3 b/src/lib/libutil/uu_lock.3
similarity index 98%
rename from src/lib/libutil/uucplock.3
rename to src/lib/libutil/uu_lock.3
index b94f61ca..d729d744 100644
--- a/src/lib/libutil/uucplock.3
+++ b/src/lib/libutil/uu_lock.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uucplock.3,v 1.19 2015/11/10 23:48:18 jmc Exp $
+.\" $OpenBSD: uu_lock.3,v 1.1 2019/08/30 03:57:56 deraadt Exp $
 .\"
 .\" All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" "
-.Dd $Mdocdate: November 10 2015 $
+.Dd $Mdocdate: August 30 2019 $
 .Dt UU_LOCK 3
 .Os
 .Sh NAME