/*
This file is part of GNUnet.
- (C) 2001, 2002, 2005, 2006, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2001--2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_crypto_lib.h"
#include "disk.h"
-#define DEBUG_NPIPE GNUNET_NO
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
-#define DEBUG_PIPE GNUNET_NO
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
+#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.
};
-int
+static int
translate_unix_perms (enum GNUNET_DISK_AccessPermissions perm)
{
int mode;
/**
- * Iterate over all files in the given directory and
+ * Iterate over all files in the given directory and
* accumulate their size.
*
* @param cls closure of type "struct GetFileSizeData"
#ifdef HAVE_STAT64
if (0 != STAT64 (fn, &buf))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "stat64", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat64", fn);
return GNUNET_SYSERR;
}
#else
if (0 != STAT (fn, &buf))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "stat", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", fn);
return GNUNET_SYSERR;
}
#endif
if ((!S_ISLNK (buf.st_mode)) || (gfsd->include_sym_links == GNUNET_YES))
gfsd->total += buf.st_size;
- if ((S_ISDIR (buf.st_mode)) &&
- (0 == ACCESS (fn, X_OK)) &&
+ if ((S_ISDIR (buf.st_mode)) && (0 == ACCESS (fn, X_OK)) &&
((!S_ISLNK (buf.st_mode)) || (gfsd->include_sym_links == GNUNET_YES)))
{
if (GNUNET_SYSERR == GNUNET_DISK_directory_scan (fn, &getSizeRec, gfsd))
#endif
}
+/**
+ * Get the size of an open file.
+ *
+ * @param fh open file handle
+ * @param size where to write size of the file
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int
+GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh,
+ OFF_T *size)
+{
+#if WINDOWS
+ BOOL b;
+ LARGE_INTEGER li;
+ b = GetFileSizeEx (fh->h, &li);
+ if (!b)
+ {
+ SetErrnoFromWinError (GetLastError ());
+ return GNUNET_SYSERR;
+ }
+ *size = (OFF_T) li.QuadPart;
+#else
+ struct stat sbuf;
+
+ if (0 != FSTAT (fh->fd, &sbuf))
+ return GNUNET_SYSERR;
+ *size = sbuf.st_size;
+#endif
+ return GNUNET_OK;
+}
+
/**
* Move the read/write pointer in a file
* @param whence specification to which position the offset parameter relates to
* @return the new position on success, GNUNET_SYSERR otherwise
*/
-off_t
-GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, off_t offset,
+OFF_T
+GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, OFF_T offset,
enum GNUNET_DISK_Seek whence)
{
if (h == NULL)
}
#ifdef MINGW
- DWORD ret;
+ LARGE_INTEGER li, 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
};
+ li.QuadPart = offset;
- ret = SetFilePointer (h->h, offset, NULL, t[whence]);
- if (ret == INVALID_SET_FILE_POINTER)
+ b = SetFilePointerEx (h->h, li, &new_pos, t[whence]);
+ if (b == 0)
{
SetErrnoFromWinError (GetLastError ());
return GNUNET_SYSERR;
}
- return ret;
+ 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
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
int
-GNUNET_DISK_file_size (const char *filename,
- uint64_t * size, int includeSymLinks)
+GNUNET_DISK_file_size (const char *filename, uint64_t * size,
+ int includeSymLinks)
{
struct GetFileSizeData gfsd;
int ret;
* @return GNUNET_OK on success
*/
int
-GNUNET_DISK_file_get_identifiers (const char *filename,
- uint64_t * dev, uint64_t * ino)
+GNUNET_DISK_file_get_identifiers (const char *filename, uint64_t * dev,
+ uint64_t * ino)
{
#if LINUX
struct stat sbuf;
if (succ)
{
*dev = info.dwVolumeSerialNumber;
- *ino = ((info.nFileIndexHigh << sizeof (DWORD)) | info.nFileIndexLow);
+ *ino = ((((uint64_t) info.nFileIndexHigh) << (sizeof (DWORD) * 8)) | info.nFileIndexLow);
return GNUNET_OK;
}
else
* 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
#endif
)
{
+ /* FIXME: This uses system codepage on W32, not UTF-8 */
tmpdir = getenv ("TMPDIR");
tmpdir = tmpdir ? tmpdir : "/tmp";
GNUNET_asprintf (&tmpl, "%s/%s%s", tmpdir, t, "XXXXXX");
#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)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
GNUNET_free (fn);
return NULL;
}
if (0 != CLOSE (fd))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "close", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "close", fn);
return fn;
}
if (0 != statvfs (part, &buf))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "statfs", part);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "statfs", part);
return -1;
}
return buf.f_bavail;
#elif MINGW
DWORD dwDummy;
DWORD dwBlocks;
- char szDrive[4];
+ wchar_t szDrive[4];
+ wchar_t wpath[MAX_PATH + 1];
char *path;
path = GNUNET_STRINGS_filename_expand (part);
if (path == NULL)
return -1;
- memcpy (szDrive, path, 3);
+ /* "part" was in UTF-8, and so is "path" */
+ if (ERROR_SUCCESS != plibc_conv_to_win_pathwconv(path, wpath))
+ {
+ GNUNET_free (path);
+ return -1;
+ }
GNUNET_free (path);
+ wcsncpy (szDrive, wpath, 3);
szDrive[3] = 0;
- if (!GetDiskFreeSpace (szDrive, &dwDummy, &dwDummy, &dwBlocks, &dwDummy))
+ if (!GetDiskFreeSpaceW (szDrive, &dwDummy, &dwDummy, &dwBlocks, &dwDummy))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("`%s' failed for drive `%s': %u\n"),
- "GetDiskFreeSpace", szDrive, GetLastError ());
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("`%s' failed for drive `%S': %u\n"),
+ "GetDiskFreeSpace", szDrive, GetLastError ());
return -1;
}
if (0 != statfs (part, &s))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "statfs", part);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "statfs", part);
return -1;
}
return s.f_bavail;
{
if (errno != ENOENT)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "stat", fil);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", fil);
return GNUNET_SYSERR;
}
return GNUNET_NO;
return GNUNET_NO;
if (ACCESS (fil, R_OK | X_OK) < 0)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "access", fil);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "access", fil);
return GNUNET_SYSERR;
}
return GNUNET_YES;
}
+
/**
* Check that fil corresponds to a filename
* (of a file that exists and that is not a directory).
{
if (errno != ENOENT)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "stat", rdir);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", rdir);
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
}
if (ACCESS (rdir, R_OK) < 0)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "access", rdir);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "access", rdir);
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
#ifndef MINGW
ret = mkdir (rdir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); /* 755 */
#else
- ret = mkdir (rdir);
+ wchar_t wrdir[MAX_PATH + 1];
+ if (ERROR_SUCCESS == plibc_conv_to_win_pathwconv(rdir, wrdir))
+ ret = !CreateDirectoryW (wrdir, NULL);
+ else
+ ret = 1;
#endif
if ((ret != 0) && (errno != EEXIST))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "mkdir", rdir);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkdir", rdir);
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
}
else
{
- if (!ReadFile (h->h, result, len, NULL, h->oOverlapRead))
+#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);
}
- GetOverlappedResult (h->h, h->oOverlapRead, &bytesRead, TRUE);
+#if DEBUG_PIPE
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %u bytes\n", bytesRead);
+#endif
}
return bytesRead;
#else
}
+/**
+ * Read the contents of a binary file into a buffer.
+ * Guarantees not to block (returns GNUNET_SYSERR and sets errno to EAGAIN
+ * when no data can be read).
+ *
+ * @param h handle to an open file
+ * @param result the buffer to write the result to
+ * @param len the maximum number of bytes to read
+ * @return the number of bytes read on success, GNUNET_SYSERR on failure
+ */
+ssize_t
+GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h,
+ void *result, size_t len)
+{
+ if (h == NULL)
+ {
+ errno = EINVAL;
+ return GNUNET_SYSERR;
+ }
+
+#ifdef MINGW
+ DWORD bytesRead;
+
+ if (h->type != GNUNET_PIPE)
+ {
+ if (!ReadFile (h->h, result, len, &bytesRead, NULL))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ return GNUNET_SYSERR;
+ }
+ }
+ 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
+ int flags;
+ ssize_t ret;
+
+ /* 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);
+ ret = read (h->fd, result, len);
+ if (0 == (flags & O_NONBLOCK))
+ fcntl (h->fd, F_SETFL, flags);
+ return ret;
+#endif
+}
+
+
/**
* Read the contents of a binary file into a buffer.
*
else
{
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "It is a pipe trying to write\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "It is a pipe trying to write %u bytes\n", n);
#endif
- if (!WriteFile (h->h, buffer, n, NULL, h->oOverlapWrite))
+ if (!WriteFile (h->h, buffer, n, &bytesWritten, h->oOverlapWrite))
{
if (GetLastError () != ERROR_IO_PENDING)
{
SetErrnoFromWinError (GetLastError ());
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error writing to pipe\n");
+ 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;
}
}
+ else
+ {
+ 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
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Will get overlapped result\n");
+ 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
- GetOverlappedResult (h->h, h->oOverlapWrite, &bytesWritten, TRUE);
}
return bytesWritten;
#else
#endif
}
+
+/**
+ * Write a buffer to a file, blocking, if necessary.
+ * @param h handle to open file
+ * @param buffer the data to write
+ * @param n number of bytes to write
+ * @return number of bytes written on success, GNUNET_SYSERR on error
+ */
+ssize_t
+GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle * h,
+ const void *buffer, size_t n)
+{
+ if (h == NULL)
+ {
+ errno = EINVAL;
+ return GNUNET_SYSERR;
+ }
+
+#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;
+ ssize_t ret;
+
+ /* 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);
+ ret = write (h->fd, buffer, n);
+ if (0 == (flags & O_NONBLOCK))
+ fcntl (h->fd, F_SETFL, flags);
+ return ret;
+#endif
+}
+
+
/**
* Write a buffer to a file. If the file is longer than the
* number of bytes that will be written, it will be truncated.
* @param fn file name
* @param buffer the data to write
* @param n number of bytes to write
- * @param mode file permissions
+ * @param mode file permissions
* @return number of bytes written on success, GNUNET_SYSERR on error
*/
ssize_t
-GNUNET_DISK_fn_write (const char *fn, const void *buffer,
- size_t n, enum GNUNET_DISK_AccessPermissions mode)
+GNUNET_DISK_fn_write (const char *fn, const void *buffer, size_t n,
+ enum GNUNET_DISK_AccessPermissions mode)
{
struct GNUNET_DISK_FileHandle *fh;
ssize_t ret;
fh = GNUNET_DISK_file_open (fn,
- GNUNET_DISK_OPEN_WRITE
- | GNUNET_DISK_OPEN_TRUNCATE
+ GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_TRUNCATE
| GNUNET_DISK_OPEN_CREATE, mode);
if (!fh)
return GNUNET_SYSERR;
return ret;
}
+
/**
- * Scan a directory for files.
+ * Scan a directory for files.
*
* @param dirName the name of the directory
* @param callback the method to call for each file,
dname[strlen (dname) - 1] = '\0';
if (0 != STAT (dname, &istat))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "stat", dname);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "stat", dname);
GNUNET_free (dname);
return GNUNET_SYSERR;
}
if (!S_ISDIR (istat.st_mode))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Expected `%s' to be a directory!\n"), dirName);
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("Expected `%s' to be a directory!\n"),
+ dirName);
GNUNET_free (dname);
return GNUNET_SYSERR;
}
dinfo = OPENDIR (dname);
if ((errno == EACCES) || (dinfo == NULL))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "opendir", dname);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "opendir", dname);
if (dinfo != NULL)
- closedir (dinfo);
+ CLOSEDIR (dinfo);
GNUNET_free (dname);
return GNUNET_SYSERR;
}
name_len = 256;
n_size = strlen (dname) + name_len + 2;
name = GNUNET_malloc (n_size);
- while ((finfo = readdir (dinfo)) != NULL)
+ while ((finfo = READDIR (dinfo)) != NULL)
{
if ((0 == strcmp (finfo->d_name, ".")) ||
(0 == strcmp (finfo->d_name, "..")))
/* dname can end in "/" only if dname == "/";
* if dname does not end in "/", we need to add
* a "/" (otherwise, we must not!) */
- GNUNET_snprintf (name,
- n_size,
- "%s%s%s",
- dname,
+ GNUNET_snprintf (name, n_size, "%s%s%s", dname,
(strcmp (dname, DIR_SEPARATOR_STR) ==
0) ? "" : DIR_SEPARATOR_STR, finfo->d_name);
if (GNUNET_OK != callback (callback_cls, name))
{
- closedir (dinfo);
+ CLOSEDIR (dinfo);
GNUNET_free (name);
GNUNET_free (dname);
return GNUNET_SYSERR;
}
count++;
}
- closedir (dinfo);
+ CLOSEDIR (dinfo);
GNUNET_free (name);
GNUNET_free (dname);
return count;
* GNUNET_SYSERR if abort was YES
*/
int
-GNUNET_DISK_directory_iterator_next (struct GNUNET_DISK_DirectoryIterator
- *iter, int can)
+GNUNET_DISK_directory_iterator_next (struct GNUNET_DISK_DirectoryIterator *iter,
+ int can)
{
struct dirent *finfo;
GNUNET_assert (iter->next_name == NULL);
if (can == GNUNET_YES)
{
- closedir (iter->directory);
+ CLOSEDIR (iter->directory);
GNUNET_free (iter->dirname);
GNUNET_free (iter);
return GNUNET_SYSERR;
}
- while (NULL != (finfo = readdir (iter->directory)))
+ while (NULL != (finfo = READDIR (iter->directory)))
{
if ((0 == strcmp (finfo->d_name, ".")) ||
(0 == strcmp (finfo->d_name, "..")))
continue;
- GNUNET_asprintf (&iter->next_name,
- "%s%s%s", iter->dirname, DIR_SEPARATOR_STR, finfo->d_name);
+ GNUNET_asprintf (&iter->next_name, "%s%s%s", iter->dirname,
+ DIR_SEPARATOR_STR, finfo->d_name);
break;
}
if (finfo == NULL)
GNUNET_DISK_directory_iterator_next (iter, GNUNET_YES);
return GNUNET_NO;
}
- GNUNET_SCHEDULER_add_with_priority (iter->priority,
- &directory_iterator_task, iter);
+ GNUNET_SCHEDULER_add_with_priority (iter->priority, &directory_iterator_task,
+ iter);
return GNUNET_YES;
}
* @param dirName the name of the directory
* @param callback the method to call for each file
* @param callback_cls closure for callback
+ * @return GNUNET_YES if directory is not empty and 'callback'
+ * will be called later, GNUNET_NO otherwise, GNUNET_SYSERR on error.
*/
-void
+int
GNUNET_DISK_directory_iterator_start (enum GNUNET_SCHEDULER_Priority prio,
const char *dirName,
GNUNET_DISK_DirectoryIteratorCallback
{
GNUNET_free (di);
callback (callback_cls, NULL, NULL, NULL);
- return;
+ return GNUNET_SYSERR;
}
di->dirname = GNUNET_strdup (dirName);
di->priority = prio;
- GNUNET_DISK_directory_iterator_next (di, GNUNET_NO);
+ return GNUNET_DISK_directory_iterator_next (di, GNUNET_NO);
}
* So we also explicitly check "isDirectory" */
(GNUNET_YES != GNUNET_DISK_directory_test (fileName)))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "rmdir", fileName);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "rmdir", fileName);
return GNUNET_SYSERR;
}
if (GNUNET_SYSERR ==
return GNUNET_SYSERR;
if (0 != RMDIR (fileName))
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "rmdir", fileName);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "rmdir", fileName);
return GNUNET_SYSERR;
}
return GNUNET_OK;
GNUNET_DISK_PERM_NONE);
if (!in)
return GNUNET_SYSERR;
- out = GNUNET_DISK_file_open (dst, GNUNET_DISK_OPEN_WRITE
- | GNUNET_DISK_OPEN_CREATE |
- GNUNET_DISK_OPEN_FAILIFEXISTS,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE |
- GNUNET_DISK_PERM_GROUP_READ |
- GNUNET_DISK_PERM_GROUP_WRITE);
+ out =
+ GNUNET_DISK_file_open (dst,
+ GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE |
+ GNUNET_DISK_OPEN_FAILIFEXISTS,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE |
+ GNUNET_DISK_PERM_GROUP_READ |
+ GNUNET_DISK_PERM_GROUP_WRITE);
if (!out)
{
GNUNET_DISK_file_close (in);
{
c = *idx;
- if (c == '/' || c == '\\' || c == ':' || c == '*' || c == '?' ||
- c == '"' || c == '<' || c == '>' || c == '|')
+ if (c == '/' || c == '\\' || c == ':' || c == '*' || c == '?' || c == '"' ||
+ c == '<' || c == '>' || c == '|')
{
*idx = '_';
}
pws = getpwnam (user);
if (pws == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Cannot obtain information about user `%s': %s\n"),
- user, STRERROR (errno));
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Cannot obtain information about user `%s': %s\n"), user,
+ STRERROR (errno));
return GNUNET_SYSERR;
}
if (0 != chown (filename, pws->pw_uid, pws->pw_gid))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chown", filename);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "chown", filename);
#endif
return GNUNET_OK;
}
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, off_t lockStart,
- off_t lockEnd, int excl)
+GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, OFF_T lockStart,
+ OFF_T lockEnd, int excl)
{
if (fh == NULL)
{
return fcntl (fh->fd, F_SETLK, &fl) != 0 ? GNUNET_SYSERR : GNUNET_OK;
#else
OVERLAPPED o;
+ OFF_T diff = lockEnd - lockStart;
+ DWORD diff_low, diff_high;
+ diff_low = (DWORD) (diff & 0xFFFFFFFF);
+ diff_high = (DWORD) ((diff >> (sizeof (DWORD) * 8)) & 0xFFFFFFFF);
memset (&o, 0, sizeof (OVERLAPPED));
- o.Offset = lockStart;
+ o.Offset = (DWORD) (lockStart & 0xFFFFFFFF);;
+ o.OffsetHigh = (DWORD) (((lockStart & ~0xFFFFFFFF) >> (sizeof (DWORD) * 8)) & 0xFFFFFFFF);
- if (!LockFileEx (fh->h, (excl ? LOCKFILE_EXCLUSIVE_LOCK : 0)
- | LOCKFILE_FAIL_IMMEDIATELY, 0, lockEnd - lockStart, 0, &o))
+ if (!LockFileEx
+ (fh->h, (excl ? LOCKFILE_EXCLUSIVE_LOCK : 0) | LOCKFILE_FAIL_IMMEDIATELY,
+ 0, diff_low, diff_high, &o))
{
SetErrnoFromWinError (GetLastError ());
return GNUNET_SYSERR;
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, off_t unlockStart,
- off_t unlockEnd)
+GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, OFF_T unlockStart,
+ OFF_T unlockEnd)
{
if (fh == NULL)
{
return fcntl (fh->fd, F_SETLK, &fl) != 0 ? GNUNET_SYSERR : GNUNET_OK;
#else
OVERLAPPED o;
+ OFF_T diff = unlockEnd - unlockStart;
+ DWORD diff_low, diff_high;
+ diff_low = (DWORD) (diff & 0xFFFFFFFF);
+ diff_high = (DWORD) ((diff >> (sizeof (DWORD) * 8)) & 0xFFFFFFFF);
memset (&o, 0, sizeof (OVERLAPPED));
- o.Offset = unlockStart;
+ o.Offset = (DWORD) (unlockStart & 0xFFFFFFFF);;
+ o.OffsetHigh = (DWORD) (((unlockStart & ~0xFFFFFFFF) >> (sizeof (DWORD) * 8)) & 0xFFFFFFFF);
- if (!UnlockFileEx (fh->h, 0, unlockEnd - unlockStart, 0, &o))
+ if (!UnlockFileEx (fh->h, 0, diff_low, diff_high, &o))
{
SetErrnoFromWinError (GetLastError ());
return GNUNET_SYSERR;
* @return IO handle on success, NULL on error
*/
struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_file_open (const char *fn,
- enum GNUNET_DISK_OpenFlags flags,
+GNUNET_DISK_file_open (const char *fn, enum GNUNET_DISK_OpenFlags flags,
enum GNUNET_DISK_AccessPermissions perm)
{
char *expfn;
DWORD access;
DWORD disp;
HANDLE h;
+ wchar_t wexpfn[MAX_PATH + 1];
#else
int oflags;
int mode;
if (fd == -1)
{
if (0 == (flags & GNUNET_DISK_OPEN_FAILIFEXISTS))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "open", expfn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "open", expfn);
else
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_DEBUG, "open", expfn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_DEBUG, "open", expfn);
GNUNET_free (expfn);
return NULL;
}
disp = OPEN_EXISTING;
}
- /* TODO: access priviledges? */
- h = CreateFile (expfn, access, FILE_SHARE_DELETE | FILE_SHARE_READ
- | FILE_SHARE_WRITE, NULL, disp, FILE_ATTRIBUTE_NORMAL, NULL);
+ if (ERROR_SUCCESS == plibc_conv_to_win_pathwconv(expfn, wexpfn))
+ h = CreateFileW (wexpfn, access,
+ FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+ disp, FILE_ATTRIBUTE_NORMAL, NULL);
+ else
+ h = INVALID_HANDLE_VALUE;
if (h == INVALID_HANDLE_VALUE)
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "open", expfn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "open", expfn);
GNUNET_free (expfn);
return NULL;
}
if (SetFilePointer (h, 0, 0, FILE_END) == INVALID_SET_FILE_POINTER)
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "SetFilePointer",
- expfn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "SetFilePointer", expfn);
CloseHandle (h);
GNUNET_free (expfn);
return NULL;
if (!CloseHandle (h->h))
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "close");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "close");
GNUNET_free (h->oOverlapRead);
GNUNET_free (h->oOverlapWrite);
GNUNET_free (h);
#else
if (close (h->fd) != 0)
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "close");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "close");
GNUNET_free (h);
return GNUNET_SYSERR;
}
return NULL;
if (pfx == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("No `%s' specified for service `%s' in configuration.\n"),
- "HOME", serviceName);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("No `%s' specified for service `%s' in configuration.\n"), "HOME",
+ serviceName);
return NULL;
}
needed = strlen (pfx) + 2;
#endif
}
+
#if WINDOWS
/* Copyright Bob Byrnes <byrnes <at> curl.com>
http://permalink.gmane.org/gmane.os.cygwin.patches/2121
Note that the return value is either NO_ERROR or GetLastError,
unlike CreatePipe, which returns a bool for success or failure. */
static int
-create_selectable_pipe (PHANDLE read_pipe_ptr,
- PHANDLE write_pipe_ptr,
- LPSECURITY_ATTRIBUTES sa_ptr,
- DWORD psize, DWORD dwReadMode, DWORD dwWriteMode)
+create_selectable_pipe (PHANDLE read_pipe_ptr, PHANDLE write_pipe_ptr,
+ LPSECURITY_ATTRIBUTES sa_ptr, DWORD psize,
+ DWORD dwReadMode, DWORD dwWriteMode)
{
/* Default to error. */
*read_pipe_ptr = *write_pipe_ptr = INVALID_HANDLE_VALUE;
snprintf (pipename, sizeof pipename, "\\\\.\\pipe\\gnunet-%d-%ld",
getpid (), InterlockedIncrement ((LONG *) & pipe_unique_id));
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "CreateNamedPipe: name = %s, size = %lu\n", pipename, psize);
+ 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
if (read_pipe != INVALID_HANDLE_VALUE)
{
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p\n",
- read_pipe);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p\n", read_pipe);
#endif
break;
}
/* The pipe is already open with compatible parameters.
* Pick a new name and retry. */
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pipe busy, retrying\n");
+ 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
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pipe access denied, retrying\n");
+ 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
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "CreateNamedPipe not implemented, resorting to "
- "CreatePipe: size = %lu\n", psize);
+ 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
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p\n",
- *read_pipe_ptr);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pipe write handle = %p\n",
- *write_pipe_ptr);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe read handle = %p\n",
+ *read_pipe_ptr);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe write handle = %p\n",
+ *write_pipe_ptr);
#endif
return GNUNET_OK;
}
err = GetLastError ();
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "CreatePipe failed: %d\n", err);
+ LOG (GNUNET_ERROR_TYPE_ERROR, "CreatePipe failed: %d\n", err);
return err;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "CreateNamedPipe failed: %d\n", err);
+ LOG (GNUNET_ERROR_TYPE_ERROR, "CreateNamedPipe failed: %d\n", err);
return err;
}
/* NOTREACHED */
}
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CreateFile: name = %s\n", pipename);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "CreateFile: name = %s\n", pipename);
#endif
/* Open the named pipe for writing.
DWORD err = GetLastError ();
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CreateFile failed: %d\n", err);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "CreateFile failed: %d\n", err);
#endif
CloseHandle (read_pipe);
return err;
}
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "pipe write handle = %p\n", write_pipe);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "pipe write handle = %p\n", write_pipe);
#endif
/* Success. */
*read_pipe_ptr = read_pipe;
}
#endif
+
/**
* Creates an interprocess channel
*
- * @param blocking creates an asynchronous pipe if set to GNUNET_NO
+ * @param blocking_read creates an asynchronous pipe for reading if set to GNUNET_NO
+ * @param blocking_write creates an asynchronous pipe for writing if set to GNUNET_NO
* @param inherit_read inherit the parent processes stdin (only for windows)
* @param inherit_write inherit the parent processes stdout (only for windows)
- *
* @return handle to the new pipe, NULL on error
*/
struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe (int blocking, int inherit_read, int inherit_write)
+GNUNET_DISK_pipe (int blocking_read, int blocking_write, int inherit_read, int inherit_write)
{
- 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];
#ifndef MINGW
int fd[2];
int ret;
- int flags;
int eno;
ret = pipe (fd);
if (ret == -1)
{
eno = errno;
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
- GNUNET_free (p);
- errno = eno;
- return NULL;
- }
- p->fd[0]->fd = fd[0];
- p->fd[1]->fd = fd[1];
- ret = 0;
- flags = fcntl (fd[0], F_GETFL);
- if (!blocking)
- flags |= O_NONBLOCK;
- if (0 > fcntl (fd[0], F_SETFL, flags))
- ret = -1;
- flags = fcntl (fd[0], F_GETFD);
- flags |= FD_CLOEXEC;
- if (0 > fcntl (fd[0], F_SETFD, flags))
- ret = -1;
-
- flags = fcntl (fd[1], F_GETFL);
- if (!blocking)
- flags |= O_NONBLOCK;
- if (0 > fcntl (fd[1], F_SETFL, flags))
- ret = -1;
- flags = fcntl (fd[1], F_GETFD);
- flags |= FD_CLOEXEC;
- if (0 > fcntl (fd[1], F_SETFD, flags))
- ret = -1;
- if (ret == -1)
- {
- eno = errno;
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fcntl");
- GNUNET_break (0 == close (p->fd[0]->fd));
- GNUNET_break (0 == close (p->fd[1]->fd));
- GNUNET_free (p);
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "pipe");
errno = eno;
return NULL;
}
+ return GNUNET_DISK_pipe_from_fd (blocking_read,
+ blocking_write,
+ fd);
#else
+ struct GNUNET_DISK_PipeHandle *p;
+ struct GNUNET_DISK_FileHandle *fds;
BOOL ret;
HANDLE tmp_handle;
+
+ 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];
+
+ /* All pipes are overlapped. If you want them to block - just
+ * call WriteFile() and ReadFile() with NULL overlapped pointer.
+ */
ret =
create_selectable_pipe (&p->fd[0]->h, &p->fd[1]->h, NULL, 0,
- FILE_FLAG_OVERLAPPED, FILE_FLAG_OVERLAPPED);
+ FILE_FLAG_OVERLAPPED,
+ FILE_FLAG_OVERLAPPED);
if (!ret)
{
GNUNET_free (p);
SetErrnoFromWinError (GetLastError ());
return NULL;
}
- if (!DuplicateHandle (GetCurrentProcess (), p->fd[0]->h,
- GetCurrentProcess (), &tmp_handle, 0,
- inherit_read == GNUNET_YES ? TRUE : FALSE,
- DUPLICATE_SAME_ACCESS))
+ if (!DuplicateHandle
+ (GetCurrentProcess (), p->fd[0]->h, GetCurrentProcess (), &tmp_handle, 0,
+ inherit_read == GNUNET_YES ? TRUE : FALSE, DUPLICATE_SAME_ACCESS))
{
SetErrnoFromWinError (GetLastError ());
CloseHandle (p->fd[0]->h);
CloseHandle (p->fd[0]->h);
p->fd[0]->h = tmp_handle;
- if (!DuplicateHandle (GetCurrentProcess (), p->fd[1]->h,
- GetCurrentProcess (), &tmp_handle, 0,
- inherit_write == GNUNET_YES ? TRUE : FALSE,
- DUPLICATE_SAME_ACCESS))
+ if (!DuplicateHandle
+ (GetCurrentProcess (), p->fd[1]->h, GetCurrentProcess (), &tmp_handle, 0,
+ inherit_write == GNUNET_YES ? TRUE : FALSE, DUPLICATE_SAME_ACCESS))
{
SetErrnoFromWinError (GetLastError ());
CloseHandle (p->fd[0]->h);
}
CloseHandle (p->fd[1]->h);
p->fd[1]->h = tmp_handle;
- if (!blocking)
- {
- DWORD mode;
- mode = PIPE_NOWAIT;
- SetNamedPipeHandleState (p->fd[0]->h, &mode, NULL, NULL);
- SetNamedPipeHandleState (p->fd[1]->h, &mode, NULL, NULL);
- /* this always fails on Windows 95, so we don't care about error handling */
- }
p->fd[0]->type = GNUNET_PIPE;
p->fd[1]->type = GNUNET_PIPE;
p->fd[1]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
p->fd[1]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
+ return p;
+#endif
+}
+
+
+/**
+ * Creates a pipe object from a couple of file descriptors.
+ * Useful for wrapping existing pipe FDs.
+ *
+ * @param blocking_read creates an asynchronous pipe for reading if set to GNUNET_NO
+ * @param blocking_write creates an asynchronous pipe for writing if set to GNUNET_NO
+ * @param fd an array of two fd values. One of them may be -1 for read-only or write-only pipes
+ *
+ * @return handle to the new pipe, NULL on error
+ */
+struct GNUNET_DISK_PipeHandle *
+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];
+#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)
+ {
+ if (!blocking_read)
+ {
+ flags = fcntl (fd[0], F_GETFL);
+ flags |= O_NONBLOCK;
+ if (0 > fcntl (fd[0], F_SETFL, flags))
+ {
+ ret = -1;
+ eno = errno;
+ }
+ }
+ flags = fcntl (fd[0], F_GETFD);
+ flags |= FD_CLOEXEC;
+ if (0 > fcntl (fd[0], F_SETFD, flags))
+ {
+ ret = -1;
+ eno = errno;
+ }
+ }
+
+ if (fd[1] >= 0)
+ {
+ if (!blocking_write)
+ {
+ flags = fcntl (fd[1], F_GETFL);
+ flags |= O_NONBLOCK;
+ if (0 > fcntl (fd[1], F_SETFL, flags))
+ {
+ ret = -1;
+ eno = errno;
+ }
+ }
+ flags = fcntl (fd[1], F_GETFD);
+ flags |= FD_CLOEXEC;
+ if (0 > fcntl (fd[1], F_SETFD, flags))
+ {
+ ret = -1;
+ eno = errno;
+ }
+ }
+ if (ret == -1)
+ {
+ errno = eno;
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "fcntl");
+ if (p->fd[0]->fd >= 0)
+ GNUNET_break (0 == close (p->fd[0]->fd));
+ if (p->fd[1]->fd >= 0)
+ GNUNET_break (0 == close (p->fd[1]->fd));
+ 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);
+ }
+
+ if (p->fd[1]->h != INVALID_HANDLE_VALUE)
+ {
+ 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);
+ }
#endif
return p;
}
#ifdef MINGW
if (end == GNUNET_DISK_PIPE_END_READ)
{
- if (!CloseHandle (p->fd[0]->h))
+ if (p->fd[0]->h != INVALID_HANDLE_VALUE)
{
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
+ 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;
}
- p->fd[0]->h = INVALID_HANDLE_VALUE;
}
else if (end == GNUNET_DISK_PIPE_END_WRITE)
{
- if (!CloseHandle (p->fd[1]->h))
+ if (p->fd[0]->h != INVALID_HANDLE_VALUE)
{
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
+ 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;
}
- p->fd[1]->h = INVALID_HANDLE_VALUE;
}
save = errno;
#else
return ret;
}
+
/**
* Closes an interprocess channel
*
int save;
#ifdef MINGW
- if (!CloseHandle (p->fd[0]->h))
+ if (p->fd[0]->h != INVALID_HANDLE_VALUE)
{
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
+ if (!CloseHandle (p->fd[0]->h))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ ret = GNUNET_SYSERR;
+ }
+ GNUNET_free (p->fd[0]->oOverlapRead);
+ GNUNET_free (p->fd[0]->oOverlapWrite);
}
- if (!CloseHandle (p->fd[1]->h))
+ if (p->fd[1]->h != INVALID_HANDLE_VALUE)
{
- SetErrnoFromWinError (GetLastError ());
- ret = GNUNET_SYSERR;
+ if (!CloseHandle (p->fd[1]->h))
+ {
+ SetErrnoFromWinError (GetLastError ());
+ ret = GNUNET_SYSERR;
+ }
+ GNUNET_free (p->fd[1]->oOverlapRead);
+ GNUNET_free (p->fd[1]->oOverlapWrite);
}
save = errno;
#else
}
-/**
- * Creates a named pipe/FIFO and opens it
- * @param fn pointer to the name of the named pipe or to NULL
- * @param flags open flags
- * @param perm access permissions
- * @return pipe handle on success, NULL on error
- */
-struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_npipe_create (char **fn,
- enum GNUNET_DISK_OpenFlags flags,
- enum GNUNET_DISK_AccessPermissions perm)
-{
-#ifdef MINGW
- struct GNUNET_DISK_FileHandle *ret;
- HANDLE h = NULL;
- DWORD openMode;
- char *name;
-
- openMode = 0;
- if (flags & GNUNET_DISK_OPEN_READWRITE)
- openMode = PIPE_ACCESS_DUPLEX;
- else if (flags & GNUNET_DISK_OPEN_READ)
- openMode = PIPE_ACCESS_INBOUND;
- else if (flags & GNUNET_DISK_OPEN_WRITE)
- openMode = PIPE_ACCESS_OUTBOUND;
-
- if (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)
- openMode |= FILE_FLAG_FIRST_PIPE_INSTANCE;
-
- while (h == NULL)
- {
- DWORD error_code;
-
- name = NULL;
- if (*fn != NULL)
- {
- GNUNET_asprintf (&name, "\\\\.\\pipe\\%.246s", fn);
-#if DEBUG_NPIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to create an instance of named pipe `%s'\n", name);
-#endif
- h = CreateNamedPipe (name, openMode | FILE_FLAG_OVERLAPPED,
- PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 2, 1, 1, 0,
- NULL);
- }
- else
- {
- GNUNET_asprintf (fn, "\\\\.\\pipe\\gnunet-%llu",
- GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX));
-#if DEBUG_NPIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to create unique named pipe `%s'\n", *fn);
-#endif
- h = CreateNamedPipe (*fn,
- openMode | FILE_FLAG_OVERLAPPED |
- FILE_FLAG_FIRST_PIPE_INSTANCE,
- PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 2, 1, 1, 0,
- NULL);
- }
- error_code = GetLastError ();
- if (name)
- GNUNET_free (name);
- /* don't re-set name to NULL yet */
- if (h == INVALID_HANDLE_VALUE)
- {
- SetErrnoFromWinError (error_code);
-#if DEBUG_NPIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Pipe creation have failed because of %d, errno is %d\n",
- error_code, errno);
-#endif
- if (name == NULL)
- {
-#if DEBUG_NPIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Pipe was to be unique, considering re-creation\n");
-#endif
- GNUNET_free (*fn);
- *fn = NULL;
- if (error_code != ERROR_ACCESS_DENIED && error_code != ERROR_PIPE_BUSY)
- {
- return NULL;
- }
-#if DEBUG_NPIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Pipe name was not unique, trying again\n");
-#endif
- h = NULL;
- }
- else
- return NULL;
- }
- }
- errno = 0;
-
- ret = GNUNET_malloc (sizeof (*ret));
- ret->h = h;
- ret->type = GNUNET_PIPE;
-
- ret->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
- ret->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
-
- ret->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
- ret->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-
- return ret;
-#else
- if (*fn == NULL)
- {
- char dir[] = "/tmp/gnunet-pipe-XXXXXX";
-
- if (mkdtemp (dir) == NULL)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "mkdtemp");
- return NULL;
- }
- GNUNET_asprintf (fn, "%s/child-control", dir);
- }
-
- if (mkfifo (*fn, translate_unix_perms (perm)) == -1)
- {
- if ((errno != EEXIST) || (0 != (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)))
- return NULL;
- }
-
- flags = flags & (~GNUNET_DISK_OPEN_FAILIFEXISTS);
- return GNUNET_DISK_file_open (*fn, flags, perm);
-#endif
-}
-
-
-/**
- * Opens already existing named pipe/FIFO
- *
- * @param fn name of an existing named pipe
- * @param flags open flags
- * @param perm access permissions
- * @return pipe handle on success, NULL on error
- */
-struct GNUNET_DISK_FileHandle *
-GNUNET_DISK_npipe_open (const char *fn,
- enum GNUNET_DISK_OpenFlags flags,
- enum GNUNET_DISK_AccessPermissions perm)
-{
-#ifdef MINGW
- struct GNUNET_DISK_FileHandle *ret;
- HANDLE h;
- DWORD openMode;
-
- openMode = 0;
- if (flags & GNUNET_DISK_OPEN_READWRITE)
- openMode = GENERIC_WRITE | GENERIC_READ;
- else if (flags & GNUNET_DISK_OPEN_READ)
- openMode = GENERIC_READ;
- else if (flags & GNUNET_DISK_OPEN_WRITE)
- openMode = GENERIC_WRITE;
-
- h = CreateFile (fn, openMode, 0, NULL, OPEN_EXISTING,
- FILE_FLAG_OVERLAPPED | FILE_READ_ATTRIBUTES, NULL);
- if (h == INVALID_HANDLE_VALUE)
- {
- SetErrnoFromWinError (GetLastError ());
- return NULL;
- }
-
- ret = GNUNET_malloc (sizeof (*ret));
- ret->h = h;
- ret->type = GNUNET_PIPE;
- ret->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
- ret->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
- ret->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
- ret->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-
- return ret;
-#else
- flags = flags & (~GNUNET_DISK_OPEN_FAILIFEXISTS);
- return GNUNET_DISK_file_open (fn, flags, perm);
-#endif
-}
-
-/**
- * Closes a named pipe/FIFO
- * @param pipe named pipe
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
- */
-int
-GNUNET_DISK_npipe_close (struct GNUNET_DISK_FileHandle *pipe)
-{
-#ifndef MINGW
- return close (pipe->fd) == 0 ? GNUNET_OK : GNUNET_SYSERR;
-#else
- BOOL ret;
-
- ret = CloseHandle (pipe->h);
- if (!ret)
- {
- SetErrnoFromWinError (GetLastError ());
- return GNUNET_SYSERR;
- }
- else
- return GNUNET_OK;
-#endif
-}
-
-
/**
* Get the handle to a particular pipe end
*
projects / oweals / gnunet.git / blobdiff