getdents: Fix build under glibc 2.30
PATCH 1/1 getdents: Fix build under glibc 2.30
glibc commit b8b3d5a14e ("Linux: Move getdents64 to <dirent.h>") moved the declaration from <unistd.h> to <dirent.h> to match the location of the declaration in musl.
Thus we need to include both <dirent.h> and <unistd.h> for getdents64().
Using getdents64() declaration requires on both glibc and musl _GNU_SOURCE definition, thus move it to to getdents.h.
---
Hi,
you might not like moving _GNU_SOURCE definition to the header, I can add the missing one in getdents01.c instead.
Travis: https://travis-ci.org/pevik/ltp/builds/595021543
Kind regards,
Petr
testcases/kernel/syscalls/getdents/getdents.h | 2 ++ testcases/kernel/syscalls/getdents/getdents01.c | 3 ++- testcases/kernel/syscalls/getdents/getdents02.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/getdents/getdents.h +2 -0
@@ -20,6 +20,7 @@#ifndef GETDENTS_H #define GETDENTS_H +#define _GNU_SOURCE#include <stdint.h> #include "test.h" #include "lapi/syscalls.h"
@@ -54,6 +55,7 @@ struct linux_dirent64 { };#if HAVE_GETDENTS64 +#include <dirent.h> #include <unistd.h> #else static inline int
testcases/kernel/syscalls/getdents/getdents01.c +2 -1
@@ -19,6 +19,8 @@* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "getdents.h" +#include <stdio.h> #include <errno.h> #include <sys/types.h>
@@ -27,7 +29,6 @@#include "test.h" #include "safe_macros.h" -#include "getdents.h" static void cleanup (void );static void setup (void );
testcases/kernel/syscalls/getdents/getdents02.c +2 -2
@@ -33,7 +33,8 @@* */ -#define _GNU_SOURCE +#include "getdents.h" +#include <stdio.h> #include <errno.h> #include <sys/types.h>
@@ -41,7 +42,6 @@#include <fcntl.h> #include "test.h" -#include "getdents.h" #include "safe_macros.h" #define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \
Signature · 1 line
2.23.0
PATCH 1/1 getdents: Fix build under glibc 2.30
Hi!
Quoted 8 lines
glibc commit
b8b3d5a14e("Linux: Move getdents64 to <dirent.h>") moved the declaration from <unistd.h> to <dirent.h> to match the location of the declaration in musl.Thus we need to include both <
dirent.h> and <unistd.h> forgetdents64().Using
getdents64()declaration requires on both glibc and musl_GNU_SOURCEdefinition, thus move it to togetdents.h.
I would rather go for _GNU_SOURCE being defined in the testcases rather than hiding it in the getdenst.h header and depending on the order.
Other than that it's fine.
Quoted 85 lines
---
Hi,you might not like moving
_GNU_SOURCEdefinition to the header, I can add the missing one ingetdents01.cinstead.Travis: https://travis-ci.org/pevik/ltp/builds/595021543
Kind regards,
Petrtestcases/kernel/syscalls/getdents/getdents.h | 2 ++ testcases/kernel/syscalls/getdents/getdents01.c | 3 ++- testcases/kernel/syscalls/getdents/getdents02.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)testcases/kernel/syscalls/getdents/getdents.h +2
-0@@ -20,6 +20,7 @@#ifndef GETDENTS_H #define GETDENTS_H +#define _GNU_SOURCE#include <stdint.h> #include "test.h" #include "lapi/syscalls.h" @@ -54,6 +55,7 @@ struct linux_dirent64 { };#if HAVE_GETDENTS64 +#include <dirent.h> #include <unistd.h> #else static inline inttestcases/kernel/syscalls/getdents/getdents01.c +2
-1@@ -19,6 +19,8 @@* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "getdents.h" +#include <stdio.h> #include <errno.h> #include <sys/types.h> @@ -27,7 +29,6 @@#include "test.h" #include "safe_macros.h" -#include "getdents.h" static void cleanup (void );static void setup (void );testcases/kernel/syscalls/getdents/getdents02.c +2
-2@@ -33,7 +33,8 @@* */ -#define _GNU_SOURCE +#include "getdents.h" +#include <stdio.h> #include <errno.h> #include <sys/types.h> @@ -41,7 +42,6 @@#include <fcntl.h> #include "test.h" -#include "getdents.h" #include "safe_macros.h" #define DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP| \Signature · 1 line
2.23.0
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 getdents: Fix build under glibc 2.30
Hi Cyril,
Quoted 6 lines
Quoted 5 lines
glibc commit
b8b3d5a14e("Linux: Move getdents64 to <dirent.h>") moved the declaration from <unistd.h> to <dirent.h> to match the location of the declaration in musl.Thus we need to include both <
dirent.h> and <unistd.h> forgetdents64().
Quoted 7 lines
Quoted 2 lines
Using
getdents64()declaration requires on both glibc and musl_GNU_SOURCEdefinition, thus move it to togetdents.h.I would rather go for
_GNU_SOURCEbeing defined in the testcases rather than hiding it in thegetdenst.hheader and depending on the order.Other than that it's fine.
Make sense. Thanks for a review, merged with this change.
Kind regards,
Petr