From 85800279bcad0b3495ccc22374f42cd04675f9e4 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 24 Jan 2003 11:44:14 +0000 Subject: Ok, people are probably going to hate me for this... This commit changes the type of 'struct stat' and 'struct stat64' so they use consistant types. This change is the result of a bug I found while trying to use GNU tar. The problem was caused by our using kernel types within struct stat and trying to directly compare these values with standard types. Trying an 'if (a < b)' when 'a' is an 'unsigned long' and 'b' is an 'int' leads to very different results then when comparing entities of the same type (i.e. time_t values).... Grumble. Nasty stuff, but I'm glad I got this out of the way now. As a result of this fix, uClibc 0.9.17 will not be binary compatible with earlier releases. I have always warned people this can and will happen. -Erik --- libc/sysdeps/linux/h8300/bits/kernel_stat.h | 36 +++-------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'libc/sysdeps/linux/h8300/bits') diff --git a/libc/sysdeps/linux/h8300/bits/kernel_stat.h b/libc/sysdeps/linux/h8300/bits/kernel_stat.h index 5ca018eac..9152811ba 100644 --- a/libc/sysdeps/linux/h8300/bits/kernel_stat.h +++ b/libc/sysdeps/linux/h8300/bits/kernel_stat.h @@ -2,11 +2,10 @@ #define _BITS_STAT_STRUCT_H /* This file provides whatever this particular arch's kernel thinks - * struct stat should look like... It turns out each arch has a + * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ -#ifndef __USE_FILE_OFFSET64 -struct stat { +struct kernel_stat { unsigned short st_dev; unsigned short __pad1; unsigned long st_ino; @@ -28,36 +27,8 @@ struct stat { unsigned long __unused4; unsigned long __unused5; }; -#else -struct stat { - unsigned char __pad0[6]; - unsigned short st_dev; - unsigned char __pad1[2]; -#define STAT64_HAS_BROKEN_ST_INO 1 - unsigned long __st_ino; - unsigned int st_mode; - unsigned int st_nlink; - unsigned long st_uid; - unsigned long st_gid; - unsigned char __pad2[6]; - unsigned short st_rdev; - unsigned char __pad3[2]; - long long st_size; - unsigned long st_blksize; - unsigned long __pad4; /* future possible st_blocks high bits */ - unsigned long st_blocks; /* Number 512-byte blocks allocated. */ - unsigned long st_atime; - unsigned long __pad5; - unsigned long st_mtime; - unsigned long __pad6; - unsigned long st_ctime; - unsigned long __pad7; /* will be high 32 bits of ctime someday */ - unsigned long long st_ino; -}; -#endif -#ifdef __USE_LARGEFILE64 -struct stat64 { +struct kernel_stat64 { unsigned char __pad0[6]; unsigned short st_dev; unsigned char __pad1[2]; @@ -82,7 +53,6 @@ struct stat64 { unsigned long __pad7; /* will be high 32 bits of ctime someday */ unsigned long long st_ino; }; -#endif #endif /* _BITS_STAT_STRUCT_H */ -- cgit v1.2.3