Merge branch 'main.thttpd' of github.com:correctcomputation/checkedc

Try to sort out gettimeofday / settimeofday.

Author: mattmccutchen-cci

include/signal_checked.h

@@ -28,6 +28,12 @@ void (*signal(int sig,
               ) : itype(_Ptr<void (int)>) // bounds-safe interface for signal return
      )(int);
 
+_Unchecked
+void (*sigset(int sig,
+              void ((*func)(int)) :
+                itype(_Ptr<void (int)>) // bound-safe interface for func
+              ) : itype(_Ptr<void (int)>) // bounds-safe interface for signal return
+     )(int);
 
 int sigemptyset(sigset_t *set : itype(_Ptr<sigset_t>));
 int sigfillset(sigset_t *set : itype(_Ptr<sigset_t>));

include/sys/resource.h

@@ -1,3 +1,10 @@
+//---------------------------------------------------------------------//
+// Wrapper header file that excludes Checked-C-specific declarations   //
+// if the compilation is not for Checked C, or if is for Checked C     //
+// but the implicit inclusion of checked header files is disabled.     //
+/////////////////////////////////////////////////////////////////////////
+
+
 #if !defined __checkedc || defined NO_IMPLICIT_INCLUDE_CHECKED_HDRS
 
 #ifdef __checkedc

include/sys/resource_checked.h

@@ -22,6 +22,7 @@
 #pragma CHECKED_SCOPE push
 #pragma CHECKED_SCOPE on
 
+int getrlimit(int resource, struct rlimit *rlim : itype(_Ptr<struct rlimit>));
 int setrlimit(int resource, const struct rlimit *rlim : itype(_Ptr<const struct rlimit>));
 
 #pragma CHECKED_SCOPE pop

include/sys/time_checked.h

@@ -22,6 +22,9 @@
 #pragma CHECKED_SCOPE push
 #pragma CHECKED_SCOPE on
 
+// The man page shows the second parameter as `struct timezone *tz`, but glibc
+// has it as `void *`, and our redeclaration must be consistent with that.
+// ~ Matt 2021-12-07
 int gettimeofday(struct timeval * tv : itype(_Ptr<struct timeval>), void *tz : itype(_Array_ptr<void>) byte_count(sizeof(struct timezone)));
 int settimeofday(const struct timeval *tv : itype(_Ptr<const struct timeval>), const struct timezone *tz : itype(_Ptr<const struct timezone>));