CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-18 17:39:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge from gnulib.

Browse Source
This commit is contained in:
Paul Eggert
2004-08-07 07:16:54 +00:00
parent a3538ea055
commit a86c457f64
11 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2004-08-07 Paul Eggert <eggert@cs.ucla.edu>
* canonicalize.h, cycle-check.h, stat-macros.h, strdup.h,
strftime.h, xnanosleep.c: Merge from gnulib.
2004-08-05 Paul Eggert <eggert@cs.ucla.edu>
Merge with gnulib and deal with some minor cleanups resulting.
lib/canonicalize.h
+18
View File
@@ -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_
lib/cycle-check.h
+21
View File
@@ -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
lib/stat-macros.h
+1 -1
View File
@@ -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
lib/strdup.h
+1 -1
View File
@@ -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
lib/strftime.h
+3 -1
View File
@@ -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
@@ -16,4 +16,6 @@
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);
lib/xnanosleep.c
+2 -1
View File
@@ -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.
m4/ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2004-08-07 Paul Eggert <eggert@cs.ucla.edu>
* canonicalize.m4, getcwd-path-max.m4, strdup.m4: Merge from gnulib.
2004-08-05 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib.
m4/canonicalize.m4
+20 -1
View File
@@ -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])
m4/getcwd-path-max.m4
+16
View File
@@ -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],
m4/strdup.m4
+5 -8
View File
@@ -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 rest of that program.
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], [:])