* libltp/include/test.h: Fix C warnings.

* winsup.api/checksignal.c: Ditto.
* winsup.api/crlf.c: Ditto.
* winsup.api/devzero.c: Ditto.
* winsup.api/iospeed.c: Ditto.
* winsup.api/mmaptest01.c: Ditto.
* winsup.api/mmaptest02.c: Ditto.
* winsup.api/mmaptest03.c: Ditto.
* winsup.api/mmaptest04.c: Ditto.
* winsup.api/nullgetcwd.c: Ditto.
* winsup.api/sigchld.c: Ditto.
* winsup.api/signal-into-win32-api.c: Ditto.
* winsup.api/systemcall.c: Ditto.
* winsup.api/waitpid.c: Ditto.
* winsup.api/pthread/mainthreadexits.c: Ditto.
* winsup.api/pthread/test.h: Ditto.
* winsup.api/pthread/threadidafterfork.c: Ditto.
* Makefile.in: Remove cygrun.exe from RUNTIME since it is built here now.

16 files changed, 103 insertions, 86 deletions

diff --git a/winsup/testsuite/winsup.api/checksignal.c b/winsup/testsuite/winsup.api/checksignal.c
index a8b5d3927..0481d8347 100644
--- a/winsup/testsuite/winsup.api/checksignal.c
+++ b/winsup/testsuite/winsup.api/checksignal.c
@@ -7,7 +7,7 @@
 #include "test.h"
 #include "usctest.h"
 
-char *TCID = "checksignal";    	/* Test program identifier. */
+const char *TCID = "checksignal";    	/* Test program identifier. */
 int TST_TOTAL = 3;              /* Total number of test cases. */
 extern int Tst_count;           /* Test Case counter for tst_* routines */
 
diff --git a/winsup/testsuite/winsup.api/crlf.c b/winsup/testsuite/winsup.api/crlf.c
index 5dbc2227b..ccabb8f69 100644
--- a/winsup/testsuite/winsup.api/crlf.c
+++ b/winsup/testsuite/winsup.api/crlf.c
@@ -1,4 +1,3 @@
-
 typedef enum {
   Nop=100000,	/* 	; do nothing */
   New1,		/*	; reset and begin new  test */
@@ -146,6 +145,7 @@ int commands[] = {
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -250,7 +250,7 @@ v(char *fmt, ...)
 }
 
 void
-vp(char *fmt, ...)
+vp(const char *fmt, ...)
 {
   va_list ap;
   if (!verbose) return;
@@ -262,7 +262,7 @@ vp(char *fmt, ...)
 }
 
 void
-errorq(int use_errno, char *fmt, ...)
+errorq(int use_errno, const char *fmt, ...)
 {
   va_list ap;
   fprintf(stderr, "crlf: Error at pc=%d: ", pc);
@@ -276,7 +276,7 @@ errorq(int use_errno, char *fmt, ...)
 }
 
 void
-error(int use_errno, char *fmt, ...)
+error(int use_errno, const char *fmt, ...)
 {
   va_list ap;
   fprintf(stderr, "crlf: Error at pc=%d: ", pc);
@@ -291,7 +291,7 @@ error(int use_errno, char *fmt, ...)
 }
 
 void
-display_buf(char *which, Buffer *buf, int ofs)
+display_buf(const char *which, Buffer *buf, int ofs)
 {
   int i;
   fprintf(stderr, "%s %04x:", which, ofs);
@@ -303,13 +303,13 @@ display_buf(char *which, Buffer *buf, int ofs)
 	if (isgraph(b))
 	  fprintf(stderr, " %c ", b);
 	else
-	  fprintf(stderr, "   ", b);
+	  fprintf(stderr, " . "/*, b*/);
       }
   fprintf(stderr, "\n");
 }
 
 void
-compare_bufs(char *name, Buffer *actual, Buffer *expected)
+compare_bufs(const char *name, Buffer *actual, Buffer *expected)
 {
   int i, got_one=0;
   for (i=0; i<actual->count && i<expected->count; i++)
@@ -340,12 +340,12 @@ compare_bufs(char *name, Buffer *actual, Buffer *expected)
 int
 main(int argc, char **argv)
 {
-  char *readmode = "rb";
-  char *writemode = "wb";
+  const char *readmode = "rb";
+  const char *writemode = "wb";
   FILE *file = 0;
-  int i, fd;
+  int i;
   struct stat st;
-  char *str;
+  const char *str = "";
 
   while (argc > 1 && argv[1][0] == '-')
     {
diff --git a/winsup/testsuite/winsup.api/devzero.c b/winsup/testsuite/winsup.api/devzero.c
index 85a2615b1..948b0bff5 100644
--- a/winsup/testsuite/winsup.api/devzero.c
+++ b/winsup/testsuite/winsup.api/devzero.c
@@ -1,12 +1,14 @@
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 
-main()
+int
+main(int argc, char **argv)
 {
-  int fd, r, w, l;
+  int fd, r, l;
   char buf[1024];
   char *v;
 
diff --git a/winsup/testsuite/winsup.api/iospeed.c b/winsup/testsuite/winsup.api/iospeed.c
index d286f90bd..56bf715cf 100644
--- a/winsup/testsuite/winsup.api/iospeed.c
+++ b/winsup/testsuite/winsup.api/iospeed.c
@@ -33,7 +33,7 @@ void
 end()
 {
   unsigned long end_tic = GetTickCount();
-  printf("%6d", end_tic - start_tic);
+  printf("%6ld", end_tic - start_tic);
 }
 
 void
diff --git a/winsup/testsuite/winsup.api/mmaptest01.c b/winsup/testsuite/winsup.api/mmaptest01.c
index a48110eb7..4add28001 100644
--- a/winsup/testsuite/winsup.api/mmaptest01.c
+++ b/winsup/testsuite/winsup.api/mmaptest01.c
@@ -52,11 +52,12 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "test.h"
 #include "usctest.h"
 
-char *TCID = "mmaptest01";	/* Test program identifier. */
+const char *TCID = "mmaptest01";	/* Test program identifier. */
 int TST_TOTAL = 7;		/* Total number of test cases. */
 extern int Tst_count;		/* Test Case counter for tst_* routines */
 
@@ -77,8 +78,6 @@ char const line2 [] = "y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2\n";
 
 int main ()
 {
-  int ret = 0;
-
   char fnam1[32];
   char fnam2[32];
 
diff --git a/winsup/testsuite/winsup.api/mmaptest02.c b/winsup/testsuite/winsup.api/mmaptest02.c
index ec5bac7f7..bec7c392c 100644
--- a/winsup/testsuite/winsup.api/mmaptest02.c
+++ b/winsup/testsuite/winsup.api/mmaptest02.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 
 sigset_t unblock_sigsegv;
 jmp_buf r;
@@ -27,7 +28,7 @@ int fd;
 */
 
 void
-perror_exit (char *str, int code)
+perror_exit (const char *str, int code)
 {
   printf ("%s: %s\n", str, strerror (errno));
   exit (code);
diff --git a/winsup/testsuite/winsup.api/mmaptest03.c b/winsup/testsuite/winsup.api/mmaptest03.c
index 544e3e43c..5c871dbf2 100644
--- a/winsup/testsuite/winsup.api/mmaptest03.c
+++ b/winsup/testsuite/winsup.api/mmaptest03.c
@@ -8,6 +8,7 @@
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <errno.h>
+#include <string.h>
 
 /* - Checks if mapping of already closed file survives fork()
    - Checks if mapping the same region of the same file twice
@@ -21,7 +22,7 @@ jmp_buf r;
 char const line[] = "y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1";
 
 void
-perror_exit (char *str)
+perror_exit (const char *str)
 {    
   printf ("%s: %s\n", str, strerror (errno));
   exit (1);
@@ -37,7 +38,7 @@ sigsegv (int unused)
 int
 main(int argc, char **argv)
 {
-  int i, fd, status;
+  int fd, status;
   struct stat statbuf;
   char c, *buf1, *buf2;
   pid_t pid;
diff --git a/winsup/testsuite/winsup.api/mmaptest04.c b/winsup/testsuite/winsup.api/mmaptest04.c
index 56c4a88b7..52302bae1 100644
--- a/winsup/testsuite/winsup.api/mmaptest04.c
+++ b/winsup/testsuite/winsup.api/mmaptest04.c
@@ -2,6 +2,9 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -10,7 +13,7 @@
 int
 main ()
 {
-  char *data, *data2, *data3;
+  char *data, *data2 = NULL, *data3;
   int i, pagesize;
   int fd;
 
diff --git a/winsup/testsuite/winsup.api/nullgetcwd.c b/winsup/testsuite/winsup.api/nullgetcwd.c
index f7d873261..25bdf4514 100644
--- a/winsup/testsuite/winsup.api/nullgetcwd.c
+++ b/winsup/testsuite/winsup.api/nullgetcwd.c
@@ -1,8 +1,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h>
 int
-main (int argc, char *argv)
+main (int argc, char **argv)
 {
   char *cwd = getcwd (NULL, 256);
   if (cwd == NULL)
diff --git a/winsup/testsuite/winsup.api/pthread/mainthreadexits.c b/winsup/testsuite/winsup.api/pthread/mainthreadexits.c
index dbd6969dd..b3a3653b8 100644
--- a/winsup/testsuite/winsup.api/pthread/mainthreadexits.c
+++ b/winsup/testsuite/winsup.api/pthread/mainthreadexits.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <stdlib.h>
 
 static void * Thread (void *);
 
diff --git a/winsup/testsuite/winsup.api/pthread/test.h b/winsup/testsuite/winsup.api/pthread/test.h
index a9a211dd7..3e662a315 100644
--- a/winsup/testsuite/winsup.api/pthread/test.h
+++ b/winsup/testsuite/winsup.api/pthread/test.h
@@ -16,7 +16,7 @@
 
 /* #define assert(x) do { fprint (stderr, "assertion failed\n"); exit(1) } while (0) */
 
-char * error_string[] = {
+const char * error_string[] = {
   "ZERO_or_EOK",
   "EPERM",
   "ENOFILE_or_ENOENT",
diff --git a/winsup/testsuite/winsup.api/pthread/threadidafterfork.c b/winsup/testsuite/winsup.api/pthread/threadidafterfork.c
index da93a4d3f..473eaecfd 100644
--- a/winsup/testsuite/winsup.api/pthread/threadidafterfork.c
+++ b/winsup/testsuite/winsup.api/pthread/threadidafterfork.c
@@ -2,6 +2,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <pthread.h>
+#include <stdlib.h>
 
 static void * TestThread ( void * );
 
diff --git a/winsup/testsuite/winsup.api/sigchld.c b/winsup/testsuite/winsup.api/sigchld.c
index a7d1069b7..b12876d4a 100644
--- a/winsup/testsuite/winsup.api/sigchld.c
+++ b/winsup/testsuite/winsup.api/sigchld.c
@@ -1,6 +1,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
+#include <stdlib.h>
 
 int no_signal_caught = 1;
 
@@ -9,6 +10,7 @@ void handler ( int signo )
   no_signal_caught = 0;
 }
 
+int
 main()
 {
   pid_t pid;
diff --git a/winsup/testsuite/winsup.api/signal-into-win32-api.c b/winsup/testsuite/winsup.api/signal-into-win32-api.c
index 23437c407..26d0cd8e0 100755
--- a/winsup/testsuite/winsup.api/signal-into-win32-api.c
+++ b/winsup/testsuite/winsup.api/signal-into-win32-api.c
@@ -1,57 +1,58 @@
-/*

- * Test if signal is delivered to the application which is

- * currently inside of native syscall 

- */

-

-#include <errno.h>

-#include <signal.h>

-#include <stdio.h>

-#include <unistd.h>

-#include <windows.h>

-

-int saw_sigchld = 0;

-int sleep_stage = -1;

-

-void

-handle_child (int signo)

-{

-  printf ( "saw SIGCHLD, %d", sleep_stage);

-  saw_sigchld = 1; 

-}

-

-int

-main (int argc, char** argv)

-{

-  pid_t pid;

-  if (argc > 1)

-    {

-      Sleep (200);

-      return 0;

-    }

-

-  signal (SIGCHLD, handle_child);

-  pid = fork ();

-  if (pid < 0) 

-    {

-      perror ( "fork" );

-      return 2;

-    }

-  else if (pid == 0)

-    execl ( argv[0], argv[0], "child", 0 );

-  else

-    {

-      sleep_stage = 0;

-      Sleep (3000);

-      sleep_stage = 1;

-      sleep (10);

-      sleep_stage = 2;

-      if (!saw_sigchld)

-        {

-          printf ( "oops\n" );

-          kill (pid, SIGTERM);

-          return 1;

-        }

-      else

-        return 0;

-    }

-}

+/*
+ * Test if signal is delivered to the application which is
+ * currently inside of native syscall 
+ */
+
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <windows.h>
+
+int saw_sigchld = 0;
+int sleep_stage = -1;
+
+void
+handle_child (int signo)
+{
+  printf ( "saw SIGCHLD, %d", sleep_stage);
+  saw_sigchld = 1; 
+}
+
+int
+main (int argc, char** argv)
+{
+  pid_t pid;
+  if (argc > 1)
+    {
+      Sleep (200);
+      return 0;
+    }
+
+  signal (SIGCHLD, handle_child);
+  pid = fork ();
+  if (pid < 0) 
+    {
+      perror ( "fork" );
+      return 2;
+    }
+  else if (pid == 0)
+    execl ( argv[0], argv[0], "child", 0 );
+  else
+    {
+      sleep_stage = 0;
+      Sleep (3000);
+      sleep_stage = 1;
+      sleep (10);
+      sleep_stage = 2;
+      if (!saw_sigchld)
+        {
+          printf ( "oops\n" );
+          kill (pid, SIGTERM);
+          return 1;
+        }
+      else
+        return 0;
+    }
+    exit (0);
+}
diff --git a/winsup/testsuite/winsup.api/systemcall.c b/winsup/testsuite/winsup.api/systemcall.c
index 026f430ff..91dd748c0 100644
--- a/winsup/testsuite/winsup.api/systemcall.c
+++ b/winsup/testsuite/winsup.api/systemcall.c
@@ -2,6 +2,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/wait.h>
 
 int
 main (int argc, char **argv)
@@ -13,19 +16,19 @@ main (int argc, char **argv)
   close (0);
   if ((fd = open ("/dev/null", O_WRONLY)) != 0)
     {
-      fprintf (stderr, "couldn't redirect stdin to /dev/null, fd %d - %s\n", fd, strerror ());
+      fprintf (stderr, "couldn't redirect stdin to /dev/null, fd %d - %s\n", fd, strerror (errno));
       exit (1);
     }
 
   close (1);
   if ((fd = open ("/dev/null", O_WRONLY)) != 1)
     {
-      fprintf (stderr, "couldn't redirect stdout to /dev/null, fd %d - %s\n", fd, strerror ());
+      fprintf (stderr, "couldn't redirect stdout to /dev/null, fd %d - %s\n", fd, strerror (errno));
       exit (1);
     }
   if (pipe (fds))
     {
-      fprintf (stderr, "pipe call failed - %s\n", strerror ());
+      fprintf (stderr, "pipe call failed - %s\n", strerror (errno));
       exit (1);
     }
   if ((pid = fork ()) == 0)
@@ -33,7 +36,7 @@ main (int argc, char **argv)
       close (fds[0]);
       if (dup2 (fds[1], 2) != 2)
 	{
-	  fprintf (stderr, "couldn't redirect stderr to pipe - %s\n", strerror ());
+	  fprintf (stderr, "couldn't redirect stderr to pipe - %s\n", strerror (errno));
 	  exit (1);
 	}
       exit (system ("ls"));
@@ -58,7 +61,7 @@ main (int argc, char **argv)
     }
   if (n != 0)
     {
-      fprintf (stderr, "system() call returned %p\n", n);
+      fprintf (stderr, "system() call returned %p\n", (void *) n);
       exit (1);
     }
   exit (0);
diff --git a/winsup/testsuite/winsup.api/waitpid.c b/winsup/testsuite/winsup.api/waitpid.c
index 9845cd1a4..ee2925c4c 100644
--- a/winsup/testsuite/winsup.api/waitpid.c
+++ b/winsup/testsuite/winsup.api/waitpid.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <sys/wait.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 int
 main (int argc, char **argv)