projects / packages / strace.git / blame
| Commit | Line | Data |
|---|---|---|
| f6bae06f | 1 | --- strace-4.5.20/configure.ac~ 2010-04-13 18:09:23.000000000 +0200 |
| 2 | +++ strace-4.5.20/configure.ac 2010-04-15 09:33:06.216138318 +0200 | |
| 3 | @@ -192,6 +192,14 @@ | |
| 4 | struct stat.st_rdev]) | |
| ccbf5ac3 | 5 | AC_STAT64 |
| f6bae06f | 6 | AC_STATFS64 |
| ccbf5ac3 | 7 | +AC_CHECK_MEMBERS([struct stat64.st_blksize, |
| f6bae06f | 8 | + struct stat64.st_blocks, |
| 9 | + struct stat64.st_aclcnt, | |
| 10 | + struct stat64.st_flags, | |
| 11 | + struct stat64.st_fstype, | |
| 12 | + struct stat64.st_gen, | |
| 13 | + struct stat64.st_level, | |
| 14 | + struct stat64.st_rdev],,,[#include <asm/stat.h>]) | |
| 15 | ||
| ccbf5ac3 JB |
16 | AC_TYPE_SIGNAL |
| 17 | AC_TYPE_UID_T | |
| aa422cda JB |
18 | --- strace-4.5.12/file.c.orig 2005-06-08 22:45:28.000000000 +0200 |
| 19 | +++ strace-4.5.12/file.c 2005-06-11 19:25:18.200972552 +0200 | |
| 20 | @@ -958,27 +958,27 @@ | |
| ccbf5ac3 JB |
21 | (unsigned long) statbuf.st_nlink, |
| 22 | (unsigned long) statbuf.st_uid, | |
| 23 | (unsigned long) statbuf.st_gid); | |
| 24 | -#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE | |
| 25 | +#ifdef HAVE_STRUCT_STAT64_ST_BLKSIZE | |
| 26 | tprintf("st_blksize=%lu, ", | |
| 27 | (unsigned long) statbuf.st_blksize); | |
| 28 | -#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */ | |
| 29 | -#ifdef HAVE_STRUCT_STAT_ST_BLOCKS | |
| 30 | +#endif /* HAVE_STRUCT_STAT64_ST_BLKSIZE */ | |
| 31 | +#ifdef HAVE_STRUCT_STAT64_ST_BLOCKS | |
| 32 | tprintf("st_blocks=%lu, ", (unsigned long) statbuf.st_blocks); | |
| 33 | -#endif /* HAVE_STRUCT_STAT_ST_BLOCKS */ | |
| 34 | +#endif /* HAVE_STRUCT_STAT64_ST_BLOCKS */ | |
| 35 | } | |
| de4e0a62 | 36 | else |
| ccbf5ac3 JB |
37 | tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode)); |
| 38 | switch (statbuf.st_mode & S_IFMT) { | |
| 39 | case S_IFCHR: case S_IFBLK: | |
| 40 | -#ifdef HAVE_STRUCT_STAT_ST_RDEV | |
| 41 | +#ifdef HAVE_STRUCT_STAT64_ST_RDEV | |
| 42 | tprintf("st_rdev=makedev(%lu, %lu), ", | |
| 43 | (unsigned long) major(statbuf.st_rdev), | |
| 44 | (unsigned long) minor(statbuf.st_rdev)); | |
| 45 | -#else /* !HAVE_STRUCT_STAT_ST_RDEV */ | |
| 46 | +#else /* !HAVE_STRUCT_STAT64_ST_RDEV */ | |
| 47 | tprintf("st_size=makedev(%lu, %lu), ", | |
| 48 | (unsigned long) major(statbuf.st_size), | |
| 49 | (unsigned long) minor(statbuf.st_size)); | |
| 50 | -#endif /* !HAVE_STRUCT_STAT_ST_RDEV */ | |
| 51 | +#endif /* !HAVE_STRUCT_STAT64_ST_RDEV */ | |
| 52 | break; | |
| 53 | default: | |
| 54 | tprintf("st_size=%llu, ", statbuf.st_size); | |
| aa422cda | 55 | @@ -988,21 +988,21 @@ |
| ccbf5ac3 JB |
56 | tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime)); |
| 57 | tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime)); | |
| 58 | tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime)); | |
| 59 | -#if HAVE_STRUCT_STAT_ST_FLAGS | |
| 60 | +#if HAVE_STRUCT_STAT64_ST_FLAGS | |
| 61 | tprintf(", st_flags="); | |
| aa422cda | 62 | printflags(fileflags, statbuf.st_flags, "UF_???"); |
| ccbf5ac3 JB |
63 | #endif |
| 64 | -#if HAVE_STRUCT_STAT_ST_ACLCNT | |
| 65 | +#if HAVE_STRUCT_STAT64_ST_ACLCNT | |
| 66 | tprintf(", st_aclcnt=%d", statbuf.st_aclcnt); | |
| 67 | #endif | |
| 68 | -#if HAVE_STRUCT_STAT_ST_LEVEL | |
| 69 | +#if HAVE_STRUCT_STAT64_ST_LEVEL | |
| 70 | tprintf(", st_level=%ld", statbuf.st_level); | |
| 71 | #endif | |
| 72 | -#if HAVE_STRUCT_STAT_ST_FSTYPE | |
| 73 | +#if HAVE_STRUCT_STAT64_ST_FSTYPE | |
| 74 | tprintf(", st_fstype=%.*s", | |
| 75 | (int) sizeof statbuf.st_fstype, statbuf.st_fstype); | |
| 76 | #endif | |
| 77 | -#if HAVE_STRUCT_STAT_ST_GEN | |
| 78 | +#if HAVE_STRUCT_STAT64_ST_GEN | |
| 79 | tprintf(", st_gen=%u", statbuf.st_gen); | |
| 80 | #endif | |
| 81 | tprintf("}"); |