* sysdeps/mach/hurd/fstatfs64.c: New file. * sysdeps/mach/hurd/fstatvfs64.c: New...

2001-01-06  Mark Kettenis  <kettenis@gnu.org>

	* sysdeps/mach/hurd/fstatfs64.c: New file.
	* sysdeps/mach/hurd/fstatvfs64.c: New file.
	* sysdeps/mach/hurd/statfs64.c: New file.
	* sysdeps/mach/hurd/statvfs64.c: New file.
	* sysdeps/mach/hurd/statfsconv.c: New file.
	* sysdeps/mach/hurd/Dist: Add statfsconv.c.

diff --git a/ChangeLog b/ChangeLog
index 1152287..ea836ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-06  Mark Kettenis  <kettenis@gnu.org>
+
+       * sysdeps/mach/hurd/fstatfs64.c: New file.
+       * sysdeps/mach/hurd/fstatvfs64.c: New file.
+       * sysdeps/mach/hurd/statfs64.c: New file.
+       * sysdeps/mach/hurd/statvfs64.c: New file.
+       * sysdeps/mach/hurd/statfsconv.c: New file.
+       * sysdeps/mach/hurd/Dist: Add statfsconv.c.
+
 2001-01-06  Ulrich Drepper  <drepper@redhat.com>
 
        * iconv/skeleton.c: Reset outbuf for next round of the loop.

diff --git a/sysdeps/mach/hurd/Dist b/sysdeps/mach/hurd/Dist
index 464b901..2331c52 100644 (file)
--- a/sysdeps/mach/hurd/Dist
+++ b/sysdeps/mach/hurd/Dist
@@ -12,4 +12,5 @@ net/if_ppp.h
 net/route.h
 nfs/nfs.h
 siglist.h
+statfsconv.c
 xstatconv.c

diff --git a/sysdeps/mach/hurd/fstatfs64.c b/sysdeps/mach/hurd/fstatfs64.c
new file mode 100644 (file)
index 0000000..4b6f5d4
--- /dev/null
+++ b/sysdeps/mach/hurd/fstatfs64.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <sys/statfs.h>
+
+#include "statfsconv.c"
+
+/* Return information about the filesystem on which FD resides.  */
+int
+__fstatfs64 (int fd, struct statfs64 *buf)
+{
+  int result;
+  struct statfs buf32;
+
+  /* XXX We simply call __fstatfs and convert the result to `struct
+     statfs64'.  We can probably get away with that since we don't
+     support large files on the Hurd yet.  */
+  result = __fstatfs (fd, &buf32);
+  if (result == 0)
+    statfs64_conv (&buf32, buf);
+
+  return result;
+}
+
+weak_alias (__fstatfs64, fstatfs64)

diff --git a/sysdeps/mach/hurd/fstatvfs64.c b/sysdeps/mach/hurd/fstatvfs64.c
new file mode 100644 (file)
index 0000000..816664f
--- /dev/null
+++ b/sysdeps/mach/hurd/fstatvfs64.c
@@ -0,0 +1,28 @@
+/* Copyright (C) 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <sys/statfs.h>
+#include <sys/statvfs.h>
+
+int
+fstatvfs64 (int fd, struct statvfs64 *buf)
+{
+  /* `struct statvfs64' is in fact identical to `struct statfs64' so
+     we can simply call fstatfs64.  */
+  return __fstatfs64 (fd, (struct statfs64 *)buf);
+}

diff --git a/sysdeps/mach/hurd/statfs64.c b/sysdeps/mach/hurd/statfs64.c
new file mode 100644 (file)
index 0000000..7c1349f
--- /dev/null
+++ b/sysdeps/mach/hurd/statfs64.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <sys/statfs.h>
+
+#include "statfsconv.c"
+
+/* Return information about the filesystem on which FILE resides.  */
+int
+__statfs64 (const char *file, struct statfs64 *buf)
+{
+  int result;
+  struct statfs buf32;
+
+  /* XXX We simply call __statfs and convert the result to `struct
+     statfs64'.  We can probably get away with that since we don't
+     support large files on the Hurd yet.  */
+  result = __statfs (file, &buf32);
+  if (result == 0)
+    statfs64_conv (&buf32, buf);
+
+  return result;
+}
+
+weak_alias (__statfs64, statfs64)

diff --git a/sysdeps/mach/hurd/statfsconv.c b/sysdeps/mach/hurd/statfsconv.c
new file mode 100644 (file)
index 0000000..91c05f0
--- /dev/null
+++ b/sysdeps/mach/hurd/statfsconv.c
@@ -0,0 +1,39 @@
+/* Convert between `struct statfs' format, and `struct statfs64' format.
+   Copyright (C) 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <string.h>
+#include <sys/stat.h>
+
+static inline void
+statfs64_conv (struct statfs *buf, struct statfs64 *buf64)
+{
+  memset (buf64, 0, sizeof (struct statfs64));
+
+  buf64->f_type = buf->f_type;
+  buf64->f_bsize = buf->f_bsize;
+  buf64->f_blocks = buf->f_blocks;
+  buf64->f_bfree = buf->f_bfree;
+  buf64->f_bavail = buf->f_bavail;
+  buf64->f_files = buf->f_files;
+  buf64->f_fsid = buf->f_fsid;
+  buf64->f_namelen = buf->f_namelen;
+  buf64->f_favail = buf->f_favail;
+  buf64->f_frsize = buf->f_frsize;
+  buf64->f_flag = buf->f_flag;
+}