minor-details merge from gnulib

[Paul Eggert]

I installed these gnulib-related changes into coreutils.
This should finish most of the merging for now (I hope!).

2004-08-07  Paul Eggert  <address@hidden>

        * lib/canonicalize.h, lib/cycle-check.h, lib/stat-macros.h,
        lib/strdup.h, lib/strftime.h, lib/xnanosleep.c: Merge from gnulib.
        * m4/canonicalize.m4, m4/getcwd-path-max.m4, m4/strdup.m4:
        Merge from gnulib.

Index: lib/canonicalize.h
===================================================================
RCS file: /home/eggert/coreutils/cu/lib/canonicalize.h,v
retrieving revision 1.3
diff -p -u -r1.3 canonicalize.h
--- lib/canonicalize.h  2 Aug 2004 22:42:37 -0000       1.3
+++ lib/canonicalize.h  7 Aug 2004 02:29:40 -0000
@@ -1,3 +1,21 @@
+/* Return the canonical absolute name of a given file.
+   Copyright (C) 1996-2004 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef CANONICALIZE_H_
 # define CANONICALIZE_H_
 
Index: lib/cycle-check.h
===================================================================
RCS file: /home/eggert/coreutils/cu/lib/cycle-check.h,v
retrieving revision 1.4
diff -p -u -r1.4 cycle-check.h
--- lib/cycle-check.h   28 Jul 2004 00:31:14 -0000      1.4
+++ lib/cycle-check.h   7 Aug 2004 02:29:58 -0000
@@ -1,3 +1,24 @@
+/* help detect directory cycles efficiently
+
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Written by Jim Meyering */
+
 #ifndef CYCLE_CHECK_H
 # define CYCLE_CHECK_H 1
 
Index: lib/stat-macros.h
===================================================================
RCS file: /home/eggert/coreutils/cu/lib/stat-macros.h,v
retrieving revision 1.2
diff -p -u -r1.2 stat-macros.h
--- lib/stat-macros.h   19 Jun 2004 12:23:38 -0000      1.2
+++ lib/stat-macros.h   7 Aug 2004 02:30:33 -0000
@@ -1,6 +1,6 @@
 /* stat-related macros
 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
Index: lib/strdup.h
===================================================================
RCS file: /home/eggert/coreutils/cu/lib/strdup.h,v
retrieving revision 1.1
diff -p -u -r1.1 strdup.h
--- lib/strdup.h        4 Apr 2004 06:39:39 -0000       1.1
+++ lib/strdup.h        7 Aug 2004 02:30:45 -0000
@@ -21,7 +21,7 @@
 /* Get strdup declaration, if available.  */
 #include <string.h>
 
-#if !HAVE_DECL_STRDUP && !defined strdup
+#if defined HAVE_DECL_STRDUP && !HAVE_DECL_STRDUP && !defined strdup
 /* Duplicate S, returning an identical malloc'd string.  */
 extern char *strdup (const char *s);
 #endif
Index: lib/strftime.h
===================================================================
RCS file: /home/eggert/coreutils/cu/lib/strftime.h,v
retrieving revision 1.1
diff -p -u -r1.1 strftime.h
--- lib/strftime.h      15 Dec 2002 21:33:29 -0000      1.1
+++ lib/strftime.h      7 Aug 2004 02:31:00 -0000
@@ -1,6 +1,6 @@
 /* declarations for strftime.c
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,5 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include <time.h>
 
 size_t nstrftime (char *, size_t, char const *, struct tm const *, int, int);
Index: lib/xnanosleep.c
===================================================================
RCS file: /home/eggert/coreutils/cu/lib/xnanosleep.c,v
retrieving revision 1.9
diff -p -u -r1.9 xnanosleep.c
--- lib/xnanosleep.c    2 Aug 2004 23:00:15 -0000       1.9
+++ lib/xnanosleep.c    7 Aug 2004 02:50:02 -0000
@@ -22,6 +22,8 @@
 # include <config.h>
 #endif
 
+#include "xnanosleep.h"
+
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -44,7 +46,6 @@
 
 #include "timespec.h"
 #include "xalloc.h"
-#include "xnanosleep.h"
 
 /* Subtract the `struct timespec' values X and Y by computing X - Y.
    If the difference is negative or zero, return false.
Index: m4/canonicalize.m4
===================================================================
RCS file: /home/eggert/coreutils/cu/m4/canonicalize.m4,v
retrieving revision 1.3
diff -p -u -r1.3 canonicalize.m4
--- m4/canonicalize.m4  6 Jul 2004 16:17:10 -0000       1.3
+++ m4/canonicalize.m4  7 Aug 2004 02:50:08 -0000
@@ -1,4 +1,23 @@
-#serial 2
+#serial 3
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# Written by Jim Meyering.
+
 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
     AC_REQUIRE([AC_HEADER_STDC])
Index: m4/getcwd-path-max.m4
===================================================================
RCS file: /home/eggert/coreutils/cu/m4/getcwd-path-max.m4,v
retrieving revision 1.11
diff -p -u -r1.11 getcwd-path-max.m4
--- m4/getcwd-path-max.m4       17 Jun 2004 06:46:33 -0000      1.11
+++ m4/getcwd-path-max.m4       7 Aug 2004 02:50:32 -0000
@@ -7,6 +7,22 @@
 # I've heard that this is due to a Linux kernel bug, and that it has
 # been fixed between 2.4.21-pre3 and 2.4.21-pre4.  */
 
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 # From Jim Meyering
 
 AC_DEFUN([GL_FUNC_GETCWD_PATH_MAX],
Index: m4/strdup.m4
===================================================================
RCS file: /home/eggert/coreutils/cu/m4/strdup.m4,v
retrieving revision 1.3
diff -p -u -r1.3 strdup.m4
--- m4/strdup.m4        4 Apr 2004 06:53:20 -0000       1.3
+++ m4/strdup.m4        7 Aug 2004 02:50:56 -0000
@@ -1,4 +1,4 @@
-# strdup.m4 serial 3
+# strdup.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -9,12 +9,9 @@ dnl the same distribution terms as the r
 AC_DEFUN([gl_FUNC_STRDUP],
 [
   AC_REPLACE_FUNCS(strdup)
-  if test $ac_cv_func_strdup = no; then
-    gl_PREREQ_STRDUP
-  fi
+  AC_CHECK_DECLS_ONCE(strdup)
+  gl_PREREQ_STRDUP
 ])
 
-# Prerequisites of lib/strdup.h and lib/strdup.c.
-AC_DEFUN([gl_PREREQ_STRDUP], [
-  AC_CHECK_DECLS(strdup)
-])
+# Prerequisites of lib/strdup.c.
+AC_DEFUN([gl_PREREQ_STRDUP], [:])