Module Name: src
Committed By: manu
Date: Fri Aug 29 04:58:40 UTC 2014
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
We used to remove the trailing zeros in FUSE readlink replies, but
it seems it does not always happen. Just remove them if present.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.69 src/lib/libperfuse/ops.c:1.70
--- src/lib/libperfuse/ops.c:1.69 Tue Aug 19 15:29:14 2014
+++ src/lib/libperfuse/ops.c Fri Aug 29 04:58:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.69 2014/08/19 15:29:14 manu Exp $ */
+/* $NetBSD: ops.c,v 1.70 2014/08/29 04:58:40 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -2633,12 +2633,16 @@ perfuse_node_readlink(struct puffs_userm
if (len == 0)
DERRX(EX_PROTOCOL, "path len = %zd too short", len);
+ (void)memcpy(linkname, _GET_OUTPAYLOAD(ps, pm, char *), len);
+
/*
* FUSE filesystems return a NUL terminated string, we
- * do not want to trailing \0
+ * do not want the trailing \0
*/
- *linklen = len - 1;
- (void)memcpy(linkname, _GET_OUTPAYLOAD(ps, pm, char *), len);
+ while (len > 0 && linkname[len - 1] == '\0')
+ len--;
+
+ *linklen = len;
ps->ps_destroy_msg(pm);
error = 0;
