emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[u]mount: add/update dietlibc build fix

Browse Source
This commit is contained in:
Denis Vlasenko 2008-05-26 01:19:53 +00:00
parent b267ed95bc
commit a0e17f7df6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util-linux/mount.c
View File

@ -46,11 +46,11 @@
#if defined(__dietlibc__) #if defined(__dietlibc__)
/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) /* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
* dietlibc-0.30 does not have implementation of getmntent_r() */ * 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); struct mntent* ment = getmntent(stream);
memcpy(result, ment, sizeof(struct mntent)); return memcpy(result, ment, sizeof(*ment));
return result;
} }
#endif #endif

11
util-linux/umount.c
View File

@ -11,6 +11,17 @@
#include <mntent.h> #include <mntent.h>
#include "libbb.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 */ /* ignored: -v -d -t -i */
#define OPTION_STRING "fldnra" "vdt:i" #define OPTION_STRING "fldnra" "vdt:i"
#define OPT_FORCE (1 << 0) #define OPT_FORCE (1 << 0)