diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-09-08 07:33:44 (GMT) |
| commit | 525753e4a1a139e088d8ac120b19fbab6c0aaaa6 (patch) | |
| tree | 35cef28abb613da4f58e83f6abbe4bd4cfa244bf /abs/core-testing/util-linux-ng/fix-findmnt.patch | |
| parent | 592e3cad43ef12c53f523145d0fd981b54f2a049 (diff) | |
| parent | b172f79fadb565ecfbcec9508f9377d8618a4f4c (diff) | |
| download | linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.zip linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.gz linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/util-linux-ng/fix-findmnt.patch')
| -rw-r--r-- | abs/core-testing/util-linux-ng/fix-findmnt.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/abs/core-testing/util-linux-ng/fix-findmnt.patch b/abs/core-testing/util-linux-ng/fix-findmnt.patch new file mode 100644 index 0000000..bf6574c --- /dev/null +++ b/abs/core-testing/util-linux-ng/fix-findmnt.patch @@ -0,0 +1,24 @@ +commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 +Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> +Date: Sun Jul 4 20:02:57 2010 +0200 + + libmount: fix merge_optstr (do not truncate 3 trailing characters) + + I believe this is the correct fix. + + Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> + +diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c +index 5dbcfa6..680e1fc 100644 +--- a/shlibs/mount/src/tab_parse.c ++++ b/shlibs/mount/src/tab_parse.c +@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) + if (!strcmp(vfs, fs)) + return strdup(vfs); /* e.g. "aaa" and "aaa" */ + +- sz = strlen(vfs) + strlen(fs) + 2; ++ /* leave space for leading "r[ow],", "," and trailing zero */ ++ sz = strlen(vfs) + strlen(fs) + 5; + res = malloc(sz); + if (!res) + return NULL; |