[u]mount: add/update dietlibc build fix

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 3cfbc5600fa70395b5f830f38734f0d31b379122..2efa7764439c3f79f70b035154354ceba5fda7d5 100644 (file)
--- 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 34c979e0c12e47c090630d54fa638f7ca8fa25b7..9fa3cd2d305f3c7c9233e24dbe9b2d3a6b73f57c 100644 (file)
--- 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)