1998-08-20 Roland McGrath <roland@baalperazim.frob.com>

	* return-buffer.c (iohelp_return_malloced_buffer): Moved here from
	../libfshelp/return-buffer.c and renamed from fshelp to iohelp.
	* iohelp.h (iohelp_return_malloced_buffer): Declare it.

2 files changed, 62 insertions, 3 deletions

diff --git a/libiohelp/iohelp.h b/libiohelp/iohelp.h
index e07993a0..13af41e5 100644
--- a/libiohelp/iohelp.h
+++ b/libiohelp/iohelp.h
@@ -1,5 +1,5 @@
-/* 
-   Copyright (C) 1993, 1994, 1996 Free Software Foundation
+/* Library providing helper functions for io servers.
+   Copyright (C) 1993, 94, 96, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -93,6 +93,15 @@ struct iouser *iohelp_create_iouser (struct idvec *uids, struct idvec *gids);
    newright.  */
 struct iouser *iohelp_reauth (auth_t authserver, mach_port_t rend_port,
 			      mach_port_t newright, int permit_failure);
-   
+
+
+/* Puts data from the malloced buffer BUF, LEN bytes long, into RBUF & RLEN,
+   suitable for returning from a mach rpc.  If LEN > 0, BUF is freed,
+   regardless of whether an error is returned or not.  */
+error_t iohelp_return_malloced_buffer (char *buf, size_t len,
+				       char **rbuf,
+				       mach_msg_type_number_t *rlen);
+
+
 
 #endif
diff --git a/libiohelp/return-buffer.c b/libiohelp/return-buffer.c
new file mode 100644
index 00000000..22f46e54
--- /dev/null
+++ b/libiohelp/return-buffer.c
@@ -0,0 +1,50 @@
+/* Make a malloced buffer suitable for returning from a mach rpc
+
+   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+
+   Written by Miles Bader <miles@gnu.org>
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   The GNU Hurd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include <string.h>
+#include <mach.h>
+
+#include "iohelp.h"
+
+/* Puts data from the malloced buffer BUF, LEN bytes long, into RBUF & RLEN,
+   suitable for returning from a mach rpc.  If LEN > 0, BUF is freed,
+   regardless of whether an error is returned or not.  */
+error_t
+iohelp_return_malloced_buffer (char *buf, size_t len,
+			       char **rbuf, mach_msg_type_number_t *rlen)
+{
+  error_t err = 0;
+
+  if (*rlen < len)
+    err = vm_allocate (mach_task_self (), (vm_address_t *)rbuf, len, 1);
+  if (! err)
+    {
+      if (len)
+	bcopy (buf, *rbuf, len);
+      *rlen = len;
+    }
+
+  if (len > 0)
+    free (buf);
+
+  return err;
+}