diff --git a/ChangeLog b/ChangeLog
index e34f11625b..7d7be3968d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-15  H.J. Lu  <hjl@gnu.org>
+
+	* sysdeps/posix/tempname.c (__path_search): Fix the maximum
+	string length.
+
 1998-12-15  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/msgctl.c: Use INLINE_SYSCALL.
diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
index a89a73721f..7437a8a420 100644
--- a/sysdeps/posix/tempname.c
+++ b/sysdeps/posix/tempname.c
@@ -95,7 +95,7 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
       return -1;
     }
 
-  sprintf (tmpl, "%*s/%*sXXXXXX", dlen, dir, plen, pfx);
+  sprintf (tmpl, "%.*s/%.*sXXXXXX", dlen, dir, plen, pfx);
   return 0;
 }