summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2005-12-23 11:49:53 +0000
committerphk <phk@FreeBSD.org>2005-12-23 11:49:53 +0000
commit4bbae65b4ad44162252f3f49c49b4cba57063cb0 (patch)
tree417a19a37e70c8fa0e859e7080fb4334ccc544bd
parent90a17769ede81e0557b6a36c11c49c104646d23a (diff)
downloadFreeBSD-src-4bbae65b4ad44162252f3f49c49b4cba57063cb0.zip
FreeBSD-src-4bbae65b4ad44162252f3f49c49b4cba57063cb0.tar.gz
Make sbuf_copyin() return the number of bytes copied on success.
Submitted by: "Wojciech A. Koszek" <dunstan@freebsd.czest.pl>
-rw-r--r--share/man/man9/sbuf.94
-rw-r--r--sys/kern/subr_sbuf.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 5fdb7aa..ca9aa85 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -337,6 +337,10 @@ and
return
.Dv NULL
and \-1, respectively, if the buffer overflowed.
+.Pp
+.Fn sbuf_copyin
+returns \-1 if copying string from userland failed, and number of bytes
+copied otherwise.
.Sh SEE ALSO
.Xr printf 3 ,
.Xr strcat 3 ,
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index efa9ad7..b340ee0 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -379,7 +379,7 @@ sbuf_copyin(struct sbuf *s, const void *uaddr, size_t len)
return (-1); /* XXX */
}
- return (0);
+ return (done);
}
#endif
OpenPOWER on IntegriCloud