/*
This file is part of GNUnet.
- (C) 2006, 2009, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2006, 2009, 2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file util/bio.c
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_bio_lib.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
+#ifndef PATH_MAX
+/**
+ * Assumed maximum path length (for source file names).
+ */
+#define PATH_MAX 4096
+#endif
+
+
/**
* Size for I/O buffers.
- */
+ */
#define BIO_BUFFER_SIZE 65536
/**
* @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h,
+GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h,
const char *what,
void *result, size_t len)
{
{
if (min > len - pos)
min = len - pos;
- memcpy (&dst[pos], &h->buffer[h->pos], min);
+ GNUNET_memcpy (&dst[pos], &h->buffer[h->pos], min);
h->pos += min;
pos += min;
}
if (0 == ret)
{
GNUNET_asprintf (&h->emsg,
- _("Error reading `%s': %s"),
+ _("Error reading `%s': %s"),
what,
_("End of file"));
return GNUNET_SYSERR;
* @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
- const char *file,
+GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h,
+ const char *file,
int line,
- void *result,
+ void *result,
size_t len)
{
- char what[1024];
+ char what[PATH_MAX + 1024];
GNUNET_snprintf (what, sizeof (what), "%s:%d", file, line);
return GNUNET_BIO_read (h, what, result, len);
* @param what describes what is being read (for error message creation)
* @param result the buffer to store a pointer to the (allocated) string to
* (note that *result could be set to NULL as well)
- * @param maxLen maximum allowed length for the string
+ * @param max_length maximum allowed length for the string
* @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h, const char *what,
- char **result, size_t maxLen)
+GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
+ const char *what,
+ char **result,
+ size_t max_length)
{
char *buf;
uint32_t big;
*result = NULL;
return GNUNET_OK;
}
- if (big > maxLen)
+ if (big > max_length)
{
GNUNET_asprintf (&h->emsg, _("String `%s' longer than allowed (%u > %u)"),
- what, big, maxLen);
+ what, big, max_length);
return GNUNET_SYSERR;
}
buf = GNUNET_malloc (big);
* @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
int
-GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h, const char *what,
+GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
+ const char *what,
struct GNUNET_CONTAINER_MetaData **result)
{
uint32_t size;
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h,
+GNUNET_BIO_read_int64__ (struct GNUNET_BIO_ReadHandle *h,
const char *file,
- int line, int64_t * i)
+ int line,
+ int64_t *i)
{
int64_t big;
* Underlying file handle.
*/
struct GNUNET_DISK_FileHandle *fd;
-
+
/**
* I/O buffer. Do not free, allocated at the end of the struct.
*/
min = h->size - h->have;
if (min > n - pos)
min = n - pos;
- memcpy (&h->buffer[h->have], &src[pos], min);
+ GNUNET_memcpy (&h->buffer[h->have], &src[pos], min);
pos += min;
h->have += min;
if (pos == n)
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_write_string (struct GNUNET_BIO_WriteHandle *h,
+GNUNET_BIO_write_string (struct GNUNET_BIO_WriteHandle *h,
const char *s)
{
uint32_t slen;
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_write_int32 (struct GNUNET_BIO_WriteHandle *h,
+GNUNET_BIO_write_int32 (struct GNUNET_BIO_WriteHandle *h,
int32_t i)
{
int32_t big;
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-GNUNET_BIO_write_int64 (struct GNUNET_BIO_WriteHandle *h,
+GNUNET_BIO_write_int64 (struct GNUNET_BIO_WriteHandle *h,
int64_t i)
{
int64_t big;