From: Jim Meyering <jim@meyering.net>
Date: Sat, 29 Jul 2000 08:10:46 +0000 (+0000)
Subject: (dir_name): Assert that there are no trailing slashes.
X-Git-Tag: TEXTUTILS-2_0g~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3819c2d7cb6b57a05d01381b67e1163e5467ee67;p=thirdparty%2Fcoreutils.git

(dir_name): Assert that there are no trailing slashes.
---

diff --git a/lib/dirname.c b/lib/dirname.c
index acaeba16cd..e6609f1ee8 100644
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -32,6 +32,7 @@ char *malloc ();
 #  define strrchr rindex
 # endif
 #endif
+#include <assert.h>
 
 #ifndef ISSLASH
 # define ISSLASH(C) ((C) == '/')
@@ -52,6 +53,13 @@ dir_name (const char *path)
   int length;			/* Length of result, not including NUL.  */
 
   slash = strrchr (path, '/');
+
+  /* Make sure there are no trailing slashes.  */
+  assert (slash == NULL	   /* There are no slashes in PATH.  */
+	  || slash[1] != 0 /* There is a non-NUL byte after the last slash.  */
+	  || path == slash /* PATH is just `/'.  */
+	  );
+
   if (slash == 0)
     {
       /* File is in the current directory.  */