wok annotate util-linux/stuff/fix-findmnt.patch @ rev 14438
Add python-phonenumbers
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Apr 25 12:56:03 2013 +0200 (2013-04-25) |
parents | cb53e0d30346 |
children |
rev | line source |
---|---|
slaxemulator@6520 | 1 commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 |
slaxemulator@6520 | 2 Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> |
slaxemulator@6520 | 3 Date: Sun Jul 4 20:02:57 2010 +0200 |
slaxemulator@6520 | 4 |
slaxemulator@6520 | 5 libmount: fix merge_optstr (do not truncate 3 trailing characters) |
slaxemulator@6520 | 6 |
slaxemulator@6520 | 7 I believe this is the correct fix. |
slaxemulator@6520 | 8 |
slaxemulator@6520 | 9 Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> |
slaxemulator@6520 | 10 |
slaxemulator@6520 | 11 diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c |
slaxemulator@6520 | 12 index 5dbcfa6..680e1fc 100644 |
slaxemulator@6520 | 13 --- a/shlibs/mount/src/tab_parse.c |
slaxemulator@6520 | 14 +++ b/shlibs/mount/src/tab_parse.c |
slaxemulator@6520 | 15 @@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) |
slaxemulator@6520 | 16 if (!strcmp(vfs, fs)) |
slaxemulator@6520 | 17 return strdup(vfs); /* e.g. "aaa" and "aaa" */ |
slaxemulator@6520 | 18 |
slaxemulator@6520 | 19 - sz = strlen(vfs) + strlen(fs) + 2; |
slaxemulator@6520 | 20 + /* leave space for leading "r[ow],", "," and trailing zero */ |
slaxemulator@6520 | 21 + sz = strlen(vfs) + strlen(fs) + 5; |
slaxemulator@6520 | 22 res = malloc(sz); |
slaxemulator@6520 | 23 if (!res) |
slaxemulator@6520 | 24 return NULL; |