Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3df3ea581
Branches Tags
openwrt_chaos_c...
/
toolchain
/
uClibc
/
patches-0.9.33.2
/
616-mips_fix_stat_time.patch

616-mips_fix_stat_time.patch 3.7 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123 
  1. --- a/libc/sysdeps/linux/common/xstatconv.c
    2. 

  2. +++ b/libc/sysdeps/linux/common/xstatconv.c
    3. 

  3. @@ -39,9 +39,12 @@ void __xstat_conv(struct kernel_stat *kb
    4. 

  4.  	buf->st_size = kbuf->st_size;
    5. 

  5.  	buf->st_blksize = kbuf->st_blksize;
    6. 

  6.  	buf->st_blocks = kbuf->st_blocks;
    7. 

  7. -	buf->st_atim = kbuf->st_atim;
    8. 

  8. -	buf->st_mtim = kbuf->st_mtim;
    9. 

  9. -	buf->st_ctim = kbuf->st_ctim;
    10. 

  10. +	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
    11. 

  11. +	buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
    12. 

  12. +	buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
    13. 

  13. +	buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
    14. 

  14. +	buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
    15. 

  15. +	buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
    16. 

  16.  }
    17. 

  17.  
    18. 

  18.  void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf)
    19. 

  19. @@ -58,9 +61,12 @@ void __xstat32_conv(struct kernel_stat64
    20. 

  20.  	buf->st_size = kbuf->st_size;
    21. 

  21.  	buf->st_blksize = kbuf->st_blksize;
    22. 

  22.  	buf->st_blocks = kbuf->st_blocks;
    23. 

  23. -	buf->st_atim = kbuf->st_atim;
    24. 

  24. -	buf->st_mtim = kbuf->st_mtim;
    25. 

  25. -	buf->st_ctim = kbuf->st_ctim;
    26. 

  26. +	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
    27. 

  27. +	buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
    28. 

  28. +	buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
    29. 

  29. +	buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
    30. 

  30. +	buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
    31. 

  31. +	buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
    32. 

  32.  }
    33. 

  33.  
    34. 

  34.  #ifdef __UCLIBC_HAS_LFS__
    35. 

  35. @@ -82,9 +88,12 @@ void __xstat64_conv(struct kernel_stat64
    36. 

  36.  	buf->st_size = kbuf->st_size;
    37. 

  37.  	buf->st_blksize = kbuf->st_blksize;
    38. 

  38.  	buf->st_blocks = kbuf->st_blocks;
    39. 

  39. -	buf->st_atim = kbuf->st_atim;
    40. 

  40. -	buf->st_mtim = kbuf->st_mtim;
    41. 

  41. -	buf->st_ctim = kbuf->st_ctim;
    42. 

  42. +	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
    43. 

  43. +	buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec;
    44. 

  44. +	buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec;
    45. 

  45. +	buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec;
    46. 

  46. +	buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec;
    47. 

  47. +	buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec;
    48. 

  48.  }
    49. 

  49.  
    50. 

  50.  #endif /* __UCLIBC_HAS_LFS__ */
    51. 

  51. --- a/libc/sysdeps/linux/mips/bits/kernel_stat.h
    52. 

  52. +++ b/libc/sysdeps/linux/mips/bits/kernel_stat.h
    53. 

  53. @@ -8,6 +8,18 @@
    54. 

  54.  #include <sgidefs.h>
    55. 

  55.  
    56. 

  56.  #if _MIPS_SIM == _MIPS_SIM_ABI64
    57. 

  57. +typedef struct {
    58. 

  58. +	unsigned int tv_sec;
    59. 

  59. +	unsigned int tv_nsec;
    60. 

  60. +} __ktimespec_t;
    61. 

  61. +#else
    62. 

  62. +typedef struct {
    63. 

  63. +	time_t tv_sec;
    64. 

  64. +	unsigned long tv_nsec;
    65. 

  65. +} __ktimespec_t;
    66. 

  66. +#endif
    67. 

  67. +
    68. 

  68. +#if _MIPS_SIM == _MIPS_SIM_ABI64
    69. 

  69.  /* The memory layout is the same as of struct stat64 of the 32-bit kernel.  */
    70. 

  70.  struct kernel_stat {
    71. 

  71.  	__kernel_dev_t	st_dev;
    72. 

  72. @@ -20,9 +32,9 @@ struct kernel_stat {
    73. 

  73.  	__kernel_dev_t	st_rdev;
    74. 

  74.  	unsigned int	st_pad2[3];
    75. 

  75.  	__kernel_off_t	st_size;
    76. 

  76. -	struct timespec	st_atim;
    77. 

  77. -	struct timespec	st_mtim;
    78. 

  78. -	struct timespec	st_ctim;
    79. 

  79. +	__ktimespec_t	st_atim;
    80. 

  80. +	__ktimespec_t	st_mtim;
    81. 

  81. +	__ktimespec_t	st_ctim;
    82. 

  82.  	unsigned int	st_blksize;
    83. 

  83.  	unsigned int	reserved3;
    84. 

  84.  	unsigned long	st_blocks;
    85. 

  85. @@ -41,9 +53,9 @@ struct kernel_stat {
    86. 

  86.  	unsigned int	st_rdev;
    87. 

  87.  	unsigned int	st_pad2[3];
    88. 

  88.  	unsigned long long	st_size;
    89. 

  89. -	struct timespec	st_atim;
    90. 

  90. -	struct timespec	st_mtim;
    91. 

  91. -	struct timespec	st_ctim;
    92. 

  92. +	__ktimespec_t	st_atim;
    93. 

  93. +	__ktimespec_t	st_mtim;
    94. 

  94. +	__ktimespec_t	st_ctim;
    95. 

  95.  	unsigned int	st_blksize;
    96. 

  96.  	unsigned int	reserved3;
    97. 

  97.  	unsigned long long	st_blocks;
    98. 

  98. @@ -62,9 +74,9 @@ struct kernel_stat {
    99. 

  99.  	long		st_pad2[2];
    100. 

  100.  	__kernel_off_t	st_size;
    101. 

  101.  	long		st_pad3;
    102. 

  102. -	struct timespec	st_atim;
    103. 

  103. -	struct timespec	st_mtim;
    104. 

  104. -	struct timespec	st_ctim;
    105. 

  105. +	__ktimespec_t	st_atim;
    106. 

  106. +	__ktimespec_t	st_mtim;
    107. 

  107. +	__ktimespec_t	st_ctim;
    108. 

  108.  	long		st_blksize;
    109. 

  109.  	long		st_blocks;
    110. 

  110.  	long		st_pad4[14];
    111. 

  111. @@ -81,9 +93,9 @@ struct kernel_stat64 {
    112. 

  112.  	unsigned long	st_rdev;
    113. 

  113.  	unsigned long	st_pad1[3];	/* Reserved for st_rdev expansion  */
    114. 

  114.  	long long	st_size;
    115. 

  115. -	struct timespec	st_atim;
    116. 

  116. -	struct timespec	st_mtim;
    117. 

  117. -	struct timespec	st_ctim;
    118. 

  118. +	__ktimespec_t	st_atim;
    119. 

  119. +	__ktimespec_t	st_mtim;
    120. 

  120. +	__ktimespec_t	st_ctim;
    121. 

  121.  	unsigned long	st_blksize;
    122. 

  122.  	unsigned long	st_pad2;
    123. 

  123.  	long long	st_blocks;
    124.