diff options
Diffstat (limited to 'conform')
| -rw-r--r-- | conform/conformtest.pl | 108 | ||||
| -rw-r--r-- | conform/data/sys/mman.h-data | 18 | ||||
| -rw-r--r-- | conform/data/sys/select.h-data | 33 | ||||
| -rw-r--r-- | conform/data/sys/time.h-data | 5 |
4 files changed, 137 insertions, 27 deletions
diff --git a/conform/conformtest.pl b/conform/conformtest.pl index 1357bb33d5..b0220f5991 100644 --- a/conform/conformtest.pl +++ b/conform/conformtest.pl @@ -15,18 +15,18 @@ if (@headers == ()) { "termios.h", "tar.h", "sys/wait.h", "sys/utsname.h", "sys/un.h", "sys/uio.h", "sys/types.h", "sys/times.h", "sys/timeb.h", "sys/time.h", "sys/statvfs.h", "sys/stat.h", "sys/socket.h", - "sys/shm.h", "sys/sem.h", "sys/resource.h", "sys/msg.h", - "sys/mman.h", "sys/ipc.h", "syslog.h", "stropts.h", "strings.h", - "string.h", "stdlib.h", "stdio.h", "stdint.h", "stddef.h", - "stdarg.h", "spawn.h", "signal.h", "setjmp.h", "semaphore.h", - "search.h", "sched.h", "regex.h", "pwd.h", "pthread.h", - "poll.h", "nl_types.h", "netinet/tcp.h", "netinet/in.h", - "net/if.h", "netdb.h", "ndbm.h", "mqueue.h", "monetary.h", - "math.h", "locale.h", "libgen.h", "limits.h", "langinfo.h", - "iso646.h", "inttypes.h", "iconv.h", "grp.h", "glob.h", "ftw.h", - "fnmatch.h", "fmtmsg.h", "float.h", "fcntl.h", "errno.h", - "dlfcn.h", "dirent.h", "ctype.h", "cpio.h", "assert.h", - "arpa/inet.h", "aio.h"); + "sys/shm.h", "sys/sem.h", "sys/select.h", "sys/resource.h", + "sys/msg.h", "sys/mman.h", "sys/ipc.h", "syslog.h", "stropts.h", + "strings.h", "string.h", "stdlib.h", "stdio.h", "stdint.h", + "stddef.h", "stdarg.h", "spawn.h", "signal.h", "setjmp.h", + "semaphore.h", "search.h", "sched.h", "regex.h", "pwd.h", + "pthread.h", "poll.h", "nl_types.h", "netinet/tcp.h", + "netinet/in.h", "net/if.h", "netdb.h", "ndbm.h", "mqueue.h", + "monetary.h", "math.h", "locale.h", "libgen.h", "limits.h", + "langinfo.h", "iso646.h", "inttypes.h", "iconv.h", "grp.h", + "glob.h", "ftw.h", "fnmatch.h", "fmtmsg.h", "float.h", "fcntl.h", + "errno.h", "dlfcn.h", "dirent.h", "ctype.h", "cpio.h", + "assert.h", "arpa/inet.h", "aio.h"); } if ($dialect ne "ISO" && $dialect ne "POSIX" && $dialect ne "XPG3" @@ -590,6 +590,7 @@ while ($#headers >= 0) { } } elsif (/^optional-type *({([^}]*)|([a-zA-Z0-9_]*))/) { my($type) = "$2$3"; + my($maybe_opaque) = 0; # Remember that this name is allowed. if ($type =~ /^struct *(.*)/) { @@ -598,6 +599,7 @@ while ($#headers >= 0) { push @allow, $1; } else { push @allow, $type; + $maybe_opaque = 1; } # Remember that this name is allowed. @@ -607,13 +609,18 @@ while ($#headers >= 0) { open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - print TESTFILE "$type *a;\n"; + if ($maybe_opaque == 1) { + print TESTFILE "$type *a;\n"; + } else { + print TESTFILE "$type a;\n"; + } close (TESTFILE); compiletest ($fnamebase, "Testing for type $type", - "Type \"$type\" not available.", $missing, 1); + "NOT AVAILABLE", $missing, 1); } elsif (/^type *({([^}]*)|([a-zA-Z0-9_]*))/) { my($type) = "$2$3"; + my($maybe_opaque) = 0; # Remember that this name is allowed. if ($type =~ /^struct *(.*)/) { @@ -622,6 +629,7 @@ while ($#headers >= 0) { push @allow, $1; } else { push @allow, $type; + $maybe_opaque = 1; } # Remember that this name is allowed. @@ -631,11 +639,48 @@ while ($#headers >= 0) { open (TESTFILE, ">$fnamebase.c"); print TESTFILE "$prepend"; print TESTFILE "#include <$h>\n"; - print TESTFILE "$type *a;\n"; + if ($maybe_opaque == 1) { + print TESTFILE "$type *a;\n"; + } else { + print TESTFILE "$type a;\n"; + } close (TESTFILE); compiletest ($fnamebase, "Testing for type $type", "Type \"$type\" not available.", $missing, 0); + } elsif (/^optional-function *({([^}]*)}|([a-zA-Z0-9_]*)) [(][*]([a-zA-Z0-9_]*) ([(].*[)])/) { + my($rettype) = "$2$3"; + my($fname) = "$4"; + my($args) = "$5"; + my($res) = $missing; + + # Remember that this name is allowed. + push @allow, $fname; + + # Generate a program to test for availability of this function. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # print TESTFILE "#undef $fname\n"; + print TESTFILE "$rettype (*(*foobarbaz) $args = $fname;\n"; + close (TESTFILE); + + $res = compiletest ($fnamebase, "Test availability of function $fname", + "NOT AVAILABLE", $res, 1); + + if ($res == 0 || $missing == 1) { + # Generate a program to test for the type of this function. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # print TESTFILE "#undef $fname\n"; + print TESTFILE "extern $rettype (*(*foobarbaz) $args;\n"; + print TESTFILE "extern __typeof__ (&$fname) foobarbaz;\n"; + close (TESTFILE); + + compiletest ($fnamebase, "Test for type of function $fname", + "Function \"$fname\" has incorrect type.", $res, 0); + } } elsif (/^function *({([^}]*)}|([a-zA-Z0-9_]*)) [(][*]([a-zA-Z0-9_]*) ([(].*[)])/) { my($rettype) = "$2$3"; my($fname) = "$4"; @@ -667,6 +712,39 @@ while ($#headers >= 0) { compiletest ($fnamebase, "Test for type of function $fname", "Function \"$fname\" has incorrect type.", $res, 0); + } elsif (/^optional-function *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*) ([(].*[)])/) { + my($rettype) = "$2$3"; + my($fname) = "$4"; + my($args) = "$5"; + my($res) = $missing; + + # Remember that this name is allowed. + push @allow, $fname; + + # Generate a program to test for availability of this function. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # print TESTFILE "#undef $fname\n"; + print TESTFILE "$rettype (*foobarbaz) $args = $fname;\n"; + close (TESTFILE); + + $res = compiletest ($fnamebase, "Test availability of function $fname", + "NOT AVAILABLE", $res, 1); + + if ($res == 0 || $missing != 0) { + # Generate a program to test for the type of this function. + open (TESTFILE, ">$fnamebase.c"); + print TESTFILE "$prepend"; + print TESTFILE "#include <$h>\n"; + # print TESTFILE "#undef $fname\n"; + print TESTFILE "extern $rettype (*foobarbaz) $args;\n"; + print TESTFILE "extern __typeof__ (&$fname) foobarbaz;\n"; + close (TESTFILE); + + compiletest ($fnamebase, "Test for type of function $fname", + "Function \"$fname\" has incorrect type.", $res, 0); + } } elsif (/^function *({([^}]*)}|([a-zA-Z0-9_]*)) ([a-zA-Z0-9_]*) ([(].*[)])/) { my($rettype) = "$2$3"; my($fname) = "$4"; diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data index d744a9ef22..c737efbc23 100644 --- a/conform/data/sys/mman.h-data +++ b/conform/data/sys/mman.h-data @@ -22,17 +22,16 @@ constant POSIX_MADV_RANDOM constant POSIX_MADV_WILLNEED constant POSIX_MADV_DONTNEED -constant POSIX_TYPED_MEM_ALLOCATE -constant POSIX_TYPED_MEM_ALLOCATE_CONTIG -constant POSIX_TYPED_MEM_MAP_ALLOCATABLE +optional-constant POSIX_TYPED_MEM_ALLOCATE +optional-constant POSIX_TYPED_MEM_ALLOCATE_CONTIG +optional-constant POSIX_TYPED_MEM_MAP_ALLOCATABLE type size_t type off_t type mode_t -type {struct posix_typedmem_info} - -element {struct posix_typedmem_info} size_t posix_tmi_length +optional-type {struct posix_typedmem_info} +optional-element {struct posix_typedmem_info} size_t posix_tmi_length function int mlock (const void*, size_t) function int mlockall (int) @@ -42,9 +41,10 @@ function int msync (void*, size_t, int) function int munlock (const void*, size_t) function int munlockall (void) function int munmap (void*, size_t) -function int posix_mem_offset (const void*, size_t, off_t*, size_t*, int*) -function int posix_typed_mem_get_info (int, struct posix_typed_mem_info*) -function int posix_typed_mem_open (const char*, int, int) +function int posix_madvise (void*, size_t, int) +optional-function int posix_mem_offset (const void*, size_t, off_t*, size_t*, int*) +optional-function int posix_typed_mem_get_info (int, struct posix_typed_mem_info*) +optional-function int posix_typed_mem_open (const char*, int, int) function int shm_open (const char*, int, mode_t) function int shm_unlink (const char*) diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data new file mode 100644 index 0000000000..ade26a4e5a --- /dev/null +++ b/conform/data/sys/select.h-data @@ -0,0 +1,33 @@ +#if !defined ISO && !defined POSIX +type {struct timeval} +element {struct timeval} time_t tv_sec +element {struct timeval} suseconds_t tv_usec + +type time_t +type suseconds_t + +type sigset_t + +type {struct timespec} +element {struct timespec} time_t tv_sec +element {struct timespec} long tv_nsec + +type fd_set +element fd_set long fds_bits [] + +function-macro void FD_CLR (int, fd_set*) +function-macro int FD_ISSET (int, fd_set*) +function-macro void FD_SET (int, fd_set*) +function-macro void FD_ZERO (fd_set*) + +macro FD_SETSIZE + +#ifdef XOPEN2K +function int pselect (int, fd_set*, fd_set*, fd_set*, const struct timespec*, const sigset_t*) +#endif +function int select (int, fd_set*, fd_set*, fd_set*, struct timeval*) + +allow-header signal.h +allow-header sys/time.h +allow-header time.h +#endif diff --git a/conform/data/sys/time.h-data b/conform/data/sys/time.h-data index 49d5fbc2d1..0de8c278fc 100644 --- a/conform/data/sys/time.h-data +++ b/conform/data/sys/time.h-data @@ -11,9 +11,8 @@ element {struct itimerval} {struct timeval} it_value type time_t type suseconds_t -type {struct fd_set} - -element {struct fd_set} long fds_bits [] +type fd_set +element fd_set long fds_bits [] constant ITIMER_REAL constant ITIMER_VIRTUAL |