#include "gnunet_crypto_lib.h"
#include "disk.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#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
#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
#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
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
#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.
+ * 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);
+ GNUNET_free (wpath);
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;
{
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 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\n");
#endif
if (!WriteFile (h->h, buffer, n, NULL, h->oOverlapWrite))
{
{
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\n");
#endif
return GNUNET_SYSERR;
}
}
#if DEBUG_PIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Will get overlapped result\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Will get overlapped result\n");
#endif
GetOverlappedResult (h->h, h->oOverlapWrite, &bytesWritten, TRUE);
}
return ret;
}
+
/**
* Scan a directory for files.
*
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, "..")))
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_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, "..")))
* 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;
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))
+ 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;
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;
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;
if (ret == -1)
{
eno = errno;
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "pipe");
GNUNET_free (p);
errno = eno;
return NULL;
if (ret == -1)
{
eno = errno;
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fcntl");
+ 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);
{
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to create an instance of named pipe `%s'\n", name);
#endif
+ /* 1) This might work just fine with UTF-8 strings as it is.
+ * 2) This is only used by GNUnet itself, and only with latin names.
+ */
h = CreateNamedPipe (name, openMode | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 2, 1, 1, 0,
NULL);
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);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying to create unique named pipe `%s'\n",
+ *fn);
#endif
h = CreateNamedPipe (*fn,
openMode | FILE_FLAG_OVERLAPPED |
{
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);
+ 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");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Pipe was to be unique, considering re-creation\n");
#endif
GNUNET_free (*fn);
*fn = NULL;
return NULL;
}
#if DEBUG_NPIPE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Pipe name was not unique, trying again\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Pipe name was not unique, trying again\n");
#endif
h = NULL;
}
if (mkdtemp (dir) == NULL)
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "mkdtemp");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "mkdtemp");
return NULL;
}
GNUNET_asprintf (fn, "%s/child-control", dir);