glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move redefinition of stat types to asm_stat.h

Browse Source 
* file.c: Move redefinition of types that might be used
to define struct stat ...
* linux/asm_stat.h: ... here.
* tests/xstatx.c: Remove redefinition of stat types.
This commit is contained in:
Дмитрий Левин 2016-08-23 23:39:45 +00:00
parent 1d81b3b35f
commit 1aae061d4d
3 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
file.c
View File

@ -29,43 +29,8 @@
*/
#include "defs.h"
#undef dev_t
#undef ino_t
#undef mode_t
#undef nlink_t
#undef uid_t
#undef gid_t
#undef off_t
#undef loff_t
#define dev_t __kernel_dev_t
#define ino_t __kernel_ino_t
#define mode_t __kernel_mode_t
#define nlink_t __kernel_nlink_t
#define uid_t __kernel_uid_t
#define gid_t __kernel_gid_t
#define off_t __kernel_off_t
#define loff_t __kernel_loff_t
#include "asm_stat.h"
#undef dev_t
#undef ino_t
#undef mode_t
#undef nlink_t
#undef uid_t
#undef gid_t
#undef off_t
#undef loff_t
#define dev_t dev_t
#define ino_t ino_t
#define mode_t mode_t
#define nlink_t nlink_t
#define uid_t uid_t
#define gid_t gid_t
#define off_t off_t
#define loff_t loff_t
/* for S_IFMT */
#define stat libc_stat
#define stat64 libc_stat64

54
linux/asm_stat.h
View File

@ -1,2 +1,52 @@
#include "kernel_types.h"
#include <asm/stat.h>
#ifndef STRACE_ASM_STAT_H
#define STRACE_ASM_STAT_H
# include "kernel_types.h"
# undef dev_t
# undef gid_t
# undef ino_t
# undef loff_t
# undef mode_t
# undef nlink_t
# undef off64_t
# undef off_t
# undef time_t
# undef uid_t
# define dev_t __kernel_dev_t
# define gid_t __kernel_gid_t
# define ino_t __kernel_ino_t
# define loff_t __kernel_loff_t
# define mode_t __kernel_mode_t
# define nlink_t __kernel_nlink_t
# define off64_t __kernel_off64_t
# define off_t __kernel_off_t
# define time_t __kernel_time_t
# define uid_t __kernel_uid_t
# include <asm/stat.h>
# undef dev_t
# undef gid_t
# undef ino_t
# undef loff_t
# undef mode_t
# undef nlink_t
# undef off64_t
# undef off_t
# undef time_t
# undef uid_t
# define dev_t dev_t
# define gid_t gid_t
# define ino_t ino_t
# define loff_t loff_t
# define mode_t mode_t
# define nlink_t nlink_t
# define off64_t off64_t
# define off_t off_t
# define time_t time_t
# define uid_t uid_t
#endif /* !STRACE_ASM_STAT_H */

20
tests/xstatx.c
View File

@ -97,26 +97,6 @@ typedef off_t libc_off_t;
# undef st_atime
# undef st_mtime
# undef st_ctime
# undef dev_t
# undef gid_t
# undef ino_t
# undef loff_t
# undef mode_t
# undef nlink_t
# undef off64_t
# undef off_t
# undef time_t
# undef uid_t
# define dev_t __kernel_dev_t
# define gid_t __kernel_gid_t
# define ino_t __kernel_ino_t
# define loff_t __kernel_loff_t
# define mode_t __kernel_mode_t
# define nlink_t __kernel_nlink_t
# define off64_t __kernel_off64_t
# define off_t __kernel_off_t
# define time_t __kernel_time_t
# define uid_t __kernel_uid_t
# include "asm_stat.h"
# if STRUCT_STAT_IS_STAT64
# undef HAVE_STRUCT_STAT_ST_MTIME_NSEC