Update.

2001-03-20  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/pathconf.c (__pathconf): Return
	LINUX_LINK_MAX only if the statfs function is not implemented for
	the filesystem.

	* sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Return
	LINUX_LINK_MAX only if the fstatfs function is not implemented for
	the filesystem.

diff --git a/ChangeLog b/ChangeLog
index ae7e9b3..86d9a67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-20  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/pathconf.c (__pathconf): Return
+       LINUX_LINK_MAX only if the statfs function is not implemented for
+       the filesystem.
+
+       * sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Return
+       LINUX_LINK_MAX only if the fstatfs function is not implemented for
+       the filesystem.
+
 2001-03-19  Ulrich Drepper  <drepper@redhat.com>
 
        * elf/dl-dst.h (DL_DST_COUNT): Add __builtin_expect.

diff --git a/sysdeps/unix/sysv/linux/fpathconf.c b/sysdeps/unix/sysv/linux/fpathconf.c
index c56fdc6..326a43d 100644 (file)
--- a/sysdeps/unix/sysv/linux/fpathconf.c
+++ b/sysdeps/unix/sysv/linux/fpathconf.c
@@ -1,5 +1,5 @@
 /* Linux specific extensions to fpathconf.
-   Copyright (C) 1991, 95, 96, 98, 99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991,95,96,98,99,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,6 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
 #include <unistd.h>
 #include <limits.h>
 #include <sys/statfs.h>
@@ -42,8 +43,14 @@ __fpathconf (fd, name)
 
       /* Determine the filesystem type.  */
       if (__fstatfs (fd, &fsbuf) < 0)
-       /* not possible, return the default value.  */
-       return LINUX_LINK_MAX;
+       {
+         if (errno == ENOSYS)
+           /* not possible, return the default value.  */
+           return LINUX_LINK_MAX;
+
+         /* Some error occured.  */
+          return -1;
+       }
 
       switch (fsbuf.f_type)
        {

diff --git a/sysdeps/unix/sysv/linux/pathconf.c b/sysdeps/unix/sysv/linux/pathconf.c
index 6e7cdab..5bd408f 100644 (file)
--- a/sysdeps/unix/sysv/linux/pathconf.c
+++ b/sysdeps/unix/sysv/linux/pathconf.c
@@ -1,5 +1,5 @@
 /* Linux specific extensions to pathconf.
-   Copyright (C) 1991, 95, 96, 98, 99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991,95,96,98,99,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,6 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
 #include <unistd.h>
 #include <limits.h>
 #include <sys/statfs.h>
@@ -42,8 +43,14 @@ __pathconf (path, name)
 
       /* Determine the filesystem type.  */
       if (__statfs (path, &fsbuf) < 0)
-       /* not possible, return the default value.  */
-       return LINUX_LINK_MAX;
+       {
+         if (errno == ENOSYS)
+           /* not possible, return the default value.  */
+           return LINUX_LINK_MAX;
+
+         /* Some error occured.  */
+          return -1;
+       }
 
       switch (fsbuf.f_type)
        {