From 9b978ffe8b67bdccd1e0c5bf3ef3c65d60bc6cd3 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 23 Jan 2003 21:21:28 +0000 Subject: [PATCH] * 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. --- winsup/testsuite/ChangeLog | 23 ++++ winsup/testsuite/Makefile.in | 3 +- winsup/testsuite/libltp/include/test.h | 2 +- winsup/testsuite/winsup.api/checksignal.c | 2 +- winsup/testsuite/winsup.api/crlf.c | 22 ++-- winsup/testsuite/winsup.api/devzero.c | 6 +- winsup/testsuite/winsup.api/iospeed.c | 2 +- winsup/testsuite/winsup.api/mmaptest01.c | 5 +- winsup/testsuite/winsup.api/mmaptest02.c | 3 +- winsup/testsuite/winsup.api/mmaptest03.c | 5 +- winsup/testsuite/winsup.api/mmaptest04.c | 5 +- winsup/testsuite/winsup.api/nullgetcwd.c | 3 +- .../winsup.api/pthread/mainthreadexits.c | 1 + winsup/testsuite/winsup.api/pthread/test.h | 2 +- .../winsup.api/pthread/threadidafterfork.c | 1 + winsup/testsuite/winsup.api/sigchld.c | 2 + .../winsup.api/signal-into-win32-api.c | 115 +++++++++--------- winsup/testsuite/winsup.api/systemcall.c | 13 +- winsup/testsuite/winsup.api/waitpid.c | 2 + 19 files changed, 128 insertions(+), 89 deletions(-) diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog index 1260049de..cd3b62cbc 100644 --- a/winsup/testsuite/ChangeLog +++ b/winsup/testsuite/ChangeLog @@ -1,3 +1,26 @@ +2003-01-23 Christopher Faylor + + * 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. + 2003-01-23 Christopher Faylor * Makeifle.in: Use ALL_CFLAGS to build test programs so that correct diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in index 863fe67f9..a55978a3e 100644 --- a/winsup/testsuite/Makefile.in +++ b/winsup/testsuite/Makefile.in @@ -88,7 +88,7 @@ ifdef VERBOSE RUNTESTFLAGS = -v endif -RUNTIME=$(cygwin_build)/new-cygwin1.dll $(cygwin_build)/new-libcygwin.a cygrun.exe +RUNTIME=$(cygwin_build)/new-cygwin1.dll $(cygwin_build)/new-libcygwin.a TESTSUP_LIB_NAME:=libltp.a TESTSUP_OFILES:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(libltp_srcdir)/lib/*.c}}}}} @@ -187,4 +187,3 @@ cygrun.o: cygrun.c cygrun.exe : cygrun.o $(CC) ${MINGW_LDFLAGS} -mno-cygwin -o $@ $< - diff --git a/winsup/testsuite/libltp/include/test.h b/winsup/testsuite/libltp/include/test.h index acfdfdf1b..c4978dc4d 100644 --- a/winsup/testsuite/libltp/include/test.h +++ b/winsup/testsuite/libltp/include/test.h @@ -200,7 +200,7 @@ extern void tst_brkm(int ttype, void (*func)(), const char *arg_fmt, ...); extern void tst_brkloopm(int ttype, void (*func)(), const char *arg_fmt, ...); extern int tst_environ(); -extern void tst_exit(); +extern void tst_exit() __attribute__ ((noreturn)); extern void tst_flush(); /* prototypes for the t_res.c functions */ 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 #include #include +#include #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; icount && icount; 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 #include +#include #include #include #include -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 #include #include +#include #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 #include #include +#include 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 #include #include +#include /* - 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 #include #include +#include +#include +#include #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 #include #include +#include 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 #include #include +#include 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 #include #include +#include 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 #include #include +#include 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 -#include -#include -#include -#include - -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 +#include +#include +#include +#include + +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 #include #include +#include +#include +#include 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 #include #include +#include +#include int main (int argc, char **argv)