Merge remote-tracking branch 'origin/master' into credentials

[oweals/gnunet.git] / src / util / w32cat.c

diff --git a/src/util/w32cat.c b/src/util/w32cat.c
index 4f56ba58eb330370e68a0971a4f288c4882b87da..f2a0feac5fd544db793a9aacd6427e2693d7700d 100644 (file)
--- a/src/util/w32cat.c
+++ b/src/util/w32cat.c
@@ -1,6 +1,6 @@
 /*
      W32 version of 'cat' program
-     (C) 2012 LRN
+     Copyright (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
@@ -14,8 +14,8 @@
 
      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.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 #include <stdio.h>
@@ -57,7 +57,7 @@ install_parent_control_handler ()
   if ((0 != errno) || (env_buf == env_buf_end))
     return;
   /* Gcc will issue a warning here. What to do with it? */
-  pipe_handle = (HANDLE) pipe_fd;
+  pipe_handle = (HANDLE) (uintptr_t) pipe_fd;
   CreateThread (NULL, 0, parent_control_thread, (LPVOID) pipe_handle, 0, NULL);
 }
 
@@ -84,7 +84,7 @@ main (int argc, char **argv)
   for (i = 1; i < argcw || argcw == 1; i++)
   {
     DWORD r, w;
-    int is_dash = wcscmp (argvw[i], L"-") == 0;
+    int is_dash = wcscmp (NULL == argvw[i] ? L"-" : argvw[i], L"-") == 0;
     if (argcw == 1 || is_dash)
     {
       stdi = GetStdHandle (STD_INPUT_HANDLE);