[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21988 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21988 - in gnunet/src: include util |
Date: |
Thu, 14 Jun 2012 10:54:54 +0200 |
Author: grothoff
Date: 2012-06-14 10:54:54 +0200 (Thu, 14 Jun 2012)
New Revision: 21988
Modified:
gnunet/src/include/gnunet_disk_lib.h
gnunet/src/util/disk.c
Log:
-needing yet another API to box stdin for scheduler reading, not ported to W32
yet
Modified: gnunet/src/include/gnunet_disk_lib.h
===================================================================
--- gnunet/src/include/gnunet_disk_lib.h 2012-06-14 08:51:48 UTC (rev
21987)
+++ gnunet/src/include/gnunet_disk_lib.h 2012-06-14 08:54:54 UTC (rev
21988)
@@ -425,6 +425,7 @@
struct GNUNET_DISK_PipeHandle *
GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2]);
+
/**
* Closes an interprocess channel
* @param p pipe
@@ -433,6 +434,7 @@
int
GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p);
+
/**
* Closes one half of an interprocess channel
*
@@ -465,7 +467,19 @@
GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p,
enum GNUNET_DISK_PipeEnd n);
+
/**
+ * Get a handle from a native FD.
+ *
+ * @param fd native file descriptor
+ * @return file handle corresponding to the descriptor
+ */
+const struct GNUNET_DISK_FileHandle *
+GNUNET_DISK_get_handle_from_native (FILE *fd);
+
+
+
+/**
* Read the contents of a binary file into a buffer.
* @param h handle to an open file
* @param result the buffer to write the result to
@@ -476,6 +490,7 @@
GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h, void *result,
size_t len);
+
/**
* Read the contents of a binary file into a buffer.
* Guarantees not to block (returns GNUNET_SYSERR and sets errno to EAGAIN
@@ -488,8 +503,9 @@
*/
ssize_t
GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h,
- void *result, size_t len);
+ void *result, size_t len);
+
/**
* Read the contents of a binary file into a buffer.
*
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2012-06-14 08:51:48 UTC (rev 21987)
+++ gnunet/src/util/disk.c 2012-06-14 08:54:54 UTC (rev 21988)
@@ -1775,6 +1775,33 @@
/**
+ * Get a handle from a native FD.
+ *
+ * @param fd native file descriptor
+ * @return file handle corresponding to the descriptor
+ */
+struct GNUNET_DISK_FileHandle *
+GNUNET_DISK_get_handle_from_native (FILE *fd)
+{
+#if MINGW
+ // FIXME: LRN help!
+ GNUNET_break (0);
+ return NULL;
+#else
+ struct GNUNET_DISK_FileHandle *fh;
+ int fno;
+
+ fno = fileno (fd);
+ if (-1 == fno)
+ return NULL;
+ fh = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+ fh->fd = fno;
+ return fh;
+#endif
+}
+
+
+/**
* Construct full path to a file inside of the private
* directory used by GNUnet. Also creates the corresponding
* directory. If the resulting name is supposed to be
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21988 - in gnunet/src: include util,
gnunet <=