Merge 4.3p2 to the trunk.

1 files changed, 20 insertions, 19 deletions

diff --git a/openbsd-compat/basename.c b/openbsd-compat/basename.c
index 552dc1e1c..ad040e139 100644
--- a/openbsd-compat/basename.c
+++ b/openbsd-compat/basename.c
@@ -1,9 +1,7 @@
-/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
-
-/*      $OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $   */
+/*      $OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $     */
 
 /*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,34 +16,35 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/gen/basename.c */
+
 #include "includes.h"
 #ifndef HAVE_BASENAME
 
-#ifndef lint
-static char rcsid[] = "$OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $";
-#endif /* not lint */
-
 char *
 basename(const char *path)
 {
         static char bname[MAXPATHLEN];
-        register const char *endp, *startp;
+        size_t len;
+        const char *endp, *startp;
 
         /* Empty or NULL string gets treated as "." */
         if (path == NULL || *path == '\0') {
-                (void)strlcpy(bname, ".", sizeof bname);
-                return(bname);
+                bname[0] = '.';
+                bname[1] = '\0';
+                return (bname);
         }
 
-        /* Strip trailing slashes */
+        /* Strip any trailing slashes */
         endp = path + strlen(path) - 1;
         while (endp > path && *endp == '/')
                 endp--;
 
-        /* All slashes become "/" */
+        /* All slashes becomes "/" */
         if (endp == path && *endp == '/') {
-                (void)strlcpy(bname, "/", sizeof bname);
-                return(bname);
+                bname[0] = '/';
+                bname[1] = '\0';
+                return (bname);
         }
 
         /* Find the start of the base */
@@ -53,12 +52,14 @@ basename(const char *path)
         while (startp > path && *(startp - 1) != '/')
                 startp--;
 
-        if (endp - startp + 2 > sizeof(bname)) {
+        len = endp - startp + 1;
+        if (len >= sizeof(bname)) {
                 errno = ENAMETOOLONG;
-                return(NULL);
+                return (NULL);
         }
-        strlcpy(bname, startp, endp - startp + 2);
-        return(bname);
+        memcpy(bname, startp, len);
+        bname[len] = '\0';
+        return (bname);
 }
 
 #endif /* !defined(HAVE_BASENAME) */