- cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][master] 2 commits: Address #381: Handle OS-specific docstring in pathname.lisp
by Raymond Toy (＠rtoy) 30 Mar '25

30 Mar '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 7e2d05db by Raymond Toy at 2025-03-30T21:16:32+00:00 Address #381: Handle OS-specific docstring in pathname.lisp - - - - - fea9f546 by Raymond Toy at 2025-03-30T21:16:32+00:00 Merge branch 'issue-381-darwin-pathname-docstring' into 'master' Address #381: Handle OS-specific docstring in pathname.lisp See merge request cmucl/cmucl!280 - - - - - 1 changed file: - src/code/pathname.lisp Changes: ===================================== src/code/pathname.lisp ===================================== @@ -269,7 +269,7 @@ #+darwin (defvar *enable-darwin-path-normalization* nil - "When non-NIL, pathnames are on Darwin are normalized when created. + _N"When non-NIL, pathnames are on Darwin are normalized when created. Otherwise, the pathnames are unchanged. This must be NIL during bootstrapping because Unicode is not yet View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7aaca65e2cfbd1f36be145… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7aaca65e2cfbd1f36be145… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Fix errors introduced in renaming os-unix-info
by Raymond Toy (＠rtoy) 30 Mar '25

30 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 52a47a38 by Raymond Toy at 2025-03-30T08:31:56-07:00 Fix errors introduced in renaming os-unix-info We renamed `struct passwd` to `os-unix-info` in a previous commit, but we didn't update the use of `struct passwd` in `unix-getpwuid`. Fix this by first rename `os-unix-info` to `os-user-info` to match the name of the C struct. And update `unix-getpwuid` to use `os-user-info` instead of `passwd`. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2419,7 +2419,7 @@ ;; The C structure that is returned by os_getpwuid containing the info ;; that we use to fill the user-info object. (def-alien-type nil - (struct os-unix-info + (struct os-user-info (pw-name (* char)) ; user's login name (pw-passwd (* char)) ; no longer used (pw-uid uid-t) ; user id @@ -2535,7 +2535,7 @@ of the failure. In particular, if the second value is 0 (or ENONENT, ESRCH, EBADF, etc.), then the uid was not found." (declare (type unix-uid uid)) - (with-alien ((result (* (struct passwd)))) + (with-alien ((result (* (struct os-user-info)))) (let (result) (unwind-protect (progn @@ -2547,7 +2547,7 @@ (declare (optimize (ext:inhibit-warnings 3))) (alien-funcall (extern-alien "os_getpwuid" - (function (* (struct passwd)) + (function (* (struct os-user-info)) uid-t)) uid))) (if (null-alien result) @@ -2573,7 +2573,7 @@ (alien-funcall (extern-alien "os_free_getpwuid" (function c-call:void - (* (struct passwd)))) + (* (struct os-user-info)))) result)))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/52a47a381d3a84be6ea4fa2… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/52a47a381d3a84be6ea4fa2… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Put back the OS-specific parts of user-info
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 1e249741 by Raymond Toy at 2025-03-28T14:15:48-07:00 Put back the OS-specific parts of user-info The code in contrib/unix.lisp needs these extra slots. Perhaps we should just modify contrib/unix.lisp so as not to use these slots anymore? - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2409,6 +2409,9 @@ (password "" :type string) (uid 0 :type unix-uid) (gid 0 :type unix-gid) + #+solaris (age "" :type string) + #+solaris (comment "" :type string) + #+freebsd (change -1 :type fixnum) (gecos "" :type string) (dir "" :type string) (shell "" :type string)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1e24974142d0873b5299561… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1e24974142d0873b5299561… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Put back struct passwd definitions
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 9b97ce25 by Raymond Toy at 2025-03-28T14:10:23-07:00 Put back struct passwd definitions We put back the OS definitions into the contrib files since we've deleted that from code/unix.lisp. This allows these files to be compiled once again. - - - - - 2 changed files: - src/contrib/unix/unix-glibc2.lisp - src/contrib/unix/unix.lisp Changes: ===================================== src/contrib/unix/unix-glibc2.lisp ===================================== @@ -219,6 +219,16 @@ (gr-gid gid-t) ; numerical group ID (gr-mem (* (* char))))) ; vector of pointers to member names +(def-alien-type nil + (struct passwd + (pw-name (* char)) ; user's login name + (pw-passwd (* char)) ; no longer used + (pw-uid uid-t) ; user id + (pw-gid gid-t) ; group id + (pw-gecos (* char)) ; typically user's full name + (pw-dir (* char)) ; user's home directory + (pw-shell (* char)))) ; user's login shell + ;;; From stdio.h ;;; From sys/types.h ===================================== src/contrib/unix/unix.lisp ===================================== @@ -629,6 +629,35 @@ ;;;; User and group database access, POSIX Standard 9.2.2 +;; see <pwd.h> +#+solaris +(def-alien-type nil + (struct passwd + (pw-name (* char)) ; user's login name + (pw-passwd (* char)) ; no longer used + (pw-uid uid-t) ; user id + (pw-gid gid-t) ; group id + (pw-age (* char)) ; password age (not used) + (pw-comment (* char)) ; not used + (pw-gecos (* char)) ; typically user's full name + (pw-dir (* char)) ; user's home directory + (pw-shell (* char)))) ; user's login shell + +#+bsd +(def-alien-type nil + (struct passwd + (pw-name (* char)) ; user's login name + (pw-passwd (* char)) ; no longer used + (pw-uid uid-t) ; user id + (pw-gid gid-t) ; group id + (pw-change int) ; password change time + (pw-class (* char)) ; user access class + (pw-gecos (* char)) ; typically user's full name + (pw-dir (* char)) ; user's home directory + (pw-shell (* char)) ; user's login shell + (pw-expire int) ; account expiration + #+(or freebsd darwin) + (pw-fields int))) ; internal #+solaris (defun unix-getpwnam (login) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9b97ce25a0a30d620136c75… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9b97ce25a0a30d620136c75… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Rename unix-passwd to os-unix-info
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 11294c70 by Raymond Toy at 2025-03-28T13:39:34-07:00 Rename unix-passwd to os-unix-info Also update comments in unix.lisp about os-unix-info to match what it really is. - - - - - 2 changed files: - src/code/unix.lisp - src/lisp/os-common.c Changes: ===================================== src/code/unix.lisp ===================================== @@ -2413,16 +2413,10 @@ (dir "" :type string) (shell "" :type string)) -;; See <pwd.h> -;; -;; While each OS may contain additional fields, we only need the ones -;; that are used the user-info structure. -;; -;; NOTE: This may NOT be the actual OS-defined passwd structure. It -;; is the structure returned by os_getpwuid (in unix-getpwuid). - +;; The C structure that is returned by os_getpwuid containing the info +;; that we use to fill the user-info object. (def-alien-type nil - (struct unix-passwd + (struct os-unix-info (pw-name (* char)) ; user's login name (pw-passwd (* char)) ; no longer used (pw-uid uid-t) ; user id ===================================== src/lisp/os-common.c ===================================== @@ -950,7 +950,7 @@ os_get_user_homedir(const char* name, int *status) /* * This MUST match the definition in code/unix.lisp. */ -struct unix_passwd +struct os_user_info { char* pw_name; char* pw_passwd; @@ -961,7 +961,7 @@ struct unix_passwd char* pw_shell; }; -struct unix_passwd* +struct os_user_info* os_getpwuid(uid_t uid) { char initial[1024]; @@ -969,7 +969,7 @@ os_getpwuid(uid_t uid) size_t size; struct passwd pwd; struct passwd *ppwd; - struct unix_passwd *result = NULL; + struct os_user_info *result = NULL; buffer = initial; obuffer = NULL; @@ -988,7 +988,7 @@ again: * that. */ if (ppwd != NULL) { - result = (struct unix_passwd*) malloc(sizeof(pwd)); + result = (struct os_user_info*) malloc(sizeof(*result)); result->pw_name = strdup(pwd.pw_name); result->pw_passwd = strdup(pwd.pw_passwd); result->pw_uid = pwd.pw_uid; @@ -1025,7 +1025,7 @@ again: * os_getpwuid(). */ void -os_free_getpwuid(struct passwd* pwd) +os_free_getpwuid(struct os_user_info* pwd) { free(pwd->pw_name); free(pwd->pw_passwd); View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/11294c709e1e9ed724bef64… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/11294c709e1e9ed724bef64… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Add unix_passwd strucc to define the result of os_getpwuid
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 99b585ab by Raymond Toy at 2025-03-28T12:26:46-07:00 Add unix_passwd strucc to define the result of os_getpwuid We don't want os_getpwuid returning the OS passwd structure because it's not necessarily the same everywhere. Define our own unix_passwd struct to hold the result of os_getpwuid. Add this definition to unix.lisp, replacing the old definition. - - - - - 2 changed files: - src/code/unix.lisp - src/lisp/os-common.c Changes: ===================================== src/code/unix.lisp ===================================== @@ -2417,9 +2417,12 @@ ;; ;; While each OS may contain additional fields, we only need the ones ;; that are used the user-info structure. +;; +;; NOTE: This may NOT be the actual OS-defined passwd structure. It +;; is the structure returned by os_getpwuid (in unix-getpwuid). (def-alien-type nil - (struct passwd + (struct unix-passwd (pw-name (* char)) ; user's login name (pw-passwd (* char)) ; no longer used (pw-uid uid-t) ; user id ===================================== src/lisp/os-common.c ===================================== @@ -946,7 +946,22 @@ os_get_user_homedir(const char* name, int *status) * The caller MUST call os_free_getpwuid() to free the space allocated * by os_getpwuid(). */ -struct passwd* + +/* + * This MUST match the definition in code/unix.lisp. + */ +struct unix_passwd +{ + char* pw_name; + char* pw_passwd; + uid_t pw_uid; + gid_t pw_gid; + char* pw_gecos; + char* pw_dir; + char* pw_shell; +}; + +struct unix_passwd* os_getpwuid(uid_t uid) { char initial[1024]; @@ -954,7 +969,7 @@ os_getpwuid(uid_t uid) size_t size; struct passwd pwd; struct passwd *ppwd; - struct passwd *result = NULL; + struct unix_passwd *result = NULL; buffer = initial; obuffer = NULL; @@ -973,7 +988,7 @@ again: * that. */ if (ppwd != NULL) { - result = (struct passwd*) malloc(sizeof(pwd)); + result = (struct unix_passwd*) malloc(sizeof(pwd)); result->pw_name = strdup(pwd.pw_name); result->pw_passwd = strdup(pwd.pw_passwd); result->pw_uid = pwd.pw_uid; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/99b585abb401a2f2833d424… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/99b585abb401a2f2833d424… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] build.sh exits if create-errno.sh fails
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: e0143bf2 by Raymond Toy at 2025-03-28T10:12:46-07:00 build.sh exits if create-errno.sh fails In create-errno.sh print an error message if the current file doesn't match the definitions from the header files. In build.sh, exit if create-errno.sh fails. - - - - - 2 changed files: - bin/build.sh - bin/create-errno.sh Changes: ===================================== bin/build.sh ===================================== @@ -157,8 +157,9 @@ buildit () fi } -# Create the errno file containing all the def-unix-error forms. -bin/create-errno.sh +# Create the errno file containing all the def-unix-error forms. Exit +# if there's an error in creating the errno file. +bin/create-errno.sh || exit 1 BUILDWORLD="$TOOLDIR/build-world.sh" BUILD_POT="yes" ===================================== bin/create-errno.sh ===================================== @@ -82,7 +82,10 @@ if [ -z "$DEFAULT" -a -n "$ERRNO_FILE" ]; then # First check that the errno definitions haven't changed. If they # have, exit with an error. - (find_errno | diff -u "$ERRNO_FILE" - ) || exit 1 + if ! (find_errno | diff -u "$ERRNO_FILE" -) ; then + echo "Error: Current $ERRNO_FILE differs from header file definitions" + exit 1 + fi fi # Create the src/code/errno.lisp file from the template and the View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e0143bf229c9a2be3f4c5cf… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e0143bf229c9a2be3f4c5cf… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Check in errno-darwin.lisp and errno-solaris.lisp
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 7eaf1fc7 by Raymond Toy at 2025-03-28T08:26:48-07:00 Check in errno-darwin.lisp and errno-solaris.lisp Generated these new files via `bin/create-errno.sh -U` on the respective OSes. - - - - - 2 changed files: - + bin/errno-darwin.lisp - + bin/errno-solaris.lisp Changes: ===================================== bin/errno-darwin.lisp ===================================== @@ -0,0 +1,110 @@ +;; Ignoring dup of EOPNOTSUPP: old value ENOTSUP, new value 102 +(def-unix-error EPERM 1) +(def-unix-error ENOENT 2) +(def-unix-error ESRCH 3) +(def-unix-error EINTR 4) +(def-unix-error EIO 5) +(def-unix-error ENXIO 6) +(def-unix-error E2BIG 7) +(def-unix-error ENOEXEC 8) +(def-unix-error EBADF 9) +(def-unix-error ECHILD 10) +(def-unix-error EDEADLK 11) +(def-unix-error ENOMEM 12) +(def-unix-error EACCES 13) +(def-unix-error EFAULT 14) +(def-unix-error ENOTBLK 15) +(def-unix-error EBUSY 16) +(def-unix-error EEXIST 17) +(def-unix-error EXDEV 18) +(def-unix-error ENODEV 19) +(def-unix-error ENOTDIR 20) +(def-unix-error EISDIR 21) +(def-unix-error EINVAL 22) +(def-unix-error ENFILE 23) +(def-unix-error EMFILE 24) +(def-unix-error ENOTTY 25) +(def-unix-error ETXTBSY 26) +(def-unix-error EFBIG 27) +(def-unix-error ENOSPC 28) +(def-unix-error ESPIPE 29) +(def-unix-error EROFS 30) +(def-unix-error EMLINK 31) +(def-unix-error EPIPE 32) +(def-unix-error EDOM 33) +(def-unix-error ERANGE 34) +(def-unix-error EAGAIN 35) +(def-unix-error EWOULDBLOCK EAGAIN) +(def-unix-error EINPROGRESS 36) +(def-unix-error EALREADY 37) +(def-unix-error ENOTSOCK 38) +(def-unix-error EDESTADDRREQ 39) +(def-unix-error EMSGSIZE 40) +(def-unix-error EPROTOTYPE 41) +(def-unix-error ENOPROTOOPT 42) +(def-unix-error EPROTONOSUPPORT 43) +(def-unix-error ESOCKTNOSUPPORT 44) +(def-unix-error ENOTSUP 45) +;; (def-unix-error EOPNOTSUPP ENOTSUP) +(def-unix-error EPFNOSUPPORT 46) +(def-unix-error EAFNOSUPPORT 47) +(def-unix-error EADDRINUSE 48) +(def-unix-error EADDRNOTAVAIL 49) +(def-unix-error ENETDOWN 50) +(def-unix-error ENETUNREACH 51) +(def-unix-error ENETRESET 52) +(def-unix-error ECONNABORTED 53) +(def-unix-error ECONNRESET 54) +(def-unix-error ENOBUFS 55) +(def-unix-error EISCONN 56) +(def-unix-error ENOTCONN 57) +(def-unix-error ESHUTDOWN 58) +(def-unix-error ETOOMANYREFS 59) +(def-unix-error ETIMEDOUT 60) +(def-unix-error ECONNREFUSED 61) +(def-unix-error ELOOP 62) +(def-unix-error ENAMETOOLONG 63) +(def-unix-error EHOSTDOWN 64) +(def-unix-error EHOSTUNREACH 65) +(def-unix-error ENOTEMPTY 66) +(def-unix-error EPROCLIM 67) +(def-unix-error EUSERS 68) +(def-unix-error EDQUOT 69) +(def-unix-error ESTALE 70) +(def-unix-error EREMOTE 71) +(def-unix-error EBADRPC 72) +(def-unix-error ERPCMISMATCH 73) +(def-unix-error EPROGUNAVAIL 74) +(def-unix-error EPROGMISMATCH 75) +(def-unix-error EPROCUNAVAIL 76) +(def-unix-error ENOLCK 77) +(def-unix-error ENOSYS 78) +(def-unix-error EFTYPE 79) +(def-unix-error EAUTH 80) +(def-unix-error ENEEDAUTH 81) +(def-unix-error EPWROFF 82) +(def-unix-error EDEVERR 83) +(def-unix-error EOVERFLOW 84) +(def-unix-error EBADEXEC 85) +(def-unix-error EBADARCH 86) +(def-unix-error ESHLIBVERS 87) +(def-unix-error EBADMACHO 88) +(def-unix-error ECANCELED 89) +(def-unix-error EIDRM 90) +(def-unix-error ENOMSG 91) +(def-unix-error EILSEQ 92) +(def-unix-error ENOATTR 93) +(def-unix-error EBADMSG 94) +(def-unix-error EMULTIHOP 95) +(def-unix-error ENODATA 96) +(def-unix-error ENOLINK 97) +(def-unix-error ENOSR 98) +(def-unix-error ENOSTR 99) +(def-unix-error EPROTO 100) +(def-unix-error ETIME 101) +(def-unix-error EOPNOTSUPP 102) +(def-unix-error ENOPOLICY 103) +(def-unix-error ENOTRECOVERABLE 104) +(def-unix-error EOWNERDEAD 105) +(def-unix-error EQFULL 106) +(def-unix-error ELAST 106) ===================================== bin/errno-solaris.lisp ===================================== @@ -0,0 +1,123 @@ +(def-unix-error EPERM 1) +(def-unix-error ENOENT 2) +(def-unix-error ESRCH 3) +(def-unix-error EINTR 4) +(def-unix-error EIO 5) +(def-unix-error ENXIO 6) +(def-unix-error E2BIG 7) +(def-unix-error ENOEXEC 8) +(def-unix-error EBADF 9) +(def-unix-error ECHILD 10) +(def-unix-error EAGAIN 11) +(def-unix-error ENOMEM 12) +(def-unix-error EACCES 13) +(def-unix-error EFAULT 14) +(def-unix-error ENOTBLK 15) +(def-unix-error EBUSY 16) +(def-unix-error EEXIST 17) +(def-unix-error EXDEV 18) +(def-unix-error ENODEV 19) +(def-unix-error ENOTDIR 20) +(def-unix-error EISDIR 21) +(def-unix-error EINVAL 22) +(def-unix-error ENFILE 23) +(def-unix-error EMFILE 24) +(def-unix-error ENOTTY 25) +(def-unix-error ETXTBSY 26) +(def-unix-error EFBIG 27) +(def-unix-error ENOSPC 28) +(def-unix-error ESPIPE 29) +(def-unix-error EROFS 30) +(def-unix-error EMLINK 31) +(def-unix-error EPIPE 32) +(def-unix-error EDOM 33) +(def-unix-error ERANGE 34) +(def-unix-error ENOMSG 35) +(def-unix-error EIDRM 36) +(def-unix-error ECHRNG 37) +(def-unix-error EL2NSYNC 38) +(def-unix-error EL3HLT 39) +(def-unix-error EL3RST 40) +(def-unix-error ELNRNG 41) +(def-unix-error EUNATCH 42) +(def-unix-error ENOCSI 43) +(def-unix-error EL2HLT 44) +(def-unix-error EDEADLK 45) +(def-unix-error ENOLCK 46) +(def-unix-error ECANCELED 47) +(def-unix-error ENOTSUP 48) +(def-unix-error EDQUOT 49) +(def-unix-error EBADE 50) +(def-unix-error EBADR 51) +(def-unix-error EXFULL 52) +(def-unix-error ENOANO 53) +(def-unix-error EBADRQC 54) +(def-unix-error EBADSLT 55) +(def-unix-error EDEADLOCK 56) +(def-unix-error EBFONT 57) +(def-unix-error EOWNERDEAD 58) +(def-unix-error ENOTRECOVERABLE 59) +(def-unix-error ENOSTR 60) +(def-unix-error ENODATA 61) +(def-unix-error ETIME 62) +(def-unix-error ENOSR 63) +(def-unix-error ENONET 64) +(def-unix-error ENOPKG 65) +(def-unix-error EREMOTE 66) +(def-unix-error ENOLINK 67) +(def-unix-error EADV 68) +(def-unix-error ESRMNT 69) +(def-unix-error ECOMM 70) +(def-unix-error EPROTO 71) +(def-unix-error ELOCKUNMAPPED 72) +(def-unix-error ENOTACTIVE 73) +(def-unix-error EMULTIHOP 74) +(def-unix-error EADI 75) +(def-unix-error EBADMSG 77) +(def-unix-error ENAMETOOLONG 78) +(def-unix-error EOVERFLOW 79) +(def-unix-error ENOTUNIQ 80) +(def-unix-error EBADFD 81) +(def-unix-error EREMCHG 82) +(def-unix-error ELIBACC 83) +(def-unix-error ELIBBAD 84) +(def-unix-error ELIBSCN 85) +(def-unix-error ELIBMAX 86) +(def-unix-error ELIBEXEC 87) +(def-unix-error EILSEQ 88) +(def-unix-error ENOSYS 89) +(def-unix-error ELOOP 90) +(def-unix-error ERESTART 91) +(def-unix-error ESTRPIPE 92) +(def-unix-error ENOTEMPTY 93) +(def-unix-error EUSERS 94) +(def-unix-error ENOTSOCK 95) +(def-unix-error EDESTADDRREQ 96) +(def-unix-error EMSGSIZE 97) +(def-unix-error EPROTOTYPE 98) +(def-unix-error ENOPROTOOPT 99) +(def-unix-error EPROTONOSUPPORT 120) +(def-unix-error ESOCKTNOSUPPORT 121) +(def-unix-error EOPNOTSUPP 122) +(def-unix-error EPFNOSUPPORT 123) +(def-unix-error EAFNOSUPPORT 124) +(def-unix-error EADDRINUSE 125) +(def-unix-error EADDRNOTAVAIL 126) +(def-unix-error ENETDOWN 127) +(def-unix-error ENETUNREACH 128) +(def-unix-error ENETRESET 129) +(def-unix-error ECONNABORTED 130) +(def-unix-error ECONNRESET 131) +(def-unix-error ENOBUFS 132) +(def-unix-error EISCONN 133) +(def-unix-error ENOTCONN 134) +(def-unix-error ESHUTDOWN 143) +(def-unix-error ETOOMANYREFS 144) +(def-unix-error ETIMEDOUT 145) +(def-unix-error ECONNREFUSED 146) +(def-unix-error EHOSTDOWN 147) +(def-unix-error EHOSTUNREACH 148) +(def-unix-error EWOULDBLOCK EAGAIN) +(def-unix-error EALREADY 149) +(def-unix-error EINPROGRESS 150) +(def-unix-error ESTALE 151) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7eaf1fc72c8a32d4d9e11eb… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7eaf1fc72c8a32d4d9e11eb… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] Address review comments
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: 594cf215 by Raymond Toy at 2025-03-28T08:12:30-07:00 Address review comments We now have separate files named bin/errno-<os>.lisp that contains the def-unix-error forms for the OSes that support auto-generating them. These files are checked in. (This commit only has the definitions for Linux.) Update bin/create-errno.sh add a -U option to generate the bin/errno-<os>.lisp. When create-errno.sh generates the final src/code/errno.lisp file, we also check that the checked-in bin/errno-<os>.lisp file matches what we find in the header files. The bin/errno-template.lisp file is simplified by moving the default `def-unix-error` forms to the new file bin/errno-default.lisp. Skip CI this until we add the errno files for darwin and solaris. [SKIP-CI] - - - - - 4 changed files: - bin/create-errno.sh - + bin/errno-default.lisp - + bin/errno-linux.lisp - bin/errno-template.lisp Changes: ===================================== bin/create-errno.sh ===================================== @@ -11,6 +11,7 @@ usage () create-erno.sh [-h?DS] -h This help -? This help + -U Update the errno file -D Do not auto-generate; use default -S Show the resulting generated file; the file is still created. @@ -21,61 +22,73 @@ EOF exit 0 } -while getopts "h?DS" arg +while getopts "h?DSU" arg do case $arg in h) usage ;; \?) usage ;; D) DEFAULT=yes ;; S) SHOW=yes ;; + U) UPDATE=yes ;; esac done -# Where the output should go. +# Output file containing the final errno defintions OUTPUT="src/code/errno.lisp" +# Default file containing errno definitions. +ERRNO_FILE="bin/errno-default.lisp" + # Template file containing the default def-unix-error forms and other # support code. TEMPLATE="bin/errno-template.lisp" -# Set ERRNO_FILES to the files where we can find errno definitions. +# Set ERRNO_HEADERS to the files where we can find errno definitions. if [ -z "$DEFAULT" ]; then case $(uname -s) in - Linux) ERRNO_FILES=/usr/include/asm-generic/errno*.h + Linux) ERRNO_HEADERS=/usr/include/asm-generic/errno*.h + ERRNO_FILE="bin/errno-linux.lisp" ;; - Darwin) ERRNO_FILES=/usr/include/sys/errno.h + Darwin) ERRNO_HEADERS=/usr/include/sys/errno.h + ERRNO_FILE="bin/errno-darwin.lisp" ;; - SunOS) ERRNO_FILES=/usr/include/sys/errno.h + SunOS) ERRNO_HEADERS=/usr/include/sys/errno.h + ERRNO_FILE="bin/errno-solaris.lisp" ;; + *) # The default case where we use the defaults. But also disable updating. + UPDATE="" + ;; esac fi -if [ -z "$ERRNO_FILES" ]; then - # Copy the main errno template to the output. The template is a lisp - # file so we can read and modify it more easily. - cat "$TEMPLATE" > $OUTPUT -else - # We can autogenerate the def-unix-error forms. Copy just the - # initial part of the template, up to the first def-unix-error - # form. - { - sed '/^(def-unix-error ESUCCESS/q' "$TEMPLATE" - cat <<EOF - -;; Autogenerated def-unix-error forms -EOF - - # Create appropriate DEF-UNIX-ERROR forms by reading header files - # containing the C definitions. +if [ -n "$DEFAULT" ]; then + UPDATE="" +fi + +find_errno () +{ + # Create appropriate DEF-UNIX-ERROR forms by reading header files + # containing the C definitions. - awk -f bin/create-def-unix-error.awk ${ERRNO_FILES} + awk -f bin/create-def-unix-error.awk ${ERRNO_HEADERS} +} - # The tail was also copied from code/unix.lisp. It's needed to tell - # Lisp about the errno values. - sed '1,/^;;; End of default/d' "$TEMPLATE" - } > $OUTPUT +if [ "$UPDATE" = "yes" ]; then + find_errno > "$ERRNO_FILE" + exit 0 fi +if [ -z "$DEFAULT" -a -n "$ERRNO_FILE" ]; then + # First check that the errno definitions haven't changed. If they + # have, exit with an error. + + (find_errno | diff -u "$ERRNO_FILE" - ) || exit 1 +fi + +# Create the src/code/errno.lisp file from the template and the +# OS-specific errno values (or the default). +cat "$TEMPLATE" "$ERRNO_FILE" > $OUTPUT + # If -S option given, cat the output file to stdout if [ -n "$SHOW" ]; then cat $OUTPUT ===================================== bin/errno-default.lisp ===================================== @@ -0,0 +1,94 @@ +;;; Default errno values. These are used only if we could not +;;; auto-generate these forms. +(def-unix-error EPERM 1 _N"Operation not permitted") +(def-unix-error ENOENT 2 _N"No such file or directory") +(def-unix-error ESRCH 3 _N"No such process") +(def-unix-error EINTR 4 _N"Interrupted system call") +(def-unix-error EIO 5 _N"I/O error") +(def-unix-error ENXIO 6 _N"Device not configured") +(def-unix-error E2BIG 7 _N"Arg list too long") +(def-unix-error ENOEXEC 8 _N"Exec format error") +(def-unix-error EBADF 9 _N"Bad file descriptor") +(def-unix-error ECHILD 10 _N"No child process") +#+bsd(def-unix-error EDEADLK 11 _N"Resource deadlock avoided") +#-bsd(def-unix-error EAGAIN 11 #-linux _N"No more processes" #+linux _N"Try again") +(def-unix-error ENOMEM 12 _N"Out of memory") +(def-unix-error EACCES 13 _N"Permission denied") +(def-unix-error EFAULT 14 _N"Bad address") +(def-unix-error ENOTBLK 15 _N"Block device required") +(def-unix-error EBUSY 16 _N"Device or resource busy") +(def-unix-error EEXIST 17 _N"File exists") +(def-unix-error EXDEV 18 _N"Cross-device link") +(def-unix-error ENODEV 19 _N"No such device") +(def-unix-error ENOTDIR 20 _N"Not a director") +(def-unix-error EISDIR 21 _N"Is a directory") +(def-unix-error EINVAL 22 _N"Invalid argument") +(def-unix-error ENFILE 23 _N"File table overflow") +(def-unix-error EMFILE 24 _N"Too many open files") +(def-unix-error ENOTTY 25 _N"Inappropriate ioctl for device") +(def-unix-error ETXTBSY 26 _N"Text file busy") +(def-unix-error EFBIG 27 _N"File too large") +(def-unix-error ENOSPC 28 _N"No space left on device") +(def-unix-error ESPIPE 29 _N"Illegal seek") +(def-unix-error EROFS 30 _N"Read-only file system") +(def-unix-error EMLINK 31 _N"Too many links") +(def-unix-error EPIPE 32 _N"Broken pipe") +;;; +;;; Math +(def-unix-error EDOM 33 _N"Numerical argument out of domain") +(def-unix-error ERANGE 34 #-linux _N"Result too large" #+linux _N"Math result not representable") + +;;; non-blocking and interrupt i/o +(def-unix-error EWOULDBLOCK 35 _N"Operation would block") +#-bsd(def-unix-error EDEADLK 35 _N"Operation would block") ; Ditto +#+bsd(def-unix-error EAGAIN 35 _N"Resource temporarily unavailable") +(def-unix-error EINPROGRESS 36 _N"Operation now in progress") +(def-unix-error EALREADY 37 _N"Operation already in progress") +;;; +;;; ipc/network software +(def-unix-error ENOTSOCK 38 _N"Socket operation on non-socket") +(def-unix-error EDESTADDRREQ 39 _N"Destination address required") +(def-unix-error EMSGSIZE 40 _N"Message too long") +(def-unix-error EPROTOTYPE 41 _N"Protocol wrong type for socket") +(def-unix-error ENOPROTOOPT 42 _N"Protocol not available") +(def-unix-error EPROTONOSUPPORT 43 _N"Protocol not supported") +(def-unix-error ESOCKTNOSUPPORT 44 _N"Socket type not supported") +(def-unix-error EOPNOTSUPP 45 _N"Operation not supported on socket") +(def-unix-error EPFNOSUPPORT 46 _N"Protocol family not supported") +(def-unix-error EAFNOSUPPORT 47 _N"Address family not supported by protocol family") +(def-unix-error EADDRINUSE 48 _N"Address already in use") +(def-unix-error EADDRNOTAVAIL 49 _N"Can't assign requested address") +;;; +;;; operational errors +(def-unix-error ENETDOWN 50 _N"Network is down") +(def-unix-error ENETUNREACH 51 _N"Network is unreachable") +(def-unix-error ENETRESET 52 _N"Network dropped connection on reset") +(def-unix-error ECONNABORTED 53 _N"Software caused connection abort") +(def-unix-error ECONNRESET 54 _N"Connection reset by peer") +(def-unix-error ENOBUFS 55 _N"No buffer space available") +(def-unix-error EISCONN 56 _N"Socket is already connected") +(def-unix-error ENOTCONN 57 _N"Socket is not connected") +(def-unix-error ESHUTDOWN 58 _N"Can't send after socket shutdown") +(def-unix-error ETOOMANYREFS 59 _N"Too many references: can't splice") +(def-unix-error ETIMEDOUT 60 _N"Connection timed out") +(def-unix-error ECONNREFUSED 61 _N"Connection refused") +;;; +(def-unix-error ELOOP 62 _N"Too many levels of symbolic links") +(def-unix-error ENAMETOOLONG 63 _N"File name too long") +;;; +(def-unix-error EHOSTDOWN 64 _N"Host is down") +(def-unix-error EHOSTUNREACH 65 _N"No route to host") +(def-unix-error ENOTEMPTY 66 _N"Directory not empty") +;;; +;;; quotas & resource +(def-unix-error EPROCLIM 67 _N"Too many processes") +(def-unix-error EUSERS 68 _N"Too many users") +(def-unix-error EDQUOT 69 _N"Disc quota exceeded") +;;; +;;; CMU RFS +(def-unix-error ELOCAL 126 _N"namei should continue locally") +(def-unix-error EREMOTE 127 _N"namei was handled remotely") +;;; +;;; VICE +(def-unix-error EVICEERR 70 _N"Remote file system error _N") +(def-unix-error EVICEOP 71 _N"syscall was handled by Vice") ===================================== bin/errno-linux.lisp ===================================== @@ -0,0 +1,133 @@ +(def-unix-error EPERM 1) +(def-unix-error ENOENT 2) +(def-unix-error ESRCH 3) +(def-unix-error EINTR 4) +(def-unix-error EIO 5) +(def-unix-error ENXIO 6) +(def-unix-error E2BIG 7) +(def-unix-error ENOEXEC 8) +(def-unix-error EBADF 9) +(def-unix-error ECHILD 10) +(def-unix-error EAGAIN 11) +(def-unix-error ENOMEM 12) +(def-unix-error EACCES 13) +(def-unix-error EFAULT 14) +(def-unix-error ENOTBLK 15) +(def-unix-error EBUSY 16) +(def-unix-error EEXIST 17) +(def-unix-error EXDEV 18) +(def-unix-error ENODEV 19) +(def-unix-error ENOTDIR 20) +(def-unix-error EISDIR 21) +(def-unix-error EINVAL 22) +(def-unix-error ENFILE 23) +(def-unix-error EMFILE 24) +(def-unix-error ENOTTY 25) +(def-unix-error ETXTBSY 26) +(def-unix-error EFBIG 27) +(def-unix-error ENOSPC 28) +(def-unix-error ESPIPE 29) +(def-unix-error EROFS 30) +(def-unix-error EMLINK 31) +(def-unix-error EPIPE 32) +(def-unix-error EDOM 33) +(def-unix-error ERANGE 34) +(def-unix-error EDEADLK 35) +(def-unix-error ENAMETOOLONG 36) +(def-unix-error ENOLCK 37) +(def-unix-error ENOSYS 38) +(def-unix-error ENOTEMPTY 39) +(def-unix-error ELOOP 40) +(def-unix-error EWOULDBLOCK EAGAIN) +(def-unix-error ENOMSG 42) +(def-unix-error EIDRM 43) +(def-unix-error ECHRNG 44) +(def-unix-error EL2NSYNC 45) +(def-unix-error EL3HLT 46) +(def-unix-error EL3RST 47) +(def-unix-error ELNRNG 48) +(def-unix-error EUNATCH 49) +(def-unix-error ENOCSI 50) +(def-unix-error EL2HLT 51) +(def-unix-error EBADE 52) +(def-unix-error EBADR 53) +(def-unix-error EXFULL 54) +(def-unix-error ENOANO 55) +(def-unix-error EBADRQC 56) +(def-unix-error EBADSLT 57) +(def-unix-error EDEADLOCK EDEADLK) +(def-unix-error EBFONT 59) +(def-unix-error ENOSTR 60) +(def-unix-error ENODATA 61) +(def-unix-error ETIME 62) +(def-unix-error ENOSR 63) +(def-unix-error ENONET 64) +(def-unix-error ENOPKG 65) +(def-unix-error EREMOTE 66) +(def-unix-error ENOLINK 67) +(def-unix-error EADV 68) +(def-unix-error ESRMNT 69) +(def-unix-error ECOMM 70) +(def-unix-error EPROTO 71) +(def-unix-error EMULTIHOP 72) +(def-unix-error EDOTDOT 73) +(def-unix-error EBADMSG 74) +(def-unix-error EOVERFLOW 75) +(def-unix-error ENOTUNIQ 76) +(def-unix-error EBADFD 77) +(def-unix-error EREMCHG 78) +(def-unix-error ELIBACC 79) +(def-unix-error ELIBBAD 80) +(def-unix-error ELIBSCN 81) +(def-unix-error ELIBMAX 82) +(def-unix-error ELIBEXEC 83) +(def-unix-error EILSEQ 84) +(def-unix-error ERESTART 85) +(def-unix-error ESTRPIPE 86) +(def-unix-error EUSERS 87) +(def-unix-error ENOTSOCK 88) +(def-unix-error EDESTADDRREQ 89) +(def-unix-error EMSGSIZE 90) +(def-unix-error EPROTOTYPE 91) +(def-unix-error ENOPROTOOPT 92) +(def-unix-error EPROTONOSUPPORT 93) +(def-unix-error ESOCKTNOSUPPORT 94) +(def-unix-error EOPNOTSUPP 95) +(def-unix-error EPFNOSUPPORT 96) +(def-unix-error EAFNOSUPPORT 97) +(def-unix-error EADDRINUSE 98) +(def-unix-error EADDRNOTAVAIL 99) +(def-unix-error ENETDOWN 100) +(def-unix-error ENETUNREACH 101) +(def-unix-error ENETRESET 102) +(def-unix-error ECONNABORTED 103) +(def-unix-error ECONNRESET 104) +(def-unix-error ENOBUFS 105) +(def-unix-error EISCONN 106) +(def-unix-error ENOTCONN 107) +(def-unix-error ESHUTDOWN 108) +(def-unix-error ETOOMANYREFS 109) +(def-unix-error ETIMEDOUT 110) +(def-unix-error ECONNREFUSED 111) +(def-unix-error EHOSTDOWN 112) +(def-unix-error EHOSTUNREACH 113) +(def-unix-error EALREADY 114) +(def-unix-error EINPROGRESS 115) +(def-unix-error ESTALE 116) +(def-unix-error EUCLEAN 117) +(def-unix-error ENOTNAM 118) +(def-unix-error ENAVAIL 119) +(def-unix-error EISNAM 120) +(def-unix-error EREMOTEIO 121) +(def-unix-error EDQUOT 122) +(def-unix-error ENOMEDIUM 123) +(def-unix-error EMEDIUMTYPE 124) +(def-unix-error ECANCELED 125) +(def-unix-error ENOKEY 126) +(def-unix-error EKEYEXPIRED 127) +(def-unix-error EKEYREVOKED 128) +(def-unix-error EKEYREJECTED 129) +(def-unix-error EOWNERDEAD 130) +(def-unix-error ENOTRECOVERABLE 131) +(def-unix-error ERFKILL 132) +(def-unix-error EHWPOISON 133) ===================================== bin/errno-template.lisp ===================================== @@ -34,104 +34,3 @@ ;;; (def-unix-error ESUCCESS 0 _N"Successful") -;;; Do NOT modify the ESUCCESS form above. bin/create-errno.sh -;;; depends on it. - -;;; Default errno values. These are used only if we could not -;;; auto-generate these forms. -(def-unix-error EPERM 1 _N"Operation not permitted") -(def-unix-error ENOENT 2 _N"No such file or directory") -(def-unix-error ESRCH 3 _N"No such process") -(def-unix-error EINTR 4 _N"Interrupted system call") -(def-unix-error EIO 5 _N"I/O error") -(def-unix-error ENXIO 6 _N"Device not configured") -(def-unix-error E2BIG 7 _N"Arg list too long") -(def-unix-error ENOEXEC 8 _N"Exec format error") -(def-unix-error EBADF 9 _N"Bad file descriptor") -(def-unix-error ECHILD 10 _N"No child process") -#+bsd(def-unix-error EDEADLK 11 _N"Resource deadlock avoided") -#-bsd(def-unix-error EAGAIN 11 #-linux _N"No more processes" #+linux _N"Try again") -(def-unix-error ENOMEM 12 _N"Out of memory") -(def-unix-error EACCES 13 _N"Permission denied") -(def-unix-error EFAULT 14 _N"Bad address") -(def-unix-error ENOTBLK 15 _N"Block device required") -(def-unix-error EBUSY 16 _N"Device or resource busy") -(def-unix-error EEXIST 17 _N"File exists") -(def-unix-error EXDEV 18 _N"Cross-device link") -(def-unix-error ENODEV 19 _N"No such device") -(def-unix-error ENOTDIR 20 _N"Not a director") -(def-unix-error EISDIR 21 _N"Is a directory") -(def-unix-error EINVAL 22 _N"Invalid argument") -(def-unix-error ENFILE 23 _N"File table overflow") -(def-unix-error EMFILE 24 _N"Too many open files") -(def-unix-error ENOTTY 25 _N"Inappropriate ioctl for device") -(def-unix-error ETXTBSY 26 _N"Text file busy") -(def-unix-error EFBIG 27 _N"File too large") -(def-unix-error ENOSPC 28 _N"No space left on device") -(def-unix-error ESPIPE 29 _N"Illegal seek") -(def-unix-error EROFS 30 _N"Read-only file system") -(def-unix-error EMLINK 31 _N"Too many links") -(def-unix-error EPIPE 32 _N"Broken pipe") -;;; -;;; Math -(def-unix-error EDOM 33 _N"Numerical argument out of domain") -(def-unix-error ERANGE 34 #-linux _N"Result too large" #+linux _N"Math result not representable") - -;;; non-blocking and interrupt i/o -(def-unix-error EWOULDBLOCK 35 _N"Operation would block") -#-bsd(def-unix-error EDEADLK 35 _N"Operation would block") ; Ditto -#+bsd(def-unix-error EAGAIN 35 _N"Resource temporarily unavailable") -(def-unix-error EINPROGRESS 36 _N"Operation now in progress") -(def-unix-error EALREADY 37 _N"Operation already in progress") -;;; -;;; ipc/network software -(def-unix-error ENOTSOCK 38 _N"Socket operation on non-socket") -(def-unix-error EDESTADDRREQ 39 _N"Destination address required") -(def-unix-error EMSGSIZE 40 _N"Message too long") -(def-unix-error EPROTOTYPE 41 _N"Protocol wrong type for socket") -(def-unix-error ENOPROTOOPT 42 _N"Protocol not available") -(def-unix-error EPROTONOSUPPORT 43 _N"Protocol not supported") -(def-unix-error ESOCKTNOSUPPORT 44 _N"Socket type not supported") -(def-unix-error EOPNOTSUPP 45 _N"Operation not supported on socket") -(def-unix-error EPFNOSUPPORT 46 _N"Protocol family not supported") -(def-unix-error EAFNOSUPPORT 47 _N"Address family not supported by protocol family") -(def-unix-error EADDRINUSE 48 _N"Address already in use") -(def-unix-error EADDRNOTAVAIL 49 _N"Can't assign requested address") -;;; -;;; operational errors -(def-unix-error ENETDOWN 50 _N"Network is down") -(def-unix-error ENETUNREACH 51 _N"Network is unreachable") -(def-unix-error ENETRESET 52 _N"Network dropped connection on reset") -(def-unix-error ECONNABORTED 53 _N"Software caused connection abort") -(def-unix-error ECONNRESET 54 _N"Connection reset by peer") -(def-unix-error ENOBUFS 55 _N"No buffer space available") -(def-unix-error EISCONN 56 _N"Socket is already connected") -(def-unix-error ENOTCONN 57 _N"Socket is not connected") -(def-unix-error ESHUTDOWN 58 _N"Can't send after socket shutdown") -(def-unix-error ETOOMANYREFS 59 _N"Too many references: can't splice") -(def-unix-error ETIMEDOUT 60 _N"Connection timed out") -(def-unix-error ECONNREFUSED 61 _N"Connection refused") -;;; -(def-unix-error ELOOP 62 _N"Too many levels of symbolic links") -(def-unix-error ENAMETOOLONG 63 _N"File name too long") -;;; -(def-unix-error EHOSTDOWN 64 _N"Host is down") -(def-unix-error EHOSTUNREACH 65 _N"No route to host") -(def-unix-error ENOTEMPTY 66 _N"Directory not empty") -;;; -;;; quotas & resource -(def-unix-error EPROCLIM 67 _N"Too many processes") -(def-unix-error EUSERS 68 _N"Too many users") -(def-unix-error EDQUOT 69 _N"Disc quota exceeded") -;;; -;;; CMU RFS -(def-unix-error ELOCAL 126 _N"namei should continue locally") -(def-unix-error EREMOTE 127 _N"namei was handled remotely") -;;; -;;; VICE -(def-unix-error EVICEERR 70 _N"Remote file system error _N") -(def-unix-error EVICEOP 71 _N"syscall was handled by Vice") - -;;; Do NOT modify the line below. bin/create-errno.sh depends on it. - -;;; End of default def-unix-error forms View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/594cf2152a500c4abcd073d… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/594cf2152a500c4abcd073d… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] 2 commits: Add os_free_getpwuid() to free up space from os_getpwuid
by Raymond Toy (＠rtoy) 28 Mar '25

28 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: a865270d by Raymond Toy at 2025-03-27T20:23:52-07:00 Add os_free_getpwuid() to free up space from os_getpwuid Add the C function `os_free_getpwuid()` to os-common.c to free up the space allocated by `os_getpwuid()`. We do this so that the knowledge of the things were allocated are all in one place instead of having the Lisp code know what `os_getpwuid()` allocated. - - - - - 944881e2 by Raymond Toy at 2025-03-27T20:40:43-07:00 Add declaration to inhibit warnings Inhibit warnings about not being able to optimize away %sap-alien and being force to do runtime allocation. This happens when calling os_getpwuid and also derefing the pointer to the passwd struct. Also fix a warning coming from %file->name by calling `string`. - - - - - 2 changed files: - src/code/unix.lisp - src/lisp/os-common.c Changes: ===================================== src/code/unix.lisp ===================================== @@ -2540,14 +2540,24 @@ (unwind-protect (progn (setf result - (alien-funcall - (extern-alien "os_getpwuid" - (function (* (struct passwd)) - uid-t)) - uid)) + (locally + ;; Inhibit warnings about not being able to + ;; optimize away %sap-alien and doing runtime + ;; allocation. + (declare (optimize (ext:inhibit-warnings 3))) + (alien-funcall + (extern-alien "os_getpwuid" + (function (* (struct passwd)) + uid-t)) + uid))) (if (null-alien result) (values nil (unix-errno)) - (let ((passwd (deref result))) + (let ((passwd (locally + ;; Inhibit warnings about not being able to + ;; optimize away %sap-alien and doing runtime + ;; allocation. + (declare (optimize (ext:inhibit-warnings 3))) + (deref result)))) (make-user-info :name (string (cast (slot passwd 'pw-name) c-call:c-string)) :password (string (cast (slot passwd 'pw-passwd) c-call:c-string)) @@ -2557,16 +2567,14 @@ :gecos (string-decode (cast (slot passwd 'pw-gecos) c-call:c-string) :default) ;; The home directory could be unicode - :dir (%file->name (cast (slot passwd 'pw-dir) c-call:c-string)) + :dir (%file->name (string (cast (slot passwd 'pw-dir) c-call:c-string))) :shell (string (cast (slot passwd 'pw-shell) c-call:c-string)))))) (unless (null-alien result) - (let ((passwd (deref result))) - (free-alien (slot passwd 'pw-name)) - (free-alien (slot passwd 'pw-passwd)) - (free-alien (slot passwd 'pw-gecos)) - (free-alien (slot passwd 'pw-dir)) - (free-alien (slot passwd 'pw-shell))) - (free-alien result)))))) + (alien-funcall + (extern-alien "os_free_getpwuid" + (function c-call:void + (* (struct passwd)))) + result)))))) ;;; Getrusage is not provided in the C library on Solaris 2.4, and is ===================================== src/lisp/os-common.c ===================================== @@ -936,6 +936,16 @@ os_get_user_homedir(const char* name, int *status) return NULL; } + +/* + * Get the passwd info for the user id UID. If the uid does not + * exist, return NULL. Otherwise, return a passwd struct that has the + * slots filled in that are needed to create the USER-INFO structure. + * All other slots in passwd are undefined. + * + * The caller MUST call os_free_getpwuid() to free the space allocated + * by os_getpwuid(). + */ struct passwd* os_getpwuid(uid_t uid) { @@ -994,3 +1004,18 @@ again: return result; } + +/* + * Free the space allocated for the passwd struct returned by + * os_getpwuid(). + */ +void +os_free_getpwuid(struct passwd* pwd) +{ + free(pwd->pw_name); + free(pwd->pw_passwd); + free(pwd->pw_gecos); + free(pwd->pw_dir); + free(pwd->pw_shell); + free(pwd); +} View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/879dd1adafa83bb3c65d08… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/879dd1adafa83bb3c65d08… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0