2002-02-12 Havoc Pennington <hp@redhat.com>

Author: hp
Date: 2002-02-12 21:30:57 GMT
2002-02-12  Havoc Pennington  <hp@redhat.com>

	* pkg.c (scan_dir): use g_strdup, and fix the location where
	we assign the nul byte, so we don't mangle things for directories
	that end in '/' - reported by Enrico Scholz

diff --git a/ChangeLog b/ChangeLog
index 4da2667e6ec4d358e3627480a2a8bdf6e9af2789..cc40b0f10709c6e77da848737e46e6d998a239df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-12  Havoc Pennington  <hp@redhat.com>
+
+       * pkg.c (scan_dir): use g_strdup, and fix the location where 
+       we assign the nul byte, so we don't mangle things for directories
+       that end in '/' - reported by Enrico Scholz
+
 2002-02-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: 0.11.0

diff --git a/pkg.c b/pkg.c
index 50450ebb6be2d19d86d80fa68e55b43adcc2ea9d..c3f6e7272f89c997ad20239a2e7673f6e84e0e99 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -101,12 +101,12 @@ scan_dir (const char *dirname)
   /* Use a copy of dirname cause Win32 opendir doesn't like
    * superfluous trailing (back)slashes in the directory name.
    */
-  char *dirname_copy = strdup (dirname);
+  char *dirname_copy = g_strdup (dirname);
 
   if (dirnamelen > 1 && dirname[dirnamelen-1] == G_DIR_SEPARATOR)
     {
       dirnamelen--;
-      dirname_copy[dirnamelen-1] = '\0';
+      dirname_copy[dirnamelen] = '\0';
     }
 
   dir = opendir (dirname_copy);