Update.

	* locale/programs/localedef.c (construct_output_path): If path
	contains a / compute the end of the directory name correctly.

diff --git a/ChangeLog b/ChangeLog
index 70d4a9d8ea3cf7c3854a9a10fba7852bc4f3d136..7766f1015971e6c0d3c00cc1b0987976caf75e44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * locale/programs/localedef.c (construct_output_path): If path
+       contains a / compute the end of the directory name correctly.
+
        * include/features.h: Undef and document __USE_XOPEN2K.
 
        * malloc/mcheck.c: Implement pedantic checking of all allocated blocks

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 9def7a38adf52cc6d0e419a5d0ded65cd73a4784..e129c0c241f851706647857921a2a67818c017b4 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -367,7 +367,7 @@ construct_output_path (char *path)
         memory allocation.  */
       size_t len = strlen (path) + 1;
       result = xmalloc (len + 1);
-      endp = mempcpy (result, path, len);
+      endp = mempcpy (result, path, len) - 1;
     }
 
   errno = 0;

diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index 42e8e71174fb74ed84749ab072645acd4160a50c..0d32fc17f763836b9470e70a9824b10c3573f25c 100644 (file)
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -111,12 +111,18 @@ check_all ()
      with.  */
   struct hdr *runp = root;
 
+  /* Temporarily turn off the checks.  */
+  pedantic = 0;
+
   while (runp != NULL)
     {
       (void) checkhdr (runp);
 
       runp = runp->next;
     }
+
+  /* Turn checks on again.  */
+  pedantic = 1;
 }
 
 static void unlink_blk __P ((struct hdr *ptr));

diff --git a/malloc/mcheck.h b/malloc/mcheck.h
index 9460547d08f86cea38c5c45ad86d4dfc5977a7d3..2b8bbb2cbf9c1602fcb612a3d489b7e0cbf7a426 100644 (file)
--- a/malloc/mcheck.h
+++ b/malloc/mcheck.h
@@ -45,9 +45,6 @@ extern int mcheck (void (*__abortfunc) (enum mcheck_status)) __THROW;
    the memory handling functions is called.  This can be very slow.  */
 extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status)) __THROW;
 
-/* Similar to `mcheck', but perform tests on all blocks every time.  */
-extern int mcheck_verbose (void (*func) __P ((enum mcheck_status)));
-
 /* Check for aberrations in a particular malloc'd block.  You must have
    called `mcheck' already.  These are the same checks that `mcheck' does
    when you free or reallocate a block.  */