SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/util-linux-ng/stuff/fix-findmnt.patch	Tue May 17 15:18:51 2011 +0200
     1.3 @@ -0,0 +1,24 @@
     1.4 +commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4
     1.5 +Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
     1.6 +Date:   Sun Jul 4 20:02:57 2010 +0200
     1.7 +
     1.8 +    libmount: fix merge_optstr (do not truncate 3 trailing characters)
     1.9 +    
    1.10 +    I believe this is the correct fix.
    1.11 +    
    1.12 +    Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
    1.13 +
    1.14 +diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
    1.15 +index 5dbcfa6..680e1fc 100644
    1.16 +--- a/shlibs/mount/src/tab_parse.c
    1.17 ++++ b/shlibs/mount/src/tab_parse.c
    1.18 +@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs)
    1.19 + 	if (!strcmp(vfs, fs))
    1.20 + 		return strdup(vfs);		/* e.g. "aaa" and "aaa" */
    1.21 + 
    1.22 +-	sz = strlen(vfs) + strlen(fs) + 2;
    1.23 ++	/* leave space for leading "r[ow],", "," and trailing zero */
    1.24 ++	sz = strlen(vfs) + strlen(fs) + 5;
    1.25 + 	res = malloc(sz);
    1.26 + 	if (!res)
    1.27 + 		return NULL;