#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
-#define DEBUG_NPIPE GNUNET_EXTRA_LOGGING
-
-#define DEBUG_PIPE GNUNET_EXTRA_LOGGING
-
/**
* Block size for IO for copying files.
*/
-#if defined(LINUX) || defined(CYGWIN)
+#if defined(LINUX) || defined(CYGWIN) || defined(GNU)
#include <sys/vfs.h>
#else
#if defined(SOMEBSD) || defined(DARWIN)
{
/**
* File descriptors for the pipe.
+ * One or both of them could be NULL.
*/
struct GNUNET_DISK_FileHandle *fd[2];
};
};
+#ifndef MINGW
+/**
+ * Translate GNUnet-internal permission bitmap to UNIX file
+ * access permission bitmap.
+ *
+ * @param perm file permissions, GNUnet style
+ * @return file permissions, UNIX style
+ */
static int
translate_unix_perms (enum GNUNET_DISK_AccessPermissions perm)
{
return mode;
}
+#endif
/**
#ifdef HAVE_STAT64
if (0 != STAT64 (fn, &buf))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat64", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_DEBUG, "stat64", fn);
return GNUNET_SYSERR;
}
#else
if (0 != STAT (fn, &buf))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_DEBUG, "stat", fn);
return GNUNET_SYSERR;
}
#endif
}
#ifdef MINGW
- LARGE_INTEGER li, new_pos;
+ LARGE_INTEGER li;
+ LARGE_INTEGER new_pos;
BOOL b;
- static DWORD t[] = {[GNUNET_DISK_SEEK_SET] = FILE_BEGIN,
- [GNUNET_DISK_SEEK_CUR] = FILE_CURRENT,[GNUNET_DISK_SEEK_END] = FILE_END
- };
+ static DWORD t[] = { FILE_BEGIN, FILE_CURRENT, FILE_END };
li.QuadPart = offset;
b = SetFilePointerEx (h->h, li, &new_pos, t[whence]);
}
return (OFF_T) new_pos.QuadPart;
#else
- static int t[] = {[GNUNET_DISK_SEEK_SET] = SEEK_SET,
- [GNUNET_DISK_SEEK_CUR] = SEEK_CUR,[GNUNET_DISK_SEEK_END] = SEEK_END
- };
+ static int t[] = { SEEK_SET, SEEK_CUR, SEEK_END };
return lseek (h->fd, offset, t[whence]);
#endif
/**
- * Create an (empty) temporary file on disk. If the given name is not
- * an absolute path, the current 'TMPDIR' will be prepended. In any case,
- * 6 random characters will be appended to the name to create a unique
- * filename.
+ * Create the name for a temporary file or directory from a template.
*
- * @param t component to use for the name;
- * does NOT contain "XXXXXX" or "/tmp/".
- * @return NULL on error, otherwise name of fresh
- * file on disk in directory for temporary files
+ * @param t template (without XXXXX or "/tmp/")
+ * @return name ready for passing to 'mktemp' or 'mkdtemp', NULL on error
*/
-char *
-GNUNET_DISK_mktemp (const char *t)
+static char *
+mktemp_name (const char *t)
{
const char *tmpdir;
- int fd;
char *tmpl;
char *fn;
{
/* FIXME: This uses system codepage on W32, not UTF-8 */
tmpdir = getenv ("TMPDIR");
- tmpdir = tmpdir ? tmpdir : "/tmp";
+ if (NULL == tmpdir)
+ tmpdir = getenv ("TMP");
+ if (NULL == tmpdir)
+ tmpdir = getenv ("TEMP");
+ if (NULL == tmpdir)
+ tmpdir = "/tmp";
GNUNET_asprintf (&tmpl, "%s/%s%s", tmpdir, t, "XXXXXX");
}
else
#else
fn = tmpl;
#endif
- /* FIXME: why is this not MKSTEMP()? This function is implemented in plibc.
- * CG: really? If I put MKSTEMP here, I get a compilation error...
- * It will assume that fn is UTF-8-encoded, if compiled with UTF-8 support.
- */
- fd = mkstemp (fn);
- if (fd == -1)
+ return fn;
+}
+
+
+#if WINDOWS
+static char *
+mkdtemp (char *fn)
+{
+ char *random_fn;
+ char *tfn;
+
+ while (1)
+ {
+ tfn = GNUNET_strdup (fn);
+ random_fn = _mktemp (tfn);
+ if (NULL == random_fn)
+ {
+ GNUNET_free (tfn);
+ return NULL;
+ }
+ /* FIXME: assume fn to be UTF-8-encoded and do the right thing */
+ if (0 == CreateDirectoryA (tfn, NULL))
+ {
+ DWORD error = GetLastError ();
+ GNUNET_free (tfn);
+ if (ERROR_ALREADY_EXISTS == error)
+ continue;
+ return NULL;
+ }
+ break;
+ }
+ strcpy (fn, tfn);
+ return fn;
+}
+#endif
+
+/**
+ * Create an (empty) temporary directory on disk. If the given name is not
+ * an absolute path, the current 'TMPDIR' will be prepended. In any case,
+ * 6 random characters will be appended to the name to create a unique
+ * filename.
+ *
+ * @param t component to use for the name;
+ * does NOT contain "XXXXXX" or "/tmp/".
+ * @return NULL on error, otherwise name of fresh
+ * file on disk in directory for temporary files
+ */
+char *
+GNUNET_DISK_mkdtemp (const char *t)
+{
+ char *fn;
+
+ fn = mktemp_name (t);
+ if (fn != mkdtemp (fn))
+ {
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
+ GNUNET_free (fn);
+ return NULL;
+ }
+ return fn;
+}
+
+
+/**
+ * Move a file out of the way (create a backup) by
+ * renaming it to "orig.NUM~" where NUM is the smallest
+ * number that is not used yet.
+ *
+ * @param fil name of the file to back up
+ */
+void
+GNUNET_DISK_file_backup (const char *fil)
+{
+ size_t slen;
+ char *target;
+ unsigned int num;
+
+ slen = strlen (fil) + 20;
+ target = GNUNET_malloc (slen);
+ num = 0;
+ do
+ {
+ GNUNET_snprintf (target, slen,
+ "%s.%u~",
+ fil,
+ num++);
+ } while (0 == access (target, F_OK));
+ if (0 != rename (fil, target))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+ "rename",
+ fil);
+ GNUNET_free (target);
+}
+
+
+/**
+ * Create an (empty) temporary file on disk. If the given name is not
+ * an absolute path, the current 'TMPDIR' will be prepended. In any case,
+ * 6 random characters will be appended to the name to create a unique
+ * filename.
+ *
+ * @param t component to use for the name;
+ * does NOT contain "XXXXXX" or "/tmp/".
+ * @return NULL on error, otherwise name of fresh
+ * file on disk in directory for temporary files
+ */
+char *
+GNUNET_DISK_mktemp (const char *t)
+{
+ int fd;
+ char *fn;
+
+ fn = mktemp_name (t);
+ if (-1 == (fd = mkstemp (fn)))
{
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
GNUNET_free (fn);
/**
- * Test if "fil" is a directory.
- * Will not print an error message if the directory
- * does not exist. Will log errors if GNUNET_SYSERR is
- * returned (i.e., a file exists with the same name).
+ * Test if "fil" is a directory and listable. Optionally, also check if the
+ * directory is readable. Will not print an error message if the directory does
+ * not exist. Will log errors if GNUNET_SYSERR is returned (i.e., a file exists
+ * with the same name).
*
* @param fil filename to test
- * @return GNUNET_YES if yes, GNUNET_NO if not, GNUNET_SYSERR if it
- * does not exist
+ * @param is_readable GNUNET_YES to additionally check if "fil" is readable;
+ * GNUNET_NO to disable this check
+ * @return GNUNET_YES if yes, GNUNET_NO if not; GNUNET_SYSERR if it
+ * does not exist or stat'ed
*/
int
-GNUNET_DISK_directory_test (const char *fil)
+GNUNET_DISK_directory_test (const char *fil, int is_readable)
{
struct stat filestat;
int ret;
if (ret != 0)
{
if (errno != ENOENT)
- {
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", fil);
- return GNUNET_SYSERR;
- }
- return GNUNET_NO;
+ return GNUNET_SYSERR;
}
if (!S_ISDIR (filestat.st_mode))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "A file already exits with the same name %s\n", fil);
return GNUNET_NO;
- if (ACCESS (fil, R_OK | X_OK) < 0)
+ }
+ if (GNUNET_YES == is_readable)
+ ret = ACCESS (fil, R_OK | X_OK);
+ else
+ ret = ACCESS (fil, X_OK);
+ if (ret < 0)
{
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "access", fil);
- return GNUNET_SYSERR;
+ return GNUNET_NO;
}
return GNUNET_YES;
}
GNUNET_free (rdir);
return GNUNET_NO;
}
- if (ACCESS (rdir, R_OK) < 0)
+ if (ACCESS (rdir, F_OK) < 0)
{
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "access", rdir);
GNUNET_free (rdir);
GNUNET_DISK_directory_create (const char *dir)
{
char *rdir;
- int len;
- int pos;
+ unsigned int len;
+ unsigned int pos;
+ unsigned int pos2;
int ret = GNUNET_OK;
rdir = GNUNET_STRINGS_filename_expand (dir);
pos = 3; /* strlen("C:\\") */
}
#endif
+ /* Check which low level directories already exist */
+ pos2 = len;
+ rdir[len] = DIR_SEPARATOR;
+ while (pos <= pos2)
+ {
+ if (DIR_SEPARATOR == rdir[pos2])
+ {
+ rdir[pos2] = '\0';
+ ret = GNUNET_DISK_directory_test (rdir, GNUNET_NO);
+ if (GNUNET_NO == ret)
+ {
+ GNUNET_free (rdir);
+ return GNUNET_SYSERR;
+ }
+ rdir[pos2] = DIR_SEPARATOR;
+ if (GNUNET_YES == ret)
+ {
+ pos2++;
+ break;
+ }
+ }
+ pos2--;
+ }
+ rdir[len] = '\0';
+ if (pos < pos2)
+ pos = pos2;
+ /* Start creating directories */
while (pos <= len)
{
if ((rdir[pos] == DIR_SEPARATOR) || (pos == len))
{
rdir[pos] = '\0';
- ret = GNUNET_DISK_directory_test (rdir);
- if (ret == GNUNET_SYSERR)
+ ret = GNUNET_DISK_directory_test (rdir, GNUNET_NO);
+ if (GNUNET_NO == ret)
{
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
- if (ret == GNUNET_NO)
+ if (GNUNET_SYSERR == ret)
{
#ifndef MINGW
ret = mkdir (rdir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); /* 755 */
#ifdef MINGW
DWORD bytesRead;
- if (h->type != GNUNET_PIPE)
+ if (h->type != GNUNET_DISK_HANLDE_TYPE_PIPE)
{
if (!ReadFile (h->h, result, len, &bytesRead, NULL))
{
}
else
{
-#if DEBUG_PIPE
- LOG (GNUNET_ERROR_TYPE_DEBUG, "It is a pipe trying to read\n");
-#endif
if (!ReadFile (h->h, result, len, &bytesRead, h->oOverlapRead))
{
if (GetLastError () != ERROR_IO_PENDING)
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Error reading from pipe: %u\n", GetLastError ());
-#endif
SetErrnoFromWinError (GetLastError ());
return GNUNET_SYSERR;
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Will get overlapped result\n");
-#endif
GetOverlappedResult (h->h, h->oOverlapRead, &bytesRead, TRUE);
}
-#if DEBUG_PIPE
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %u bytes\n", bytesRead);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %u bytes from pipe\n", bytesRead);
}
return bytesRead;
#else
*/
ssize_t
GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h,
- void *result, size_t len)
+ void *result,
+ size_t len)
{
if (h == NULL)
{
#ifdef MINGW
DWORD bytesRead;
- if (h->type != GNUNET_PIPE)
+ if (h->type != GNUNET_DISK_HANLDE_TYPE_PIPE)
{
if (!ReadFile (h->h, result, len, &bytesRead, NULL))
{
}
else
{
-#if DEBUG_PIPE
- LOG (GNUNET_ERROR_TYPE_DEBUG, "It is a pipe, trying to read\n");
-#endif
if (!ReadFile (h->h, result, len, &bytesRead, h->oOverlapRead))
{
if (GetLastError () != ERROR_IO_PENDING)
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Error reading from pipe: %u\n", GetLastError ());
-#endif
SetErrnoFromWinError (GetLastError ());
return GNUNET_SYSERR;
}
else
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"ReadFile() queued a read, cancelling\n");
-#endif
CancelIo (h->h);
errno = EAGAIN;
return GNUNET_SYSERR;
}
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %u bytes\n", bytesRead);
-#endif
}
return bytesRead;
#else
/* set to non-blocking, read, then set back */
flags = fcntl (h->fd, F_GETFL);
if (0 == (flags & O_NONBLOCK))
- fcntl (h->fd, F_SETFL, flags | O_NONBLOCK);
+ (void) fcntl (h->fd, F_SETFL, flags | O_NONBLOCK);
ret = read (h->fd, result, len);
if (0 == (flags & O_NONBLOCK))
- fcntl (h->fd, F_SETFL, flags);
+ {
+ int eno = errno;
+ (void) fcntl (h->fd, F_SETFL, flags);
+ errno = eno;
+ }
return ret;
#endif
}
#ifdef MINGW
DWORD bytesWritten;
- if (h->type != GNUNET_PIPE)
+ if (h->type != GNUNET_DISK_HANLDE_TYPE_PIPE)
{
if (!WriteFile (h->h, buffer, n, &bytesWritten, NULL))
{
}
else
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "It is a pipe trying to write %u bytes\n", n);
-#endif
if (!WriteFile (h->h, buffer, n, &bytesWritten, h->oOverlapWrite))
{
if (GetLastError () != ERROR_IO_PENDING)
{
SetErrnoFromWinError (GetLastError ());
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Error writing to pipe: %u\n",
GetLastError ());
-#endif
return GNUNET_SYSERR;
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Will get overlapped result\n");
-#endif
if (!GetOverlappedResult (h->h, h->oOverlapWrite, &bytesWritten, TRUE))
{
SetErrnoFromWinError (GetLastError ());
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Error getting overlapped result while writing to pipe: %u\n",
GetLastError ());
-#endif
return GNUNET_SYSERR;
}
}
DWORD ovr;
if (!GetOverlappedResult (h->h, h->oOverlapWrite, &ovr, TRUE))
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Error getting control overlapped result while writing to pipe: %u\n",
GetLastError ());
-#endif
}
else
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Wrote %u bytes (ovr says %u), picking the greatest\n",
bytesWritten, ovr);
-#endif
}
}
if (bytesWritten == 0)
{
if (n > 0)
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Wrote %u bytes, returning -1 with EAGAIN\n", bytesWritten);
-#endif
errno = EAGAIN;
return GNUNET_SYSERR;
}
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Wrote %u bytes\n", bytesWritten);
-#endif
}
return bytesWritten;
#else
#ifdef MINGW
DWORD bytesWritten;
/* We do a non-overlapped write, which is as blocking as it gets */
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Writing %u bytes\n", n);
-#endif
if (!WriteFile (h->h, buffer, n, &bytesWritten, NULL))
{
SetErrnoFromWinError (GetLastError ());
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Error writing to pipe: %u\n",
GetLastError ());
-#endif
return GNUNET_SYSERR;
}
if (bytesWritten == 0 && n > 0)
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Waiting for pipe to clean\n");
-#endif
WaitForSingleObject (h->h, INFINITE);
if (!WriteFile (h->h, buffer, n, &bytesWritten, NULL))
{
SetErrnoFromWinError (GetLastError ());
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Error writing to pipe: %u\n",
GetLastError ());
-#endif
return GNUNET_SYSERR;
}
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "Wrote %u bytes\n", bytesWritten);
-#endif
return bytesWritten;
#else
int flags;
/* set to blocking, write, then set back */
flags = fcntl (h->fd, F_GETFL);
if (0 != (flags & O_NONBLOCK))
- fcntl (h->fd, F_SETFL, flags - O_NONBLOCK);
+ (void) fcntl (h->fd, F_SETFL, flags - O_NONBLOCK);
ret = write (h->fd, buffer, n);
if (0 == (flags & O_NONBLOCK))
- fcntl (h->fd, F_SETFL, flags);
+ (void) fcntl (h->fd, F_SETFL, flags);
return ret;
#endif
}
* caution.
*
*
- * @param fileName the file to remove
+ * @param filename the file to remove
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_DISK_directory_remove (const char *fileName)
+GNUNET_DISK_directory_remove (const char *filename)
{
struct stat istat;
- if (0 != LSTAT (fileName, &istat))
+ if (0 != LSTAT (filename, &istat))
return GNUNET_NO; /* file may not exist... */
- CHMOD (fileName, S_IWUSR | S_IRUSR | S_IXUSR);
- if (UNLINK (fileName) == 0)
+ (void) CHMOD (filename, S_IWUSR | S_IRUSR | S_IXUSR);
+ if (UNLINK (filename) == 0)
return GNUNET_OK;
if ((errno != EISDIR) &&
/* EISDIR is not sufficient in all cases, e.g.
* sticky /tmp directory may result in EPERM on BSD.
* So we also explicitly check "isDirectory" */
- (GNUNET_YES != GNUNET_DISK_directory_test (fileName)))
+ (GNUNET_YES != GNUNET_DISK_directory_test (filename, GNUNET_YES)))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "rmdir", fileName);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "rmdir", filename);
return GNUNET_SYSERR;
}
if (GNUNET_SYSERR ==
- GNUNET_DISK_directory_scan (fileName, &remove_helper, NULL))
+ GNUNET_DISK_directory_scan (filename, &remove_helper, NULL))
return GNUNET_SYSERR;
- if (0 != RMDIR (fileName))
+ if (0 != RMDIR (filename))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "rmdir", fileName);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "rmdir", filename);
return GNUNET_SYSERR;
}
return GNUNET_OK;
h = INVALID_HANDLE_VALUE;
if (h == INVALID_HANDLE_VALUE)
{
+ int err;
SetErrnoFromWinError (GetLastError ());
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "open", expfn);
+ err = errno;
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_INFO, "open", expfn);
GNUNET_free (expfn);
+ errno = err;
return NULL;
}
ret = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
#ifdef MINGW
ret->h = h;
- ret->type = GNUNET_DISK_FILE;
+ ret->type = GNUNET_DISK_HANLDE_TYPE_FILE;
#else
ret->fd = fd;
#endif
int
GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h)
{
+ int ret;
if (h == NULL)
{
errno = EINVAL;
return GNUNET_SYSERR;
}
+ ret = GNUNET_OK;
+
#if MINGW
if (!CloseHandle (h->h))
{
SetErrnoFromWinError (GetLastError ());
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "close");
+ ret = GNUNET_SYSERR;
+ }
+ if (h->oOverlapRead)
+ {
+ if (!CloseHandle (h->oOverlapRead->hEvent))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "close");
+ ret = GNUNET_SYSERR;
+ }
GNUNET_free (h->oOverlapRead);
+ }
+ if (h->oOverlapWrite)
+ {
+ if (!CloseHandle (h->oOverlapWrite->hEvent))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "close");
+ ret = GNUNET_SYSERR;
+ }
GNUNET_free (h->oOverlapWrite);
- GNUNET_free (h);
- return GNUNET_SYSERR;
}
#else
if (close (h->fd) != 0)
{
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "close");
- GNUNET_free (h);
- return GNUNET_SYSERR;
+ ret = GNUNET_SYSERR;
}
#endif
GNUNET_free (h);
- return GNUNET_OK;
+ return ret;
+}
+
+#ifdef WINDOWS
+/**
+ * Get a GNUnet file handle from a W32 handle.
+ *
+ * @param handle native handle
+ * @return GNUnet file handle corresponding to the W32 handle
+ */
+struct GNUNET_DISK_FileHandle *
+GNUNET_DISK_get_handle_from_w32_handle (HANDLE osfh)
+{
+ struct GNUNET_DISK_FileHandle *fh;
+
+ DWORD dwret;
+ enum GNUNET_FILE_Type ftype;
+
+ dwret = GetFileType (osfh);
+ switch (dwret)
+ {
+ case FILE_TYPE_DISK:
+ ftype = GNUNET_DISK_HANLDE_TYPE_FILE;
+ break;
+ case FILE_TYPE_PIPE:
+ ftype = GNUNET_DISK_HANLDE_TYPE_PIPE;
+ break;
+ default:
+ return NULL;
+ }
+
+ fh = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+
+ fh->h = osfh;
+ fh->type = ftype;
+ if (ftype == GNUNET_DISK_HANLDE_TYPE_PIPE)
+ {
+ /**
+ * Note that we can't make it overlapped if it isn't already.
+ * (ReOpenFile() is only available in 2003/Vista).
+ * The process that opened this file in the first place (usually a parent
+ * process, if this is stdin/stdout/stderr) must make it overlapped,
+ * otherwise we're screwed, as selecting on non-overlapped handle
+ * will block.
+ */
+ fh->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
+ fh->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
+ fh->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ fh->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ }
+
+ return fh;
+}
+#endif
+
+/**
+ * Get a handle from a native integer FD.
+ *
+ * @param fno native integer file descriptor
+ * @return file handle corresponding to the descriptor
+ */
+struct GNUNET_DISK_FileHandle *
+GNUNET_DISK_get_handle_from_int_fd (int fno)
+{
+ struct GNUNET_DISK_FileHandle *fh;
+
+#ifndef WINDOWS
+ fh = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+
+ fh->fd = fno;
+#else
+ intptr_t osfh;
+
+ osfh = _get_osfhandle (fno);
+ if (INVALID_HANDLE_VALUE == (HANDLE) osfh)
+ return NULL;
+
+ fh = GNUNET_DISK_get_handle_from_w32_handle ((HANDLE) osfh);
+#endif
+
+ return fh;
+}
+
+
+/**
+ * Get a handle from a native streaming FD.
+ *
+ * @param fd native streaming file descriptor
+ * @return file handle corresponding to the descriptor
+ */
+struct GNUNET_DISK_FileHandle *
+GNUNET_DISK_get_handle_from_native (FILE *fd)
+{
+ int fno;
+
+ fno = fileno (fd);
+ if (-1 == fno)
+ return NULL;
+
+ return GNUNET_DISK_get_handle_from_int_fd (fno);
}
/* Default to error. */
*read_pipe_ptr = *write_pipe_ptr = INVALID_HANDLE_VALUE;
- HANDLE read_pipe = INVALID_HANDLE_VALUE, write_pipe = INVALID_HANDLE_VALUE;
+ HANDLE read_pipe;
+ HANDLE write_pipe;
/* Ensure that there is enough pipe buffer space for atomic writes. */
if (psize < PIPE_BUF)
snprintf (pipename, sizeof pipename, "\\\\.\\pipe\\gnunet-%d-%ld",
getpid (), InterlockedIncrement ((LONG *) & pipe_unique_id));
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "CreateNamedPipe: name = %s, size = %lu\n",
pipename, psize);
-#endif
/* Use CreateNamedPipe instead of CreatePipe, because the latter
* returns a write handle that does not permit FILE_READ_ATTRIBUTES
* access, on versions of win32 earlier than WinXP SP2.
* a waste, since only a single direction is actually used.
* It's important to only allow a single instance, to ensure that
* the pipe was not created earlier by some other process, even if
- * the pid has been reused. We avoid FILE_FLAG_FIRST_PIPE_INSTANCE
- * because that is only available for Win2k SP2 and WinXP. */
- read_pipe = CreateNamedPipeA (pipename, PIPE_ACCESS_INBOUND | dwReadMode, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 1, /* max instances */
+ * the pid has been reused. */
+ read_pipe = CreateNamedPipeA (pipename, PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | dwReadMode, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 1, /* max instances */
psize, /* output buffer size */
psize, /* input buffer size */
NMPWAIT_USE_DEFAULT_WAIT, sa_ptr);
if (read_pipe != INVALID_HANDLE_VALUE)
{
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p\n", read_pipe);
-#endif
break;
}
case ERROR_PIPE_BUSY:
/* The pipe is already open with compatible parameters.
* Pick a new name and retry. */
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe busy, retrying\n");
-#endif
continue;
case ERROR_ACCESS_DENIED:
/* The pipe is already open with incompatible parameters.
* Pick a new name and retry. */
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe access denied, retrying\n");
-#endif
continue;
case ERROR_CALL_NOT_IMPLEMENTED:
/* We are on an older Win9x platform without named pipes.
* Return an anonymous pipe as the best approximation. */
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG,
"CreateNamedPipe not implemented, resorting to "
"CreatePipe: size = %lu\n", psize);
-#endif
if (CreatePipe (read_pipe_ptr, write_pipe_ptr, sa_ptr, psize))
{
-#if DEBUG_PIPE
- LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p\n",
- *read_pipe_ptr);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe write handle = %p\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p, write handle = %p\n",
+ *read_pipe_ptr,
*write_pipe_ptr);
-#endif
return GNUNET_OK;
}
err = GetLastError ();
}
/* NOTREACHED */
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "CreateFile: name = %s\n", pipename);
-#endif
/* Open the named pipe for writing.
* Be sure to permit FILE_READ_ATTRIBUTES access. */
/* Failure. */
DWORD err = GetLastError ();
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "CreateFile failed: %d\n", err);
-#endif
CloseHandle (read_pipe);
return err;
}
-#if DEBUG_PIPE
LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe write handle = %p\n", write_pipe);
-#endif
/* Success. */
*read_pipe_ptr = read_pipe;
*write_pipe_ptr = write_pipe;
fd);
#else
struct GNUNET_DISK_PipeHandle *p;
- struct GNUNET_DISK_FileHandle *fds;
BOOL ret;
HANDLE tmp_handle;
-
+ int save_errno;
- p = GNUNET_malloc (sizeof (struct GNUNET_DISK_PipeHandle) +
- 2 * sizeof (struct GNUNET_DISK_FileHandle));
- fds = (struct GNUNET_DISK_FileHandle *) &p[1];
- p->fd[0] = &fds[0];
- p->fd[1] = &fds[1];
+ p = GNUNET_malloc (sizeof (struct GNUNET_DISK_PipeHandle));
+ p->fd[0] = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+ p->fd[1] = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
/* All pipes are overlapped. If you want them to block - just
* call WriteFile() and ReadFile() with NULL overlapped pointer.
+ * NOTE: calling with NULL overlapped pointer works only
+ * for pipes, and doesn't seem to be a documented feature.
+ * It will NOT work for files, because overlapped files need
+ * to read offsets from the overlapped structure, regardless.
+ * Pipes are not seekable, and need no offsets, which is
+ * probably why it works for them.
*/
ret =
create_selectable_pipe (&p->fd[0]->h, &p->fd[1]->h, NULL, 0,
FILE_FLAG_OVERLAPPED);
if (!ret)
{
- GNUNET_free (p);
SetErrnoFromWinError (GetLastError ());
+ save_errno = errno;
+ GNUNET_free (p->fd[0]);
+ GNUNET_free (p->fd[1]);
+ GNUNET_free (p);
+ errno = save_errno;
return NULL;
}
if (!DuplicateHandle
inherit_read == GNUNET_YES ? TRUE : FALSE, DUPLICATE_SAME_ACCESS))
{
SetErrnoFromWinError (GetLastError ());
+ save_errno = errno;
CloseHandle (p->fd[0]->h);
CloseHandle (p->fd[1]->h);
+ GNUNET_free (p->fd[0]);
+ GNUNET_free (p->fd[1]);
GNUNET_free (p);
+ errno = save_errno;
return NULL;
}
CloseHandle (p->fd[0]->h);
inherit_write == GNUNET_YES ? TRUE : FALSE, DUPLICATE_SAME_ACCESS))
{
SetErrnoFromWinError (GetLastError ());
+ save_errno = errno;
CloseHandle (p->fd[0]->h);
CloseHandle (p->fd[1]->h);
+ GNUNET_free (p->fd[0]);
+ GNUNET_free (p->fd[1]);
GNUNET_free (p);
+ errno = save_errno;
return NULL;
}
CloseHandle (p->fd[1]->h);
p->fd[1]->h = tmp_handle;
- p->fd[0]->type = GNUNET_PIPE;
- p->fd[1]->type = GNUNET_PIPE;
+ p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE;
+ p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE;
p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
{
struct GNUNET_DISK_PipeHandle *p;
- struct GNUNET_DISK_FileHandle *fds;
- p = GNUNET_malloc (sizeof (struct GNUNET_DISK_PipeHandle) +
- 2 * sizeof (struct GNUNET_DISK_FileHandle));
- fds = (struct GNUNET_DISK_FileHandle *) &p[1];
- p->fd[0] = &fds[0];
- p->fd[1] = &fds[1];
+ p = GNUNET_malloc (sizeof (struct GNUNET_DISK_PipeHandle));
+
#ifndef MINGW
int ret;
int flags;
int eno = 0; /* make gcc happy */
- p->fd[0]->fd = fd[0];
- p->fd[1]->fd = fd[1];
ret = 0;
if (fd[0] >= 0)
{
+ p->fd[0] = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+ p->fd[0]->fd = fd[0];
if (!blocking_read)
{
flags = fcntl (fd[0], F_GETFL);
if (fd[1] >= 0)
{
+ p->fd[1] = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+ p->fd[1]->fd = fd[1];
if (!blocking_write)
{
flags = fcntl (fd[1], F_GETFL);
GNUNET_break (0 == close (p->fd[0]->fd));
if (p->fd[1]->fd >= 0)
GNUNET_break (0 == close (p->fd[1]->fd));
+ GNUNET_free_non_null (p->fd[0]);
+ GNUNET_free_non_null (p->fd[1]);
GNUNET_free (p);
errno = eno;
return NULL;
}
#else
if (fd[0] >= 0)
- p->fd[0]->h = _get_osfhandle (fd[0]);
- else
- p->fd[0]->h = INVALID_HANDLE_VALUE;
- if (fd[1] >= 0)
- p->fd[1]->h = _get_osfhandle (fd[1]);
- else
- p->fd[1]->h = INVALID_HANDLE_VALUE;
-
- if (p->fd[0]->h != INVALID_HANDLE_VALUE)
{
- p->fd[0]->type = GNUNET_PIPE;
- p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
- p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
- p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
- p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ p->fd[0] = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+ p->fd[0]->h = (HANDLE) _get_osfhandle (fd[0]);
+ if (p->fd[0]->h != INVALID_HANDLE_VALUE)
+ {
+ p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE;
+ p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
+ p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
+ p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ }
+ else
+ {
+ GNUNET_free (p->fd[0]);
+ p->fd[0] = NULL;
+ }
}
-
- if (p->fd[1]->h != INVALID_HANDLE_VALUE)
+ if (fd[1] >= 0)
{
- p->fd[1]->type = GNUNET_PIPE;
- p->fd[1]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
- p->fd[1]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
- p->fd[1]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
- p->fd[1]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ p->fd[1] = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
+ p->fd[1]->h = (HANDLE) _get_osfhandle (fd[1]);
+ if (p->fd[1]->h != INVALID_HANDLE_VALUE)
+ {
+ p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE;
+ p->fd[1]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
+ p->fd[1]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
+ p->fd[1]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ p->fd[1]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ }
+ else
+ {
+ GNUNET_free (p->fd[1]);
+ p->fd[1] = NULL;
+ }
}
+
#endif
return p;
}
enum GNUNET_DISK_PipeEnd end)
{
int ret = GNUNET_OK;
- int save;
-#ifdef MINGW
if (end == GNUNET_DISK_PIPE_END_READ)
{
- if (p->fd[0]->h != INVALID_HANDLE_VALUE)
+ if (p->fd[0])
{
- if (!CloseHandle (p->fd[0]->h))
- {
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
- }
- GNUNET_free (p->fd[0]->oOverlapRead);
- GNUNET_free (p->fd[0]->oOverlapWrite);
- p->fd[0]->h = INVALID_HANDLE_VALUE;
+ ret = GNUNET_DISK_file_close (p->fd[0]);
+ p->fd[0] = NULL;
}
}
else if (end == GNUNET_DISK_PIPE_END_WRITE)
{
- if (p->fd[0]->h != INVALID_HANDLE_VALUE)
+ if (p->fd[1])
{
- if (!CloseHandle (p->fd[1]->h))
- {
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
- }
- GNUNET_free (p->fd[1]->oOverlapRead);
- GNUNET_free (p->fd[1]->oOverlapWrite);
- p->fd[1]->h = INVALID_HANDLE_VALUE;
+ ret = GNUNET_DISK_file_close (p->fd[1]);
+ p->fd[1] = NULL;
}
}
- save = errno;
-#else
- save = 0;
+
+ return ret;
+}
+
+/**
+ * Detaches one of the ends from the pipe.
+ * Detached end is a fully-functional FileHandle, it will
+ * not be affected by anything you do with the pipe afterwards.
+ * Each end of a pipe can only be detched from it once (i.e.
+ * it is not duplicated).
+ *
+ * @param p pipe to detach an end from
+ * @param end which end of the pipe to detach
+ * @return Detached end on success, NULL on failure
+ * (or if that end is not present or is closed).
+ */
+struct GNUNET_DISK_FileHandle *
+GNUNET_DISK_pipe_detach_end (struct GNUNET_DISK_PipeHandle *p,
+ enum GNUNET_DISK_PipeEnd end)
+{
+ struct GNUNET_DISK_FileHandle *ret = NULL;
+
if (end == GNUNET_DISK_PIPE_END_READ)
{
- if (0 != close (p->fd[0]->fd))
+ if (p->fd[0])
{
- ret = GNUNET_SYSERR;
- save = errno;
+ ret = p->fd[0];
+ p->fd[0] = NULL;
}
- p->fd[0]->fd = -1;
}
else if (end == GNUNET_DISK_PIPE_END_WRITE)
{
- if (0 != close (p->fd[1]->fd))
+ if (p->fd[1])
{
- ret = GNUNET_SYSERR;
- save = errno;
+ ret = p->fd[1];
+ p->fd[1] = NULL;
}
- p->fd[1]->fd = -1;
}
-#endif
- errno = save;
+
return ret;
}
GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p)
{
int ret = GNUNET_OK;
- int save;
-#ifdef MINGW
- if (p->fd[0]->h != INVALID_HANDLE_VALUE)
- {
- if (!CloseHandle (p->fd[0]->h))
- {
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
- }
- GNUNET_free (p->fd[0]->oOverlapRead);
- GNUNET_free (p->fd[0]->oOverlapWrite);
- }
- if (p->fd[1]->h != INVALID_HANDLE_VALUE)
+ int read_end_close;
+ int write_end_close;
+ int read_end_close_errno;
+ int write_end_close_errno;
+
+ read_end_close = GNUNET_DISK_pipe_close_end (p, GNUNET_DISK_PIPE_END_READ);
+ read_end_close_errno = errno;
+ write_end_close = GNUNET_DISK_pipe_close_end (p, GNUNET_DISK_PIPE_END_WRITE);
+ write_end_close_errno = errno;
+ GNUNET_free (p);
+
+ if (GNUNET_OK != read_end_close)
{
- if (!CloseHandle (p->fd[1]->h))
- {
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
- }
- GNUNET_free (p->fd[1]->oOverlapRead);
- GNUNET_free (p->fd[1]->oOverlapWrite);
+ errno = read_end_close_errno;
+ ret = read_end_close;
}
- save = errno;
-#else
- save = 0;
- if (p->fd[0]->fd != -1)
+ else if (GNUNET_OK != write_end_close)
{
- if (0 != close (p->fd[0]->fd))
- {
- ret = GNUNET_SYSERR;
- save = errno;
- }
+ errno = write_end_close_errno;
+ ret = write_end_close;
}
- if (p->fd[1]->fd != -1)
- {
- if (0 != close (p->fd[1]->fd))
- {
- ret = GNUNET_SYSERR;
- save = errno;
- }
- }
-#endif
- GNUNET_free (p);
- errno = save;
return ret;
}