[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22245 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22245 - gnunet/src/util |
Date: |
Sun, 24 Jun 2012 00:33:52 +0200 |
Author: grothoff
Date: 2012-06-24 00:33:52 +0200 (Sun, 24 Jun 2012)
New Revision: 22245
Added:
gnunet/src/util/w32cat.c
Modified:
gnunet/src/util/Makefile.am
gnunet/src/util/test_os_start_process.c
Log:
-LRN: Wincat:
I've been experimenting with an alternative non-MSYS buildsystem for
a while, and GNUNET_os_start_process() test kept failing due to lack
of cat. Wincat is a minimal cat implementation in pure WinAPI. It's
not named "cat.exe" to avoid clashing with MSYS cat (which can lead to
some very weird issues).
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2012-06-23 22:32:58 UTC (rev 22244)
+++ gnunet/src/util/Makefile.am 2012-06-23 22:33:52 UTC (rev 22245)
@@ -22,6 +22,7 @@
-lshell32 -liconv -lstdc++ \
-lcomdlg32 -lgdi32 -liphlpapi
WINLIB = libgnunetutilwin.la
+W32CAT = w32cat
endif
if !MINGW
@@ -33,8 +34,11 @@
XLIB = -lgcov
endif
+cat_SOURCES = w32cat.c
+
noinst_PROGRAMS = \
gnunet-config-diff \
+ $(W32CAT) \
test_common_logging_dummy
@@ -224,6 +228,8 @@
test_os_start_process.c
test_os_start_process_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+test_os_start_process_DEPENDENCIES = \
+ $(WINCAT)
test_client_SOURCES = \
test_client.c
Modified: gnunet/src/util/test_os_start_process.c
===================================================================
--- gnunet/src/util/test_os_start_process.c 2012-06-23 22:32:58 UTC (rev
22244)
+++ gnunet/src/util/test_os_start_process.c 2012-06-23 22:33:52 UTC (rev
22245)
@@ -113,7 +113,11 @@
const struct GNUNET_DISK_FileHandle *stdout_read_handle;
const struct GNUNET_DISK_FileHandle *wh;
+#if !WINDOWS
GNUNET_asprintf (&fn, "cat");
+#else
+ GNUNET_asprintf (&fn, "w32cat");
+#endif
hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES,
GNUNET_NO);
hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
GNUNET_YES);
@@ -183,6 +187,12 @@
static int
check_kill ()
{
+ char *fn;
+#if !WINDOWS
+ GNUNET_asprintf (&fn, "cat");
+#else
+ GNUNET_asprintf (&fn, "w32cat");
+#endif
hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES,
GNUNET_NO);
hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
GNUNET_YES);
if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
@@ -190,7 +200,7 @@
return 1;
}
proc =
- GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout,
"cat",
+ GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout,
fn,
"gnunet-service-resolver", "-", NULL);
sleep (1); /* give process time to start, so we actually use the pipe-kill
mechanism! */
if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
@@ -210,6 +220,12 @@
static int
check_instant_kill ()
{
+ char *fn;
+#if !WINDOWS
+ GNUNET_asprintf (&fn, "cat");
+#else
+ GNUNET_asprintf (&fn, "w32cat");
+#endif
hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES,
GNUNET_NO);
hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
GNUNET_YES);
if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
@@ -217,7 +233,7 @@
return 1;
}
proc =
- GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout,
"cat",
+ GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout,
fn,
"gnunet-service-resolver", "-", NULL);
if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
{
Added: gnunet/src/util/w32cat.c
===================================================================
--- gnunet/src/util/w32cat.c (rev 0)
+++ gnunet/src/util/w32cat.c 2012-06-23 22:33:52 UTC (rev 22245)
@@ -0,0 +1,108 @@
+/*
+ W32 version of 'cat' program
+ (C) 2012 LRN
+
+ cat is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ cat is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with cat; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+#include <stdio.h>
+#include <windows.h>
+
+int
+main (int argc, char **argv)
+{
+ HANDLE stdi, stdo;
+ BOOL b;
+ wchar_t *commandlinew, **argvw;
+ int argcw;
+ int i;
+
+ stdo = GetStdHandle (STD_OUTPUT_HANDLE);
+ if (stdo == INVALID_HANDLE_VALUE || stdo == NULL)
+ return 1;
+
+ commandlinew = GetCommandLineW ();
+ argvw = CommandLineToArgvW (commandlinew, &argcw);
+ if (argvw == NULL)
+ return 1;
+
+ for (i = 1; i < argcw || argcw == 1; i++)
+ {
+ DWORD r, w;
+ int is_dash = wcscmp (argvw[i], L"-") == 0;
+ if (argcw == 1 || is_dash)
+ {
+ stdi = GetStdHandle (STD_INPUT_HANDLE);
+ if (stdi == INVALID_HANDLE_VALUE)
+ {
+ fprintf (stderr, "cat: Failed to obtain stdin handle.\n");
+ return 4;
+ }
+ if (stdi == NULL)
+ {
+ fprintf (stderr, "cat: Have no stdin.\n");
+ return 5;
+ }
+ }
+ else
+ {
+ stdi = CreateFileW (argvw[i], GENERIC_READ, FILE_SHARE_DELETE |
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+ if (stdi == INVALID_HANDLE_VALUE)
+ {
+ wchar_t *msgbuf;
+ DWORD le = GetLastError ();
+ if (0 < FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM, 0, le, 0, (wchar_t *) &msgbuf, 0, NULL))
+ {
+ fprintf (stderr, "cat: Failed to open file `%S'. Error %lu.\n",
argvw[i], le);
+ return 3;
+ }
+ fprintf (stderr, "cat: Failed to open file `%S'. Error %lu: %S\n",
argvw[i], le, msgbuf);
+ if (msgbuf != NULL)
+ LocalFree (msgbuf);
+ return 2;
+ }
+ }
+ do
+ {
+ unsigned char c;
+ b = ReadFile (stdi, &c, 1, &r, NULL);
+ if (r > 0)
+ {
+ b = WriteFile (stdo, &c, 1, &w, NULL);
+ if (b == 0)
+ {
+ wchar_t *msgbuf;
+ DWORD le = GetLastError ();
+ if (0 < FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM, 0, le, 0, (wchar_t *) &msgbuf, 0, NULL))
+ {
+ fprintf (stderr, "cat: Failed to write into stdout. Error %lu.\n",
le);
+ return 3;
+ }
+ fprintf (stderr, "cat: Failed to write into stdout. Error %lu:
%S\n", le, msgbuf);
+ if (msgbuf != NULL)
+ LocalFree (msgbuf);
+ return 6;
+ }
+ }
+ } while (b && r > 0);
+ if (argcw == 1)
+ break;
+ if (!is_dash)
+ CloseHandle (stdi);
+ }
+ LocalFree (argvw);
+ return 0;
+}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22245 - gnunet/src/util,
gnunet <=