a0e17f7df
Denis Vlasenko
2008-05-26
Subject
[u]mount: add/update dietlibc build fix
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/mount.c+3 -3
| @@ -46,11 +46,11 @@ | |
| #if defined(__dietlibc__) | |
| /* 16.12.2006, Sampo Kellomaki ([email protected]) | |
| * 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 | |
util-linux/umount.c+11 -0
| @@ -11,6 +11,17 @@ | |
| #include <mntent.h> | |
| #include "libbb.h" | |
| + | #if defined(__dietlibc__) |
| + | /* 16.12.2006, Sampo Kellomaki ([email protected]) |
| + | * 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) | |