diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-26 01:19:53 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-26 01:19:53 +0000 |
| commit | a0e17f7df6d4c65ecab7339e9899b294ff8bc04e (patch) | |
| tree | 6a78ba6cbfadf1eed88d81c2323138bdddb7da70 | |
| parent | b267ed95bc8141dbf14b276d4aef0fb8e2f5dda7 (diff) | |
| download | busybox-a0e17f7df6d4c65ecab7339e9899b294ff8bc04e.tar.gz | |
[u]mount: add/update dietlibc build fix
| -rw-r--r-- | util-linux/mount.c | 6 | ||||
| -rw-r--r-- | util-linux/umount.c | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 3cfbc5600..2efa77644 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -46,11 +46,11 @@ #if defined(__dietlibc__) /* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) * dietlibc-0.30 does not have implementation of getmntent_r() */ -static struct mntent *getmntent_r(FILE* stream, struct mntent* result, char* buffer, int bufsize) +static struct mntent *getmntent_r(FILE* stream, struct mntent* result, + char* buffer ATTRIBUTE_UNUSED, int bufsize ATTRIBUTE_UNUSED) { struct mntent* ment = getmntent(stream); - memcpy(result, ment, sizeof(struct mntent)); - return result; + return memcpy(result, ment, sizeof(*ment)); } #endif diff --git a/util-linux/umount.c b/util-linux/umount.c index 34c979e0c..9fa3cd2d3 100644 --- a/util-linux/umount.c +++ b/util-linux/umount.c @@ -11,6 +11,17 @@ #include <mntent.h> #include "libbb.h" +#if defined(__dietlibc__) +/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) + * dietlibc-0.30 does not have implementation of getmntent_r() */ +static struct mntent *getmntent_r(FILE* stream, struct mntent* result, + char* buffer ATTRIBUTE_UNUSED, int bufsize ATTRIBUTE_UNUSED) +{ + struct mntent* ment = getmntent(stream); + return memcpy(result, ment, sizeof(*ment)); +} +#endif + /* ignored: -v -d -t -i */ #define OPTION_STRING "fldnra" "vdt:i" #define OPT_FORCE (1 << 0) |