diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-07 16:24:46 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-07 16:24:46 +0000 |
commit | 5625415085e68ac5e150f54e685417c866620d76 (patch) | |
tree | 4146667d4080f97bc39ac96d844c01a8956aeeca /e2fsprogs | |
parent | 890ac9deb2cc57cadd7aba4ee91bd012e19e239d (diff) | |
download | busybox-w32-5625415085e68ac5e150f54e685417c866620d76.tar.gz busybox-w32-5625415085e68ac5e150f54e685417c866620d76.tar.bz2 busybox-w32-5625415085e68ac5e150f54e685417c866620d76.zip |
dd: make it recognize not only 'k' but 'K' too;
make it (partially) CONFIG_LFS-aware
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/chattr.c | 8 | ||||
-rw-r--r-- | e2fsprogs/lsattr.c | 8 | ||||
-rw-r--r-- | e2fsprogs/util.c | 9 |
3 files changed, 2 insertions, 23 deletions
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c index 2cb75e86f..618d8c440 100644 --- a/e2fsprogs/chattr.c +++ b/e2fsprogs/chattr.c | |||
@@ -53,14 +53,6 @@ static unsigned long af; | |||
53 | static unsigned long rf; | 53 | static unsigned long rf; |
54 | static unsigned long sf; | 54 | static unsigned long sf; |
55 | 55 | ||
56 | #ifdef CONFIG_LFS | ||
57 | # define LSTAT lstat64 | ||
58 | # define STRUCT_STAT struct stat64 | ||
59 | #else | ||
60 | # define LSTAT lstat | ||
61 | # define STRUCT_STAT struct stat | ||
62 | #endif | ||
63 | |||
64 | struct flags_char { | 56 | struct flags_char { |
65 | unsigned long flag; | 57 | unsigned long flag; |
66 | char optchar; | 58 | char optchar; |
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c index e76f8d9d7..1b7cf44aa 100644 --- a/e2fsprogs/lsattr.c +++ b/e2fsprogs/lsattr.c | |||
@@ -41,14 +41,6 @@ | |||
41 | #define OPT_GENERATION 16 | 41 | #define OPT_GENERATION 16 |
42 | static int flags; | 42 | static int flags; |
43 | 43 | ||
44 | #ifdef CONFIG_LFS | ||
45 | # define LSTAT lstat64 | ||
46 | # define STRUCT_STAT struct stat64 | ||
47 | #else | ||
48 | # define LSTAT lstat | ||
49 | # define STRUCT_STAT struct stat | ||
50 | #endif | ||
51 | |||
52 | static void list_attributes(const char *name) | 44 | static void list_attributes(const char *name) |
53 | { | 45 | { |
54 | unsigned long fsflags; | 46 | unsigned long fsflags; |
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c index efb128f59..aaee50ae6 100644 --- a/e2fsprogs/util.c +++ b/e2fsprogs/util.c | |||
@@ -33,13 +33,8 @@ void proceed_question(void) | |||
33 | void check_plausibility(const char *device, int force) | 33 | void check_plausibility(const char *device, int force) |
34 | { | 34 | { |
35 | int val; | 35 | int val; |
36 | #ifdef CONFIG_LFS | 36 | STRUCT_STAT s; |
37 | struct stat64 s; | 37 | val = STAT(device, &s); |
38 | val = stat64(device, &s); | ||
39 | #else | ||
40 | struct stat s; | ||
41 | val = stat(device, &s); | ||
42 | #endif | ||
43 | if (force) | 38 | if (force) |
44 | return; | 39 | return; |
45 | if(val == -1) | 40 | if(val == -1) |