diff options
author | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-08 07:03:27 +0000 |
---|---|---|
committer | vapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-08 07:03:27 +0000 |
commit | 9b98082f652f196aff8f9164e597359883d8b673 (patch) | |
tree | 1cb4ee52f1592350dd9c4471b2a334957cc42b5e /e2fsprogs/ext2fs | |
parent | 5517c3199be30d9ff3dd242090fec233a265d6aa (diff) | |
download | busybox-w32-9b98082f652f196aff8f9164e597359883d8b673.tar.gz busybox-w32-9b98082f652f196aff8f9164e597359883d8b673.tar.bz2 busybox-w32-9b98082f652f196aff8f9164e597359883d8b673.zip |
import most of e2fsprogs 1.38 updates
git-svn-id: svn://busybox.net/trunk/busybox@14468 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'e2fsprogs/ext2fs')
-rw-r--r-- | e2fsprogs/ext2fs/bitops.c | 6 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/bitops.h | 6 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ext2fs.h | 1 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ext2fs_inline.c | 8 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/getsectsize.c | 2 | ||||
-rw-r--r-- | e2fsprogs/ext2fs/ismounted.c | 6 |
6 files changed, 15 insertions, 14 deletions
diff --git a/e2fsprogs/ext2fs/bitops.c b/e2fsprogs/ext2fs/bitops.c index e44e10cf4..77ac2a61f 100644 --- a/e2fsprogs/ext2fs/bitops.c +++ b/e2fsprogs/ext2fs/bitops.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * systems, as well as non-32 bit systems. | 30 | * systems, as well as non-32 bit systems. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | int ext2fs_set_bit(int nr,void * addr) | 33 | int ext2fs_set_bit(unsigned int nr,void * addr) |
34 | { | 34 | { |
35 | int mask, retval; | 35 | int mask, retval; |
36 | unsigned char *ADDR = (unsigned char *) addr; | 36 | unsigned char *ADDR = (unsigned char *) addr; |
@@ -42,7 +42,7 @@ int ext2fs_set_bit(int nr,void * addr) | |||
42 | return retval; | 42 | return retval; |
43 | } | 43 | } |
44 | 44 | ||
45 | int ext2fs_clear_bit(int nr, void * addr) | 45 | int ext2fs_clear_bit(unsigned int nr, void * addr) |
46 | { | 46 | { |
47 | int mask, retval; | 47 | int mask, retval; |
48 | unsigned char *ADDR = (unsigned char *) addr; | 48 | unsigned char *ADDR = (unsigned char *) addr; |
@@ -54,7 +54,7 @@ int ext2fs_clear_bit(int nr, void * addr) | |||
54 | return retval; | 54 | return retval; |
55 | } | 55 | } |
56 | 56 | ||
57 | int ext2fs_test_bit(int nr, const void * addr) | 57 | int ext2fs_test_bit(unsigned int nr, const void * addr) |
58 | { | 58 | { |
59 | int mask; | 59 | int mask; |
60 | const unsigned char *ADDR = (const unsigned char *) addr; | 60 | const unsigned char *ADDR = (const unsigned char *) addr; |
diff --git a/e2fsprogs/ext2fs/bitops.h b/e2fsprogs/ext2fs/bitops.h index 4dba050c8..5e727d186 100644 --- a/e2fsprogs/ext2fs/bitops.h +++ b/e2fsprogs/ext2fs/bitops.h | |||
@@ -15,9 +15,9 @@ | |||
15 | 15 | ||
16 | #include <strings.h> | 16 | #include <strings.h> |
17 | 17 | ||
18 | extern int ext2fs_set_bit(int nr,void * addr); | 18 | extern int ext2fs_set_bit(unsigned int nr,void * addr); |
19 | extern int ext2fs_clear_bit(int nr, void * addr); | 19 | extern int ext2fs_clear_bit(unsigned int nr, void * addr); |
20 | extern int ext2fs_test_bit(int nr, const void * addr); | 20 | extern int ext2fs_test_bit(unsigned int nr, const void * addr); |
21 | extern __u16 ext2fs_swab16(__u16 val); | 21 | extern __u16 ext2fs_swab16(__u16 val); |
22 | extern __u32 ext2fs_swab32(__u32 val); | 22 | extern __u32 ext2fs_swab32(__u32 val); |
23 | 23 | ||
diff --git a/e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/ext2fs/ext2fs.h index 7d2a43695..b8752a56e 100644 --- a/e2fsprogs/ext2fs/ext2fs.h +++ b/e2fsprogs/ext2fs/ext2fs.h | |||
@@ -330,6 +330,7 @@ typedef struct ext2_struct_inode_scan *ext2_inode_scan; | |||
330 | #define EXT2_MF_ISROOT 2 | 330 | #define EXT2_MF_ISROOT 2 |
331 | #define EXT2_MF_READONLY 4 | 331 | #define EXT2_MF_READONLY 4 |
332 | #define EXT2_MF_SWAP 8 | 332 | #define EXT2_MF_SWAP 8 |
333 | #define EXT2_MF_BUSY 16 | ||
333 | 334 | ||
334 | /* | 335 | /* |
335 | * Ext2/linux mode flags. We define them here so that we don't need | 336 | * Ext2/linux mode flags. We define them here so that we don't need |
diff --git a/e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/ext2fs/ext2fs_inline.c index 73d393d20..a363b1992 100644 --- a/e2fsprogs/ext2fs/ext2fs_inline.c +++ b/e2fsprogs/ext2fs/ext2fs_inline.c | |||
@@ -44,12 +44,14 @@ errcode_t ext2fs_resize_mem(unsigned long EXT2FS_ATTR((unused)) old_size, | |||
44 | unsigned long size, void *ptr) | 44 | unsigned long size, void *ptr) |
45 | { | 45 | { |
46 | void *p; | 46 | void *p; |
47 | void **pp = (void **)ptr; | ||
48 | 47 | ||
49 | p = realloc(*pp, size); | 48 | /* Use "memcpy" for pointer assignments here to avoid problems |
49 | * with C99 strict type aliasing rules. */ | ||
50 | memcpy(&p, ptr, sizeof (p)); | ||
51 | p = realloc(p, size); | ||
50 | if (!p) | 52 | if (!p) |
51 | return EXT2_ET_NO_MEMORY; | 53 | return EXT2_ET_NO_MEMORY; |
52 | *pp = p; | 54 | memcpy(ptr, &p, sizeof (p)); |
53 | return 0; | 55 | return 0; |
54 | } | 56 | } |
55 | 57 | ||
diff --git a/e2fsprogs/ext2fs/getsectsize.c b/e2fsprogs/ext2fs/getsectsize.c index b561660ba..36871f236 100644 --- a/e2fsprogs/ext2fs/getsectsize.c +++ b/e2fsprogs/ext2fs/getsectsize.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/fd.h> | 23 | #include <linux/fd.h> |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE) | 26 | #if defined(__linux__) && defined(_IO) && !defined(BLKSSZGET) |
27 | #define BLKSSZGET _IO(0x12,104)/* get block device sector size */ | 27 | #define BLKSSZGET _IO(0x12,104)/* get block device sector size */ |
28 | #endif | 28 | #endif |
29 | 29 | ||
diff --git a/e2fsprogs/ext2fs/ismounted.c b/e2fsprogs/ext2fs/ismounted.c index 2395ccaed..125fe244b 100644 --- a/e2fsprogs/ext2fs/ismounted.c +++ b/e2fsprogs/ext2fs/ismounted.c | |||
@@ -339,20 +339,18 @@ int main(int argc, char **argv) | |||
339 | exit(1); | 339 | exit(1); |
340 | } | 340 | } |
341 | printf("Device %s reports flags %02x\n", argv[1], mount_flags); | 341 | printf("Device %s reports flags %02x\n", argv[1], mount_flags); |
342 | if (mount_flags & EXT2_MF_BUSY) | ||
343 | printf("\t%s is apparently in use.\n", argv[1]); | ||
342 | if (mount_flags & EXT2_MF_MOUNTED) | 344 | if (mount_flags & EXT2_MF_MOUNTED) |
343 | printf("\t%s is mounted.\n", argv[1]); | 345 | printf("\t%s is mounted.\n", argv[1]); |
344 | |||
345 | if (mount_flags & EXT2_MF_SWAP) | 346 | if (mount_flags & EXT2_MF_SWAP) |
346 | printf("\t%s is a swap device.\n", argv[1]); | 347 | printf("\t%s is a swap device.\n", argv[1]); |
347 | |||
348 | if (mount_flags & EXT2_MF_READONLY) | 348 | if (mount_flags & EXT2_MF_READONLY) |
349 | printf("\t%s is read-only.\n", argv[1]); | 349 | printf("\t%s is read-only.\n", argv[1]); |
350 | |||
351 | if (mount_flags & EXT2_MF_ISROOT) | 350 | if (mount_flags & EXT2_MF_ISROOT) |
352 | printf("\t%s is the root filesystem.\n", argv[1]); | 351 | printf("\t%s is the root filesystem.\n", argv[1]); |
353 | if (mntpt[0]) | 352 | if (mntpt[0]) |
354 | printf("\t%s is mounted on %s.\n", argv[1], mntpt); | 353 | printf("\t%s is mounted on %s.\n", argv[1], mntpt); |
355 | |||
356 | exit(0); | 354 | exit(0); |
357 | } | 355 | } |
358 | #endif /* DEBUG */ | 356 | #endif /* DEBUG */ |