From a1a1e584e1365f32f1e3e80def439d3d8844c500 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 30 Oct 2005 23:06:58 +0000 Subject: [PATCH] * m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG): Revamp wording and local variables to suggest the intended function of the PATH_MAX check. Trivial changes to support SCO systems. * m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG): Check for MAXPATHLEN as well as PATH_MAX. * m4/fpending.m4 (gl_FUNC_FPENDING): Correct check for SCO systems, where __ptr is null when no I/O is pending. --- m4/ChangeLog | 13 +++++++++++++ m4/chdir-long.m4 | 18 +++++++++--------- m4/fpending.m4 | 4 ++-- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index e7e7c0cbc..471f2fd87 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,16 @@ +2005-10-30 Paul Eggert + + * chdir-long.m4 (gl_FUNC_CHDIR_LONG): Revamp wording and local + variables to suggest the intended function of the PATH_MAX check. + +2005-10-30 Kean Johnston + + Trivial changes to support SCO systems. + * chdir-long.m4 (gl_FUNC_CHDIR_LONG): Check for MAXPATHLEN as well + as PATH_MAX. + * fpending.m4 (gl_FUNC_FPENDING): Correct check for SCO systems, + where __ptr is null when no I/O is pending. + 2005-10-28 Simon Josefsson * inet_ntop.m4: More tests. diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4 index 0f22e382c..170434924 100644 --- a/m4/chdir-long.m4 +++ b/m4/chdir-long.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 # Use Gnulib's robust chdir function. # It can handle arbitrarily long directory names, which means @@ -16,18 +16,18 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_CHDIR_LONG], [ AC_LIBSOURCES([chdir-long.c, chdir-long.h]) - AC_CACHE_CHECK([whether this system has a definition of PATH_MAX], - gl_have_path_max_definition, - [AC_EGREP_CPP([have_path_max_definition], + AC_CACHE_CHECK([whether this system has an arbitrary file name length limit], + gl_have_arbitrary_file_name_length_limit, + [AC_EGREP_CPP([have_arbitrary_file_name_length_limit], [#include #include -#ifdef PATH_MAX -have_path_max_definition +#if defined PATH_MAX || defined MAXPATHLEN +have_arbitrary_file_name_length_limit #endif], - gl_have_path_max_definition=yes, - gl_have_path_max_definition=no)]) + gl_have_arbitrary_file_name_length_limit=yes, + gl_have_arbitrary_file_name_length_limit=no)]) - if test $gl_have_path_max_definition = yes; then + if test $gl_have_arbitrary_file_name_length_limit = yes; then AC_LIBOBJ([chdir-long]) gl_PREREQ_CHDIR_LONG fi diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 87398b142..f43aaa419 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 # Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_FPENDING], 'fp->_p - fp->_bf._base' \ \ '# SCO, Unixware' \ - 'fp->__ptr - fp->__base' \ + '(fp->__ptr ? fp->__ptr - fp->__base : 0)' \ \ '# old glibc?' \ 'fp->__bufp - fp->__buffer' \ -- 2.11.0