2002-10-16 Roland McGrath <roland@redhat.com>

	* sysdeps/unix/sysv/linux/fpathconf.c (LINUX_LINK_MAX): Move macro ...
	* sysdeps/unix/sysv/linux/linux_fsinfo.h (LINUX_LINK_MAX): ... here.
	* sysdeps/unix/sysv/linux/pathconf.h: New file.
	(statfs_link_max): New function, guts from fpathconf.c.
	* sysdeps/unix/sysv/linux/fpathconf.c: Rewritten using that.
	* sysdeps/unix/sysv/linux/pathconf.c (__pathconf): Likewise.
	* sysdeps/unix/sysv/linux/alpha/pathconf.c (__pathconf): Rewritten
	to use the linux/pathconf.c code by #include rather than duplication.
	* sysdeps/unix/sysv/linux/alpha/fpathconf.c (__pathconf): Likewise.

1 files changed, 7 insertions, 62 deletions

diff --git a/sysdeps/unix/sysv/linux/fpathconf.c b/sysdeps/unix/sysv/linux/fpathconf.c
index 108ffa705a..a43a58767d 100644
--- a/sysdeps/unix/sysv/linux/fpathconf.c
+++ b/sysdeps/unix/sysv/linux/fpathconf.c
@@ -1,4 +1,4 @@
-/* Linux specific extensions to fpathconf.
+/* Get file-specific information about descriptor FD.  Linux version.
    Copyright (C) 1991,95,96,98,99,2000,2001,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -17,19 +17,14 @@
    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>
-
-#include "linux_fsinfo.h"
-
-
-/* The Linux kernel header mentioned this as a kind of generic value.  */
-#define LINUX_LINK_MAX	127
+#include "pathconf.h"
 
 static long int posix_fpathconf (int fd, int name);
 
+/* Define this first, so it can be inlined.  */
+#define __fpathconf static posix_fpathconf
+#include <sysdeps/posix/fpathconf.c>
+
 
 /* Get file-specific information about descriptor FD.  */
 long int
@@ -40,58 +35,8 @@ __fpathconf (fd, name)
   if (name == _PC_LINK_MAX)
     {
       struct statfs fsbuf;
-
-      /* Determine the filesystem type.  */
-      if (__fstatfs (fd, &fsbuf) < 0)
-	{
-	  if (errno == ENOSYS)
-	    /* not possible, return the default value.  */
-	    return LINUX_LINK_MAX;
-
-	  /* Some error occured.  */
-          return -1;
-	}
-
-      switch (fsbuf.f_type)
-	{
-	case EXT2_SUPER_MAGIC:
-	  return EXT2_LINK_MAX;
-
-	case MINIX_SUPER_MAGIC:
-	case MINIX_SUPER_MAGIC2:
-	  return MINIX_LINK_MAX;
-
-	case MINIX2_SUPER_MAGIC:
-	case MINIX2_SUPER_MAGIC2:
-	  return MINIX2_LINK_MAX;
-
-	case XENIX_SUPER_MAGIC:
-	  return XENIX_LINK_MAX;
-
-	case SYSV4_SUPER_MAGIC:
-	case SYSV2_SUPER_MAGIC:
-	  return SYSV_LINK_MAX;
-
-	case COH_SUPER_MAGIC:
-	  return COH_LINK_MAX;
-
-	case UFS_MAGIC:
-	case UFS_CIGAM:
-	  return UFS_LINK_MAX;
-
-	case REISERFS_SUPER_MAGIC:
-	  return REISERFS_LINK_MAX;
-
-	case XFS_SUPER_MAGIC:
-	  return XFS_LINK_MAX;
-
-	default:
-	  return LINUX_LINK_MAX;
-	}
+      return statfs_link_max (__fstatfs (fd, &fsbuf), &fsbuf);
     }
 
   return posix_fpathconf (fd, name);
 }
-
-#define __fpathconf static posix_fpathconf
-#include <sysdeps/posix/fpathconf.c>