From feddbc59e6c62afbc105c93e6f7509a83a1c9144 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 9 May 2011 21:01:24 +0200
Subject: [PATCH 1/1] efun.3: evasprintf() wasn't brought in and easprintf()
 was missing docs.

---
 Makefile_upgrade.inc |  2 ++
 lib/libutil/Makefile |  2 +-
 lib/libutil/efun.3   | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 11e4684d7d..5db994464c 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1642,6 +1642,8 @@ TO_REMOVE+=/usr/include/gnuregex.h
 TO_REMOVE+=/usr/lib/libgnuregex.a
 TO_REMOVE+=/usr/lib/profile/libgnuregex.a
 TO_REMOVE+=/usr/share/info/regex.info.gz
+TO_REMOVE+=/usr/share/man/cat3/evasprintf.3.gz
+TO_REMOVE+=/usr/share/man/man3/evasprintf.3.gz
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/sgsc
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 64f1792262..5594aefaea 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -30,7 +30,7 @@ MAN+=	login.conf.5 auth.conf.5
 MLINKS+=auth.3 auth_getval.3
 MLINKS+=efun.3 ecalloc.3 efun.3 emalloc.3 efun.3 erealloc.3 efun.3 esetfun.3 \
 	efun.3 estrdup.3 efun.3 estrlcat.3 efun.3 estrlcpy.3 \
-	efun.3 estrndup.3 efun.3 evasprintf.3
+	efun.3 estrndup.3 efun.3 easprintf.3
 MLINKS+=humanize_number.3 dehumanize_number.3
 MLINKS+=humanize_unsigned.3 format_bytes.3
 MLINKS+=login_cap.3 login_getclassbyname.3 login_cap.3 login_close.3 \
diff --git a/lib/libutil/efun.3 b/lib/libutil/efun.3
index dbfe2bf864..89429d49c3 100644
--- a/lib/libutil/efun.3
+++ b/lib/libutil/efun.3
@@ -39,7 +39,7 @@
 .Nm estrndup ,
 .Nm estrlcat ,
 .Nm estrlcpy ,
-.Nm evasprintf
+.Nm easprintf
 .Nd error-checked utility functions
 .Sh LIBRARY
 .Lb libutil
@@ -62,7 +62,7 @@
 .Ft size_t
 .Fn estrlcpy "char *dst" "const char *src" "size_t len"
 .Ft int
-.Fn evasprintf "char ** restrict str" "const char * restrict fmt" "..."
+.Fn easprintf "char ** restrict str" "const char * restrict fmt" "..."
 .Sh DESCRIPTION
 The
 .Fn ecalloc ,
@@ -73,7 +73,7 @@ The
 .Fn estrlcat ,
 .Fn estrlcpy ,
 and
-.Fn evasprintf
+.Fn easprintf
 functions
 operate exactly as the corresponding functions that do not start with an
 .Sq e
@@ -105,8 +105,8 @@ error handler will just call
 .Xr strdup 3 ,
 .Xr strlcat 3 ,
 .Xr strlcpy 3 ,
-.Xr strndup 3 ,
-.Xr vasprintf 3
+.Xr strndup 3
+.\".Xr vasprintf 3
 .Sh HISTORY
 The error functions first appeared in
 .Dx 2.11 .
-- 
2.41.0