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

[Git][cmucl/cmucl][issue-386-generate-def-unix-error] 3 commits: Fix #389: Reduce duplication in CI rules
by Raymond Toy (＠rtoy) 27 Mar '25

27 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: de2abad2 by Raymond Toy at 2025-03-25T14:10:15+00:00 Fix #389: Reduce duplication in CI rules - - - - - 7aaca65e by Raymond Toy at 2025-03-25T14:10:15+00:00 Merge branch 'issue-389-reduce-duplication-in-ci-rules' into 'master' Fix #389: Reduce duplication in CI rules Closes #389 See merge request cmucl/cmucl!275 - - - - - 19488158 by Raymond Toy at 2025-03-26T20:11:26-07:00 Merge branch 'master' into issue-386-generate-def-unix-error - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d71cbd8358eb7f5f900935… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d71cbd8358eb7f5f900935… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Update pot file for changed docstring for getpwuid
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 879dd1ad by Raymond Toy at 2025-03-26T13:40:05-07:00 Update pot file for changed docstring for getpwuid - - - - - 1 changed file: - src/i18n/locale/cmucl-unix.pot Changes: ===================================== src/i18n/locale/cmucl-unix.pot ===================================== @@ -1346,12 +1346,6 @@ msgid "" " slots as in unix-getitimer." msgstr "" -#: src/code/unix.lisp -msgid "" -"Return a USER-INFO structure for the user identified by UID, or NIL if not " -"found." -msgstr "" - #: src/code/unix.lisp msgid "" "Return a USER-INFO structure for the user identified by UID. If\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/879dd1adafa83bb3c65d083… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/879dd1adafa83bb3c65d083… 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: Handle unicode in the GECOS and home dir fields
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: af84aebc by Raymond Toy at 2025-03-26T12:47:09-07:00 Handle unicode in the GECOS and home dir fields The GECOS field can contain Unicode characters so we need to decode these to create a Lisp string. Likewise the home directory could contain Unicode characters so we need to decode it too. - - - - - c94bf57a by Raymond Toy at 2025-03-26T12:51:06-07:00 Add a simple test for getpwuid I think the only guaranteed UID that is the same for every OS is 0. Check that we get something reasonably sensible for the root user. - - - - - 2 changed files: - src/code/unix.lisp - tests/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2553,8 +2553,11 @@ :password (string (cast (slot passwd 'pw-passwd) c-call:c-string)) :uid (slot passwd 'pw-uid) :gid (slot passwd 'pw-gid) - :gecos (string (cast (slot passwd 'pw-gecos) c-call:c-string)) - :dir (string (cast (slot passwd 'pw-dir) c-call:c-string)) + ;; The GECOS field could be unicode + :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)) :shell (string (cast (slot passwd 'pw-shell) c-call:c-string)))))) (unless (null-alien result) (let ((passwd (deref result))) ===================================== tests/unix.lisp ===================================== @@ -89,3 +89,10 @@ (assert-true (and (integerp errno) (plusp errno))))) +(define-test getpwuid + (:tag :issues) + ;; Check that we get something sensible from unix-getpwuid. + (let ((info (unix:unix-getpwuid 0))) + (assert-true info) + (assert-equal (unix:user-info-name info) + "root"))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/2117ed00193d7a44083a2a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/2117ed00193d7a44083a2a… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Remove OS-specific user-info and passwd stuff
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: 2117ed00 by Raymond Toy at 2025-03-26T11:39:39-07:00 Remove OS-specific user-info and passwd stuff First, remove the OS-specific fields from `user-info`. Basically, the user info no longer includes the solaris fields "age" and "comment" nor the freebsd field "change". Second, the passwd structure now only includes just the fields needed to fill in the user-info structure, even if the OS provides additional fields. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2409,43 +2409,15 @@ (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)) -;; 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 +;; See <pwd.h> +;; +;; While each OS may contain additional fields, we only need the ones +;; that are used the user-info structure. -#+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 -#+linux (def-alien-type nil (struct passwd (pw-name (* char)) ; user's login name View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2117ed00193d7a44083a2af… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2117ed00193d7a44083a2af… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-393-os-common-getpwuid] Remove debugging prints from os_getpwuid
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-393-os-common-getpwuid at cmucl / cmucl Commits: d32c16f1 by Raymond Toy at 2025-03-26T11:11:38-07:00 Remove debugging prints from os_getpwuid - - - - - 1 changed file: - src/lisp/os-common.c Changes: ===================================== src/lisp/os-common.c ===================================== @@ -957,7 +957,11 @@ os_getpwuid(uid_t uid) again: switch (getpwuid_r(uid, &pwd, buffer, size, &ppwd)) { case 0: - /* Success, though we might not have a matching entry */ + /* + * Success, though we might not have a matching entry. But + * if we do, copy the entry to a new structure and return + * that. + */ if (ppwd != NULL) { result = (struct passwd*) malloc(sizeof(pwd)); result->pw_name = strdup(pwd.pw_name); @@ -967,11 +971,6 @@ again: result->pw_gecos = strdup(pwd.pw_gecos); result->pw_dir = strdup(pwd.pw_dir); result->pw_shell = strdup(pwd.pw_shell); - printf("pw-name = %p\n", result->pw_name); - printf("pw-passwd = %p\n", result->pw_passwd); - printf("pw-gecos = %p\n", result->pw_gecos); - printf("pw_dir = %p\n", result->pw_dir); - printf("pw_shell = %p\n", result->pw_shell); } break; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d32c16f16d9ff37a3b1f584… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d32c16f16d9ff37a3b1f584… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-393-os-common-getpwuid
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed new branch issue-393-os-common-getpwuid at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-393-os-common-getpw… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-381-darwin-pathname-docstring
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed new branch issue-381-darwin-pathname-docstring at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-381-darwin-pathname… 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: fix typo in comment
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: d71cbd83 by Raymond Toy at 2025-03-26T08:37:41-07:00 Address review: fix typo in comment - - - - - 1 changed file: - bin/create-errno.sh Changes: ===================================== bin/create-errno.sh ===================================== @@ -1,6 +1,6 @@ #! /bin/sh -# Generates the contents of the file code/unix-errno.lisp. The args +# Generates the contents of the file code/errno.lisp. The args # to this script, if supplied, must be a list of files containing the # definitions of all the Unix errno values. # View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d71cbd8358eb7f5f900935c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d71cbd8358eb7f5f900935c… 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] ERRNO package needs to use LISP package
by Raymond Toy (＠rtoy) 26 Mar '25

26 Mar '25

Raymond Toy pushed to branch issue-386-generate-def-unix-error at cmucl / cmucl Commits: a9d96134 by Raymond Toy at 2025-03-25T20:02:23-07:00 ERRNO package needs to use LISP package Just do the same thing that is done with the UNIX package which also needs to use the LISP package. (I think this was working but somehow got dropped somewhere along the way? Anyway, we're adding it back in now.) - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -139,6 +139,7 @@ (use-package '("SYSTEM" "ALIEN-INTERNALS" "ALIEN" "LISP") "C-CALL") (use-package '("KERNEL" "EXTENSIONS" "LISP") "INSPECT") (use-package '("LISP" "KERNEL") "BIGNUM") +(use-package '("LISP") "ERRNO") (use-package '("LISP") "UNIX") (use-package '("KERNEL" "LISP" "EXTENSIONS") "FORMAT") (use-package '("EXTENSIONS" "SYSTEM" "DEBUG" "KERNEL" "BIGNUM") "LISP") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a9d961341217941ad0aea6b… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a9d961341217941ad0aea6b… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-391-load-world-can-set-lisp-impl-ver] Get version from cmucl-version.h if possible
by Raymond Toy (＠rtoy) 25 Mar '25

25 Mar '25

Raymond Toy pushed to branch issue-391-load-world-can-set-lisp-impl-ver at cmucl / cmucl Commits: 87ea5a78 by Raymond Toy at 2025-03-25T16:41:00-07:00 Get version from cmucl-version.h if possible If the `-v` option is not given, first try to get the version from src/lisp/cmucl-version.h if it exists. Otherwise just use git-version.sh. We do this so that `*lisp-implementation-version*` has the value that is compiled into lisp. - - - - - 1 changed file: - bin/load-world.sh Changes: ===================================== bin/load-world.sh ===================================== @@ -41,7 +41,15 @@ fi # If version string not given, use the git version if [ -z "$VERSION" ]; then - VERSION=`bin/git-version.sh` + # Try to get the version from cmucl-version.h so that we match + # exactly what was used for building lisp. Otherwise, fall back + # to git-version.sh + FILE="src/lisp/cmucl-version.h" + if [ -f "$FILE" ]; then + VERSION=`grep CMUCL_VERSION "$FILE" | sed 's/^.*CMUCL_VERSION //'` + else + VERSION=`bin/git-version.sh` + fi fi $TARGET/lisp/lisp -core $TARGET/lisp/kernel.core <<EOF View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/87ea5a78531b0dfc5f6e6b1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/87ea5a78531b0dfc5f6e6b1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0