--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2004-08-05  Paul Eggert  <eggert@cs.ucla.edu>
 
-	* modules/c-strtod, modules/c-strtold, modules/cycle-check: New
-	files.
+	Merge from coreutils.
+	* modules/c-strtod, modules/c-strtold, modules/canonicalize,
+	modules/cycle-check, modules/fcntl-safer, modules/getcwd: New files.
+	* modules/path-concat: Don't depend on strdup.
 
 2004-08-03  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -28,7 +30,7 @@
 	* MODULES.html.sh (func_all_modules): Add calloc, to match
 	2004-06-01 addition of calloc module.
 
-2004-06-22  Gary V. Vaughan  <gary@gnu.org>  
+2004-06-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* modules/argz: New file.
 	* MODULES.html.sh (func_all_modules): Add argz.

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,20 +1,49 @@
 2004-08-05  Paul Eggert  <eggert@cs.ucla.edu>
-o
+
 	Merge from coreutils.
 
 	* .gdb-history: Remove; this doesn't belong here.
 
 	* c-strtod.c, c-strtod.h, c-strtold.c, cycle-check.c,
-	cycle-check.h, dev-ino.h: New files.
+	cycle-check.h, dev-ino.h, canonicalize.h, canonicalize.c,
+	fcntl-safer.h, fcntl-safer.c, getcwd.c: New files.
+
+	* dirname.h: Include <stdbool.h>.
+	(FILE_SYSTEM_PREFIX_LEN): Renamed from FILESYSTEM_PREFIX_LEN,
+	for consistency with POSIX terminology.  All uses changed.
+	(IS_ABSOLUTE_FILE_NAME, IS_RELATIVE_FILE_NAME): New macros.
+	(strip_trailing_slashes): Use bool for booleans.
+	* stripslash.c (strip_trailing_slashes): Likewise.
 
 	* error.c: Work around bug in OpenBSD 3.4 sterror_r: it
 	sometimes returns a positive errno value even when it succeeds.
 	(print_errno_message) [!LIBC]: Fall back on strerror if
 	__strerror_r fails.
 
+	* path-concat.c (mempcpy): Don't define if a system header defines it.
+	Don't include stdio.h, stdlib.h, unistd.h, strdup.h.
+	(longest_relative_suffix): New function.
+	(path_concat): Use it.  Assume first argument is not NULL.
+	Port to DOS.  Omit redundant separators.
+	Report an error instead of returning NULL.
+	Use mempcpy instead of memcpy.
+	(xpath_concat): Remove: not declared or used.
+
+	* same.h: Include <stdbool.h>
+	(same_name): Return bool, not int.
+	* same.c (same_name): Likewise.
+	(errno): Don't declare; we assume C89 or better now.
+
+	* stat-macros (S_ISCTG, S_ISOFD, S_ISOFL): New macros,
+	if not already defined.
+
+	* xgetcwd.c (errno): Don't declare; we assume C89 or better now.
+	* dup-safer.c (errno): Likewise.
+
 2004-08-03  Paul Eggert  <eggert@cs.ucla.edu>
 
-	* fatal.c, fatal.h: Remove as the "fatal" module wasn't used or working.
+	* fatal.c, fatal.h: Remove as the "fatal" module wasn't used or
+	working.
 
 2004-07-16  Simon Josefsson  <jas@extundo.com>
 

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,6 +1,21 @@
 2004-08-05  Paul Eggert  <eggert@cs.ucla.edu>
 
-	* c-strtod.m4: New file.
+	Merge from coreutils.
+
+	* c-strtod.m4, canonicalize.m4, fcntl-safer.m4, getcwd-path-max.m4:
+	New files.
+
+	* dos.m4 (gl_AC_DOS): filesystem -> file system renaming.
+	FILESYSTEM_PREFIX_LEN ->
+	FILE_SYSTEM_PREFIX_LEN.
+	FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX ->
+	FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX.
+	FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR ->
+	FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR.
+
+	* path-concat.m4 (gl_PATH_CONCAT): Don't require gl_AC_DOS, the
+	prerequisite modules now handle the DOS stuff.
+	Don't check for unistd.h.
 
 2004-08-03  Paul Eggert  <eggert@cs.ucla.edu>