323 lines
9 KiB
Diff
323 lines
9 KiB
Diff
From: Tias Guns <tias@ulyssis.org>
|
|
Date: Sun, 18 Mar 2012 14:12:41 +0000
|
|
Subject: [PATCH] android: fix 'mount', 'umount', 'fsck', 'df'
|
|
|
|
patch modified from 'Bionic Patch V1.0 (Vitaly Greck)'
|
|
https://code.google.com/p/busybox-android/downloads/detail?name=patch
|
|
---
|
|
libbb/Kbuild.src | 3 +
|
|
libbb/mntent_r.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 291 insertions(+)
|
|
create mode 100644 libbb/mntent_r.c
|
|
|
|
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
|
|
index 61eec26..d456c3d 100644
|
|
--- a/libbb/Kbuild.src
|
|
+++ b/libbb/Kbuild.src
|
|
@@ -115,6 +115,9 @@ lib-y += xgethostbyname.o
|
|
lib-y += xreadlink.o
|
|
lib-y += xrealloc_vector.o
|
|
|
|
+# for android-busybox-ndk
|
|
+lib-y += mntent_r.o
|
|
+
|
|
lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o
|
|
|
|
lib-$(CONFIG_FEATURE_UTMP) += utmp.o
|
|
diff --git a/libbb/mntent_r.c b/libbb/mntent_r.c
|
|
new file mode 100644
|
|
index 0000000..1077487
|
|
--- /dev/null
|
|
+++ b/libbb/mntent_r.c
|
|
@@ -0,0 +1,288 @@
|
|
+/* Utilities for reading/writing fstab, mtab, etc.
|
|
+ Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010, 2011
|
|
+ Free Software Foundation, Inc.
|
|
+ This file is part of the GNU C Library.
|
|
+
|
|
+ The GNU C Library is free software; you can redistribute it and/or
|
|
+ modify it under the terms of the GNU Lesser General Public
|
|
+ License as published by the Free Software Foundation; either
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
|
+
|
|
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ Lesser General Public License for more details.
|
|
+
|
|
+ You should have received a copy of the GNU Lesser General Public
|
|
+ License along with the GNU C Library; if not, see
|
|
+ <http://www.gnu.org/licenses/>. */
|
|
+
|
|
+// file extracted from patch 'Bionic Patch V1.0 (Vitaly Greck)':
|
|
+// https://busybox-android.googlecode.com/files/patch
|
|
+//
|
|
+// looks like its based on misc/mntent_r.c from glibc,
|
|
+// contains all fixes in current master (2012-03-19),
|
|
+// but is not source identical (mostly stuff removed)
|
|
+// using the upstream one fails to build
|
|
+
|
|
+
|
|
+#include <alloca.h>
|
|
+#include <mntent.h>
|
|
+#include <stdio.h>
|
|
+#include <string.h>
|
|
+#include <sys/types.h>
|
|
+
|
|
+
|
|
+/* Prepare to begin reading and/or writing mount table entries from the
|
|
+ beginning of FILE. MODE is as for `fopen'. */
|
|
+FILE *setmntent (const char *file, const char *mode)
|
|
+{
|
|
+ /* Extend the mode parameter with "c" to disable cancellation in the
|
|
+ I/O functions and "e" to set FD_CLOEXEC. */
|
|
+ size_t modelen = strlen (mode);
|
|
+ char newmode[modelen + 3];
|
|
+ memcpy (newmode, mode, modelen);
|
|
+ memcpy (newmode + modelen, "ce", 3);
|
|
+ FILE *result = fopen (file, newmode);
|
|
+
|
|
+ return result;
|
|
+}
|
|
+
|
|
+
|
|
+/* Close a stream opened with `setmntent'. */
|
|
+int endmntent (FILE *stream)
|
|
+{
|
|
+ if (stream) /* SunOS 4.x allows for NULL stream */
|
|
+ fclose (stream);
|
|
+ return 1; /* SunOS 4.x says to always return 1 */
|
|
+}
|
|
+
|
|
+
|
|
+/* Since the values in a line are separated by spaces, a name cannot
|
|
+ contain a space. Therefore some programs encode spaces in names
|
|
+ by the strings "\040". We undo the encoding when reading an entry.
|
|
+ The decoding happens in place. */
|
|
+static char *
|
|
+decode_name (char *buf)
|
|
+{
|
|
+ char *rp = buf;
|
|
+ char *wp = buf;
|
|
+
|
|
+ do
|
|
+ if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '4' && rp[3] == '0')
|
|
+ {
|
|
+ /* \040 is a SPACE. */
|
|
+ *wp++ = ' ';
|
|
+ rp += 3;
|
|
+ }
|
|
+ else if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '1' && rp[3] == '1')
|
|
+ {
|
|
+ /* \011 is a TAB. */
|
|
+ *wp++ = '\t';
|
|
+ rp += 3;
|
|
+ }
|
|
+ else if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '1' && rp[3] == '2')
|
|
+ {
|
|
+ /* \012 is a NEWLINE. */
|
|
+ *wp++ = '\n';
|
|
+ rp += 3;
|
|
+ }
|
|
+ else if (rp[0] == '\\' && rp[1] == '\\')
|
|
+ {
|
|
+ /* We have to escape \\ to be able to represent all characters. */
|
|
+ *wp++ = '\\';
|
|
+ rp += 1;
|
|
+ }
|
|
+ else if (rp[0] == '\\' && rp[1] == '1' && rp[2] == '3' && rp[3] == '4')
|
|
+ {
|
|
+ /* \134 is also \\. */
|
|
+ *wp++ = '\\';
|
|
+ rp += 3;
|
|
+ }
|
|
+ else
|
|
+ *wp++ = *rp;
|
|
+ while (*rp++ != '\0');
|
|
+
|
|
+ return buf;
|
|
+}
|
|
+
|
|
+
|
|
+/* Read one mount table entry from STREAM. Returns a pointer to storage
|
|
+ reused on the next call, or null for EOF or error (use feof/ferror to
|
|
+ check). */
|
|
+struct mntent *getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz)
|
|
+{
|
|
+ char *cp;
|
|
+ char *head;
|
|
+
|
|
+ do
|
|
+ {
|
|
+ char *end_ptr;
|
|
+
|
|
+ if (fgets (buffer, bufsiz, stream) == NULL)
|
|
+ {
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ end_ptr = strchr (buffer, '\n');
|
|
+ if (end_ptr != NULL) /* chop newline */
|
|
+ *end_ptr = '\0';
|
|
+ else
|
|
+ {
|
|
+ /* Not the whole line was read. Do it now but forget it. */
|
|
+ char tmp[1024];
|
|
+ while (fgets (tmp, sizeof tmp, stream) != NULL)
|
|
+ if (strchr (tmp, '\n') != NULL)
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ head = buffer + strspn (buffer, " \t");
|
|
+ /* skip empty lines and comment lines: */
|
|
+ }
|
|
+ while (head[0] == '\0' || head[0] == '#');
|
|
+
|
|
+ cp = strsep (&head, " \t");
|
|
+ mp->mnt_fsname = cp != NULL ? decode_name (cp) : (char *) "";
|
|
+ if (head)
|
|
+ head += strspn (head, " \t");
|
|
+ cp = strsep (&head, " \t");
|
|
+ mp->mnt_dir = cp != NULL ? decode_name (cp) : (char *) "";
|
|
+ if (head)
|
|
+ head += strspn (head, " \t");
|
|
+ cp = strsep (&head, " \t");
|
|
+ mp->mnt_type = cp != NULL ? decode_name (cp) : (char *) "";
|
|
+ if (head)
|
|
+ head += strspn (head, " \t");
|
|
+ cp = strsep (&head, " \t");
|
|
+ mp->mnt_opts = cp != NULL ? decode_name (cp) : (char *) "";
|
|
+ switch (head ? sscanf (head, " %d %d ", &mp->mnt_freq, &mp->mnt_passno) : 0)
|
|
+ {
|
|
+ case 0:
|
|
+ mp->mnt_freq = 0;
|
|
+ case 1:
|
|
+ mp->mnt_passno = 0;
|
|
+ case 2:
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return mp;
|
|
+}
|
|
+
|
|
+struct mntent *getmntent (FILE *stream)
|
|
+{
|
|
+ static struct mntent m;
|
|
+ static char *getmntent_buffer;
|
|
+
|
|
+ #define BUFFER_SIZE 4096
|
|
+ if (getmntent_buffer == NULL) {
|
|
+ getmntent_buffer = (char *) malloc (BUFFER_SIZE);
|
|
+ }
|
|
+
|
|
+ return getmntent_r (stream, &m, getmntent_buffer, BUFFER_SIZE);
|
|
+ #undef BUFFER_SIZE
|
|
+}
|
|
+
|
|
+
|
|
+/* We have to use an encoding for names if they contain spaces or tabs.
|
|
+ To be able to represent all characters we also have to escape the
|
|
+ backslash itself. This "function" must be a macro since we use
|
|
+ `alloca'. */
|
|
+#define encode_name(name) \
|
|
+ do { \
|
|
+ const char *rp = name; \
|
|
+ \
|
|
+ while (*rp != '\0') \
|
|
+ if (*rp == ' ' || *rp == '\t' || *rp == '\n' || *rp == '\\') \
|
|
+ break; \
|
|
+ else \
|
|
+ ++rp; \
|
|
+ \
|
|
+ if (*rp != '\0') \
|
|
+ { \
|
|
+ /* In the worst case the length of the string can increase to \
|
|
+ four times the current length. */ \
|
|
+ char *wp; \
|
|
+ \
|
|
+ rp = name; \
|
|
+ name = wp = (char *) alloca (strlen (name) * 4 + 1); \
|
|
+ \
|
|
+ do \
|
|
+ if (*rp == ' ') \
|
|
+ { \
|
|
+ *wp++ = '\\'; \
|
|
+ *wp++ = '0'; \
|
|
+ *wp++ = '4'; \
|
|
+ *wp++ = '0'; \
|
|
+ } \
|
|
+ else if (*rp == '\t') \
|
|
+ { \
|
|
+ *wp++ = '\\'; \
|
|
+ *wp++ = '0'; \
|
|
+ *wp++ = '1'; \
|
|
+ *wp++ = '1'; \
|
|
+ } \
|
|
+ else if (*rp == '\n') \
|
|
+ { \
|
|
+ *wp++ = '\\'; \
|
|
+ *wp++ = '0'; \
|
|
+ *wp++ = '1'; \
|
|
+ *wp++ = '2'; \
|
|
+ } \
|
|
+ else if (*rp == '\\') \
|
|
+ { \
|
|
+ *wp++ = '\\'; \
|
|
+ *wp++ = '\\'; \
|
|
+ } \
|
|
+ else \
|
|
+ *wp++ = *rp; \
|
|
+ while (*rp++ != '\0'); \
|
|
+ } \
|
|
+ } while (0)
|
|
+
|
|
+
|
|
+/* Write the mount table entry described by MNT to STREAM.
|
|
+ Return zero on success, nonzero on failure. */
|
|
+int addmntent (FILE *stream, const struct mntent *mnt)
|
|
+{
|
|
+ struct mntent mntcopy = *mnt;
|
|
+ if (fseek (stream, 0, SEEK_END))
|
|
+ return 1;
|
|
+
|
|
+ /* Encode spaces and tabs in the names. */
|
|
+ encode_name (mntcopy.mnt_fsname);
|
|
+ encode_name (mntcopy.mnt_dir);
|
|
+ encode_name (mntcopy.mnt_type);
|
|
+ encode_name (mntcopy.mnt_opts);
|
|
+
|
|
+ return (fprintf (stream, "%s %s %s %s %d %d\n",
|
|
+ mntcopy.mnt_fsname,
|
|
+ mntcopy.mnt_dir,
|
|
+ mntcopy.mnt_type,
|
|
+ mntcopy.mnt_opts,
|
|
+ mntcopy.mnt_freq,
|
|
+ mntcopy.mnt_passno) < 0
|
|
+ || fflush (stream) != 0);
|
|
+}
|
|
+
|
|
+
|
|
+/* Search MNT->mnt_opts for an option matching OPT.
|
|
+ Returns the address of the substring, or null if none found. */
|
|
+char *hasmntopt (const struct mntent *mnt, const char *opt)
|
|
+{
|
|
+ const size_t optlen = strlen (opt);
|
|
+ char *rest = mnt->mnt_opts, *p;
|
|
+
|
|
+ while ((p = strstr (rest, opt)) != NULL)
|
|
+ {
|
|
+ if ((p == rest || p[-1] == ',')
|
|
+ && (p[optlen] == '\0' || p[optlen] == '=' || p[optlen] == ','))
|
|
+ return p;
|
|
+
|
|
+ rest = strchr (p, ',');
|
|
+ if (rest == NULL)
|
|
+ break;
|
|
+ ++rest;
|
|
+ }
|
|
+
|
|
+ return NULL;
|
|
+}
|
|
--
|
|
1.7.10.4
|
|
|