- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / openbsd-compat / basename.c

diff --git a/openbsd-compat/basename.c b/openbsd-compat/basename.c
index 5171cd64c13921c9e71736965293f643c16a410d..ffa5c898461ef1772948ef97f5d8aa02af79ad61 100644 (file)
--- a/openbsd-compat/basename.c
+++ b/openbsd-compat/basename.c
@@ -1,7 +1,7 @@
-/*     $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
@@ -20,32 +20,33 @@
 
 #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 */
+#include <errno.h>
+#include <string.h>
 
 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 +54,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) */