Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/util-linux/patches/util-linux-2.18-fix-findmnt.patch

    Contents of /trunk/util-linux/patches/util-linux-2.18-fix-findmnt.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1079 - (show annotations) (download)
    Tue Aug 17 15:47:18 2010 UTC (13 years, 9 months ago) by niro
    File size: 874 byte(s) 
    fix mount issues
    1 commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4
    2 Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
    3 Date: Sun Jul 4 20:02:57 2010 +0200
    4
    5 libmount: fix merge_optstr (do not truncate 3 trailing characters)
    6
    7 I believe this is the correct fix.
    8
    9 Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
    10
    11 diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
    12 index 5dbcfa6..680e1fc 100644
    13 --- a/shlibs/mount/src/tab_parse.c
    14 +++ b/shlibs/mount/src/tab_parse.c
    15 @@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs)
    16 if (!strcmp(vfs, fs))
    17 return strdup(vfs); /* e.g. "aaa" and "aaa" */
    18
    19 - sz = strlen(vfs) + strlen(fs) + 2;
    20 + /* leave space for leading "r[ow],", "," and trailing zero */
    21 + sz = strlen(vfs) + strlen(fs) + 5;
    22 res = malloc(sz);
    23 if (!res)
    24 return NULL;