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

[Git][cmucl/cmucl][issue-394-getcwd-retry-buffer-size] Remove old code and add docstring; update cmucl-unix.pot
by Raymond Toy (＠rtoy) 31 Mar '25

31 Mar '25

Raymond Toy pushed to branch issue-394-getcwd-retry-buffer-size at cmucl / cmucl Commits: cee8ce72 by Raymond Toy at 2025-03-31T14:40:40-07:00 Remove old code and add docstring; update cmucl-unix.pot Remove the old version of `unix-current-directory` and add a docstring for it as well. This means cmucl-unix.pot needs to be updated. - - - - - 3 changed files: - src/code/unix.lisp - src/i18n/locale/cmucl-unix.pot - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/unix.lisp ===================================== @@ -370,26 +370,10 @@ nil) -;; Use getcwd instead of getwd. But what should we do if the path -;; won't fit? Try again with a larger size? We don't do that right -;; now. -#+nil -(defun unix-current-directory () - ;; 5120 is some randomly selected maximum size for the buffer for getcwd. - (with-alien ((buf (array c-call:char 5120))) - (let ((result - (alien-funcall - (extern-alien "getcwd" - (function (* c-call:char) - (* c-call:char) c-call:int)) - (cast buf (* c-call:char)) - 5120))) - - (values (not (zerop - (sap-int (alien-sap result)))) - (%file->name (cast buf c-call:c-string)))))) - (defun unix-current-directory () + "Get the current working directory. If the directory could be + determined, T and the directory name as a string are returned. + Otherwise, both values are NIL." (let (result) (unwind-protect (progn ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -28,6 +28,13 @@ msgstr "" msgid "Syscall ~A failed: ~A" msgstr "" +#: src/code/unix.lisp +msgid "" +"Get the current working directory. If the directory could be\n" +" determined, T and the directory name as a string are returned.\n" +" Otherwise, both values are NIL." +msgstr "" + #: src/code/unix.lisp msgid "Test for read permission" msgstr "" ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9667,6 +9667,15 @@ msgid "" " an otherwise undefined logical host." msgstr "" +#: src/code/pathname.lisp +msgid "" +"When non-NIL, pathnames are on Darwin are normalized when created.\n" +" Otherwise, the pathnames are unchanged.\n" +"\n" +" This must be NIL during bootstrapping because Unicode is not yet\n" +" available." +msgstr "" + #: src/code/pathname.lisp msgid "A path specification, either a string, file-stream or pathname." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/cee8ce72ba333510f7b6d35… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/cee8ce72ba333510f7b6d35… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Update cmucl.pot
by Raymond Toy (＠rtoy) 31 Mar '25

31 Mar '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: e90fa5af by Raymond Toy at 2025-03-30T20:10:38-07:00 Update cmucl.pot This was updated in !280 landed and I forgot to update it there, so we're doing it now. - - - - - 1 changed file: - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -9667,6 +9667,15 @@ msgid "" " an otherwise undefined logical host." msgstr "" +#: src/code/pathname.lisp +msgid "" +"When non-NIL, pathnames are on Darwin are normalized when created.\n" +" Otherwise, the pathnames are unchanged.\n" +"\n" +" This must be NIL during bootstrapping because Unicode is not yet\n" +" available." +msgstr "" + #: src/code/pathname.lisp msgid "A path specification, either a string, file-stream or pathname." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e90fa5af893e3d5842b5064… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e90fa5af893e3d5842b5064… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-394-getcwd-retry-buffer-size
by Raymond Toy (＠rtoy) 31 Mar '25

31 Mar '25

Raymond Toy pushed new branch issue-394-getcwd-retry-buffer-size at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-394-getcwd-retry-bu… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[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