about summary refs log tree commit diff
path: root/misc/ustat.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-03-18 11:28:59 +0800
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-05-02 08:43:31 -0300
commitcf2478d53ad7071e84c724a986b56fe17f4f4ca7 (patch)
tree907b40dddc0c8a10b1f91246efe6f141a402f80d /misc/ustat.c
parentdc115e1cdc369c31296b8287959758fb77f33aaa (diff)
downloadglibc-cf2478d53ad7071e84c724a986b56fe17f4f4ca7.tar.gz
glibc-cf2478d53ad7071e84c724a986b56fe17f4f4ca7.tar.xz
glibc-cf2478d53ad7071e84c724a986b56fe17f4f4ca7.zip
Deprecate ustat syscall interface
As for sysctl, ustat has been deprecated in favor of {f}statfs.  Also
some newer ports which uses generic interface builds a stub version that
returns ENOSYS.

This patch deprecates ustat interface by removing ustat.h related headers,
adding a compatibility symbol, and avoiding new ports to build and provide
the symbol.

Checked on x86_64-linux-gnu and i686-linux-gnu.  Also checked with a
check-abi on all affected ABIs.

	* NEWS: Add ustat.h deprecation entry.
	* bits/ustat.h: Remove file.
	* misc/sys/ustat.h: Likewise.
	* misc/ustat.h: Likewise.
	* sysdeps/unix/sysv/linux/generic/ustat.c: Likewise.
	* misc/Makefile (headers): Remove ustat.h and sys/ustat.h.
	* misc/ustat.c (__ustat): Rename to __old_ustat and export only in
	compatibility mode.
	* sysdeps/unix/sysv/linux/ustat.c (__ustat): Likewise.
	* sysdeps/unix/sysv/linux/mips/ustat.c: Define DEV_TO_KDEV and use
	generic Linux implementation.
Diffstat (limited to 'misc/ustat.c')
-rw-r--r--misc/ustat.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/misc/ustat.c b/misc/ustat.c
index e5abedae7b..2c40e2a3cb 100644
--- a/misc/ustat.c
+++ b/misc/ustat.c
@@ -16,14 +16,28 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <unistd.h>
-#include <errno.h>
-#include <sys/ustat.h>
+#include <shlib-compat.h>
+
+/* This deprecated syscall is no longer used (replaced with {f}statfs).  */
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_28)
+
+# include <unistd.h>
+# include <errno.h>
+
+struct ustat
+ {
+   __daddr_t f_tfree;         /* Number of free blocks.  */
+   __ino_t f_tinode;          /* Number of free inodes.  */
+   char f_fname[6];
+   char f_fpack[6];
+};
 
 int
-ustat (dev_t dev, struct ustat *ust)
+__old_ustat (dev_t dev, struct ustat *ust)
 {
   __set_errno (ENOSYS);
   return -1;
 }
 stub_warning (ustat)
+compat_symbol (libc, __old_ustat, ustat, GLIBC_2_0);
+#endif