1.0.13.1: Various cleanups and touchups in tests/

[sbcl.git] / contrib / sb-posix / constants.lisp

diff --git a/contrib/sb-posix/constants.lisp b/contrib/sb-posix/constants.lisp
index f1d25ba..5b4f65b 100644 (file)
--- a/contrib/sb-posix/constants.lisp
+++ b/contrib/sb-posix/constants.lisp
@@ -21,6 +21,7 @@
  "errno.h"
  "dirent.h" "signal.h"
  #-win32 "pwd.h"
+ #-win32 "grp.h"
  "unistd.h"
  #-win32 "termios.h"
  #-win32 "syslog.h")
@@ -77,7 +78,7 @@
  (:integer SIGPROF "SIGPROF"
            #+sb-doc "profiling timer alarm (see setitimer(2))." t)
  (:integer SIGWINCH "SIGWINCH" #+sb-doc "Window size change." t)
- (:integer SIGINFO "SIGINFO" #+sb-doc "status request from keyboard." t)
+ (:integer SIGPWR "SIGPWR" #+sb-doc "Power failure." t)
  (:integer SIGUSR1 "SIGUSR1" #+sb-doc "User defined signal 1." t)
  (:integer SIGUSR2 "SIGUSR2" #+sb-doc "User defined signal 2." t)
  (:integer SIGRTMIN "SIGRTMIN" #+sb-doc "Smallest real-time signal number." t)
@@ -214,6 +215,15 @@
 
  ;; mode_t
  (:type mode-t "mode_t")
+ (:integer s-ifmt "S_IFMT" nil t)
+ (:integer s-ififo "S_IFIFO" nil t)
+ (:integer s-ifchr "S_IFCHR" nil t)
+ (:integer s-ifdir "S_IFDIR" nil t)
+ (:integer s-ifblk "S_IFBLK" nil t)
+ (:integer s-ifreg "S_IFREG" nil t)
+ (:integer s-iflnk "S_IFLNK" nil t)
+ (:integer s-ifsock "S_IFSOCK" nil t)
+ (:integer s-ifwht "S_IFWHT" nil t)
  (:integer s-isuid "S_ISUID" nil t)
  (:integer s-isgid "S_ISGID" nil t)
  (:integer s-isvtx "S_ISVTX" nil t)
@@ -281,7 +291,14 @@
               #+nil
               (:integer fields "int" "pw_fields")))
 
- #-darwin
+ ;; group database
+ #-win32
+ (:structure alien-group
+             ("struct group"
+              (c-string-pointer name "char *" "gr_name")
+              (c-string-pointer passwd "char *" "gr_passwd")
+              (gid-t gid "gid_t" "gr_gid")))
+
  (:structure alien-stat
              ("struct stat"
               (mode-t mode "mode_t" "st_mode")
@@ -304,28 +321,6 @@
              ("struct timespec"
               (time-t tv-sec "time_t" "tv_sec")
               (long tv-nsec "long" "tv_nsec")))
- #+darwin
- (:structure alien-stat
-             ("struct stat"
-              (mode-t mode "mode_t" "st_mode")
-              (ino-t ino "ino_t" "st_ino")
-              ;; Linux/MIPS uses unsigned long instead of dev_t here.
-              #-mips
-              (dev-t dev "dev_t" "st_dev")
-              #+mips
-              ((unsigned 32) dev "dev_t" "st_dev")
-              (nlink-t nlink "nlink_t" "st_nlink")
-              (uid-t uid "uid_t" "st_uid")
-              (gid-t gid "gid_t" "st_gid")
-              (off-t size "off_t" "st_size")
-
-              (time-t atime "time_t" "st_atime")
-              (time-t mtime "time_t" "st_mtime")
-              (time-t ctime "time_t" "st_ctime")
-
-              #+foo (alien-timespec atime "struct timespec" "st_atime")
-              #+foo (alien-timespec mtime "struct timespec" "st_mtime")
-              #+foo (alien-timespec ctime "struct timespec" "st_ctime")))
 
  ;; open()
  (:integer o-rdonly "O_RDONLY" nil t)
@@ -364,6 +359,12 @@
  (:integer f-getown "F_GETOWN" nil t)
  (:integer f-setown "F_SETOWN" nil t)
 
+ ;; lockf()
+ (:integer f-lock "F_LOCK" nil t)
+ (:integer f-tlock "F_TLOCK" nil t)
+ (:integer f-ulock "F_ULOCK" nil t)
+ (:integer f-test "F_TEST" nil t)
+
  ;; tcgetattr(), tcsetattr()
  #-win32
  (:type cc-t "cc_t")
@@ -383,7 +384,9 @@
 
  ;; utime(), utimes()
  #-win32
- (:type suseconds-t "suseconds_t")
+ (:type suseconds-t ; OAOOM warning: similar kludge in tools-for-build
+        #+os-provides-suseconds-t "suseconds_t"
+        #-os-provides-suseconds-t "long")
 
  #-win32
  (:structure alien-utimbuf