v9fs: v9fs_put_str fix
Latchesar Ionkov
maintainerPATCH 1/1 v9fs: v9fs_put_str fix
v9fs_put_str used to store pointer to the source string, instead of the cbuf copy. This patch corrects it.
Signed-off-by Latchesar Ionkov <[email protected]>
---
commit aa0bbbe2e9c8a9ed97c76345359bcc1935b849f3
tree d0016e07087ee4f1dabbda70b3708f4d39e2e341
parent 80543589e5ab35e0fda3e97f93108f136eb4e623
author Latchesar Ionkov <[email protected]> Mon, 23 Jan 2006 08:01:34 -0500 committer Latchesar Ionkov <[email protected]> Mon, 23 Jan 2006 08:01:34 -0500
fs/9p/conv.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-)
fs/9p/conv.c +19 -9
@@ -116,13 +116,19 @@ static void buf_put_int64(struct cbuf *b } } -static void buf_put_stringn (struct cbuf *buf,const char *s,u16 slen) +static char *buf_put_stringn (struct cbuf *buf,const char *s,u16 slen) { +char *ret; + + ret =NULL ;if (buf_check_size (buf, slen +2 )) {buf_put_int16 (buf, slen); + ret = buf->p;memcpy (buf->p, s, slen); buf->p += slen; } + +return ret; }static inline void buf_put_string (struct cbuf *buf,const char *s)
@@ -430,15 +436,19 @@ static inline void v9fs_put_int64(structstatic void v9fs_put_str (struct cbuf *bufp,char *data,struct v9fs_str *str) { -if (data) { - str->len =strlen (data); - str->str = bufp->p; - }else { - str->len =0 ; - str->str =NULL ; - } +int len; +char *s; + +if (data) + len =strlen (data); +else + len =0 ; -buf_put_stringn (bufp, data, str->len); + s =buf_put_stringn (bufp, data, len); +if (str) { + str->len = len; + str->str = s; + } } static int