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

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] 2 commits: Fix typo in mkstemp.name-returned
by Raymond Toy (＠rtoy) 17 Feb '25

17 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 239afca7 by Raymond Toy at 2025-02-16T19:16:57-08:00 Fix typo in mkstemp.name-returned We were trying to unlink `name`, but it should be `filename`. - - - - - 93ec7d20 by Raymond Toy at 2025-02-16T19:17:55-08:00 Forgot one place to use system-area-copy and fix typo in another call. Replace one loop with system-area-copy in unix-mkstemp. Fix typo in system-area-copy in unix-mkdtemp because we forgot the dst offset arg. - - - - - 2 changed files: - src/code/unix.lisp - tests/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2932,8 +2932,10 @@ (progn ;; Copy out the alien bytes and convert back ;; to a lisp string. - (dotimes (k length) - (setf (aref octets k) (deref buffer k))) + (system:without-gcing + (kernel:system-area-copy (alien-sap buffer) 0 + (vector-sap octets) 0 + (* length vm:byte-bits))) (stream:octets-to-string octets :external-format format))) (cast buffer (* c-call:char)))))) @@ -2959,7 +2961,7 @@ ;; Copy the octets from OCTETS to the null-terminated array BUFFER. (system:without-gcing (kernel:system-area-copy (vector-sap octets) 0 - (alien-sap buffer) + (alien-sap buffer) 0 (* length vm:byte-bits))) (setf (deref buffer length) 0) ===================================== tests/unix.lisp ===================================== @@ -18,7 +18,7 @@ (assert-false (equalp filename template)) (assert-true (>= 5 (mismatch filename template)))))) (when fd - (unix:unix-unlink name))))) + (unix:unix-unlink filename))))) (define-test mkstemp.non-ascii-name-returned (:tag :issues) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5039239f52588ce0756843… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5039239f52588ce0756843… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] 3 commits: Rename mkstemp.name-returned.2 to mkstemp.non-ascii-name-returned
by Raymond Toy (＠rtoy) 17 Feb '25

17 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 30c30e87 by Raymond Toy at 2025-02-16T18:48:47-08:00 Rename mkstemp.name-returned.2 to mkstemp.non-ascii-name-returned Test name better reflects that we're testing a template with non-ascii characters. - - - - - 4827d17e by Raymond Toy at 2025-02-16T18:48:47-08:00 Rename mkdtemp.name-returned.2 to mkdtemp.non-ascii-name-returned Test name better reflects that we're testing a template with non-ascii characters. - - - - - 70b34d28 by Raymond Toy at 2025-02-16T18:48:47-08:00 Usee system-area-copy to copy the octets to the buffer Better than using our own loop. Also forgot to set the last byte of the buffer to 0 (to terminate the C string) in unix-mkdtemp, so do it now. - - - - - 2 changed files: - src/code/unix.lisp - tests/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2921,8 +2921,10 @@ (with-alien ((buffer (* c-call:unsigned-char))) (setf buffer (make-alien c-call:unsigned-char (1+ length))) ;; Copy the octets from OCTETS to the null-terminated array BUFFER. - (dotimes (k length) - (setf (deref buffer k) (aref octets k))) + (system:without-gcing + (kernel:system-area-copy (vector-sap octets) 0 + (alien-sap buffer) 0 + (* length vm:byte-bits))) (setf (deref buffer length) 0) (syscall ("mkstemp" (* c-call:char)) @@ -2955,8 +2957,12 @@ (with-alien ((buffer (* c-call:unsigned-char))) (setf buffer (make-alien c-call:unsigned-char (1+ length))) ;; Copy the octets from OCTETS to the null-terminated array BUFFER. - (dotimes (k length) - (setf (deref buffer k) (aref octets k))) + (system:without-gcing + (kernel:system-area-copy (vector-sap octets) 0 + (alien-sap buffer) + (* length vm:byte-bits))) + (setf (deref buffer length) 0) + (let ((result (alien-funcall (extern-alien "mkdtemp" (function (* char) ===================================== tests/unix.lisp ===================================== @@ -20,7 +20,7 @@ (when fd (unix:unix-unlink name))))) -(define-test mkstemp.name-returned.2 +(define-test mkstemp.non-ascii-name-returned (:tag :issues) (let ((unix::*filename-encoding* :utf-8) fd name) @@ -84,7 +84,7 @@ (when name (unix:unix-rmdir name))))) -(define-test mkdtemp.name-returned.2 +(define-test mkdtemp.non-ascii-name-returned (:tag :issues) (let ((unix::*filename-encoding* :utf-8) name) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b65c787bfdbd4ee9d2a8fd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b65c787bfdbd4ee9d2a8fd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Apply suggestion to mkstemp.name-returned
by Raymond Toy (＠rtoy) 17 Feb '25

17 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: b65c787b by Raymond Toy at 2025-02-17T02:09:01+00:00 Apply suggestion to mkstemp.name-returned Compare returned name with template (which should be different). Add a few more tests for some other invariants. - - - - - 1 changed file: - tests/unix.lisp Changes: ===================================== tests/unix.lisp ===================================== @@ -7,13 +7,16 @@ (define-test mkstemp.name-returned (:tag :issues) - (let (fd name) + (let (fd filename) (unwind-protect (progn - (multiple-value-setq (fd name) - (unix::unix-mkstemp "test-XXXXXX")) - (assert-true fd) - (assert-false (search "XXXXXX" name))) + (let ((template "test-XXXXXX")) + (multiple-value-setq (fd filename) + (unix::unix-mkstemp (copy-seq template))) + (assert-true fd) + (assert-true (equalp (length filename) (length template))) + (assert-false (equalp filename template)) + (assert-true (>= 5 (mismatch filename template)))))) (when fd (unix:unix-unlink name))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b65c787bfdbd4ee9d2a8fd4… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b65c787bfdbd4ee9d2a8fd4… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #382: Make command-line options be case-sensitive instead of case-insenstive
by Raymond Toy (＠rtoy) 17 Feb '25

17 Feb '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 03081eeb by Raymond Toy at 2025-02-17T01:52:03+00:00 Fix #382: Make command-line options be case-sensitive instead of case-insenstive - - - - - ee669070 by Raymond Toy at 2025-02-17T01:52:04+00:00 Merge branch 'issue-382-command-line-options-case-sensitive' into 'master' Fix #382: Make command-line options be case-sensitive instead of case-insenstive Closes #382 See merge request cmucl/cmucl!267 - - - - - 1 changed file: - src/code/commandline.lisp Changes: ===================================== src/code/commandline.lisp ===================================== @@ -190,17 +190,17 @@ (demons *command-switch-demons*)) (flet ((invoke-demon (switch) (let* ((name (cmd-switch-name switch)) - (demon (cdr (assoc name demons :test #'string-equal)))) + (demon (cdr (assoc name demons :test #'string=)))) (cond (demon (funcall demon switch)) - ((or (member name *legal-cmd-line-switches* :test #'string-equal :key #'car) + ((or (member name *legal-cmd-line-switches* :test #'string= :key #'car) (not *complain-about-illegal-switches*))) (t (warn (intl:gettext "~S is an illegal switch") switch))) (lisp::finish-standard-output-streams)))) ;; We want to process -help (or --help) first, if it's given. ;; Since we're asking for help, we don't want to process any of ;; the other switches. - (let ((maybe-help (or (find "help" switches :key #'cmd-switch-name :test #'string-equal) - (find "-help" switches :key #'cmd-switch-name :test #'string-equal)))) + (let ((maybe-help (or (find "help" switches :key #'cmd-switch-name :test #'string=) + (find "-help" switches :key #'cmd-switch-name :test #'string=)))) (if maybe-help (invoke-demon maybe-help) (dolist (switch switches t) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/38da65c4f6d43c2e0eb211… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/38da65c4f6d43c2e0eb211… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-381-cmucl-unix-os-specific
by Raymond Toy (＠rtoy) 16 Feb '25

16 Feb '25

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

1 0

[Git][cmucl/cmucl] Pushed new branch issue-382-command-line-options-case-sensitive
by Raymond Toy (＠rtoy) 16 Feb '25

16 Feb '25

Raymond Toy pushed new branch issue-382-command-line-options-case-sensitive at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-382-command-line-op… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-365-add-strerror] Simplify implmentation of strerror by using string-decode
by Raymond Toy (＠rtoy) 15 Feb '25

15 Feb '25

Raymond Toy pushed to branch issue-365-add-strerror at cmucl / cmucl Commits: 251232c4 by Raymond Toy at 2025-02-15T08:14:50-08:00 Simplify implmentation of strerror by using string-decode I was stupid. We can use `string-decode` to get the proper Lisp string from the C string returned by `strerror`. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2631,17 +2631,6 @@ (let ((result (alien-funcall (extern-alien "strerror" - (function (* unsigned-char) int)) + (function (* char) int)) errno))) - ;; We need to convert the set of octets to a Lisp string according - ;; to the appropriate external format. Copy the C string out to - ;; an array which we can then convert to a string. - (let* ((octets (make-array 100 :element-type '(unsigned-byte 8) :fill-pointer 0))) - (loop for k from 0 - for byte = (deref result k) - until (zerop byte) - do - (vector-push-extend byte octets)) - (lisp::with-array-data ((data octets) (start) (end)) - (declare (ignore start end)) - (values (stream:octets-to-string data :end (length octets))))))) + (string-decode (cast result c-string) :default))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/251232c46e3dc7a9a1f268e… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/251232c46e3dc7a9a1f268e… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-365-add-strerror] 2 commits: Update cmucl.pot file
by Raymond Toy (＠rtoy) 15 Feb '25

15 Feb '25

Raymond Toy pushed to branch issue-365-add-strerror at cmucl / cmucl Commits: 8c703d45 by Raymond Toy at 2025-02-15T07:34:51-08:00 Update cmucl.pot file - - - - - 3e9e71b0 by Raymond Toy at 2025-02-15T07:35:00-08:00 Apply external format to string returned by strerror `strerror` returns a string of octets. We need to convert that set of octets to a Lisp string using the appropriate external format. I tested this using: ``` LANG=de_DE.utf-8 dist-linux/bin/lisp -quiet * (unix:get-unix-error-msg 14) "Ungültige Adresse" ``` Google translate says that's "Invalid address". Makes sense EFAULT, "Bad address". - - - - - 2 changed files: - src/code/unix.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/unix.lisp ===================================== @@ -2628,9 +2628,20 @@ (defun unix-strerror (errno) _N"Returns a string that describes the error code Errno" - (cast - (alien-funcall - (extern-alien "strerror" - (function (* char) int)) - errno) - c-string)) + (let ((result + (alien-funcall + (extern-alien "strerror" + (function (* unsigned-char) int)) + errno))) + ;; We need to convert the set of octets to a Lisp string according + ;; to the appropriate external format. Copy the C string out to + ;; an array which we can then convert to a string. + (let* ((octets (make-array 100 :element-type '(unsigned-byte 8) :fill-pointer 0))) + (loop for k from 0 + for byte = (deref result k) + until (zerop byte) + do + (vector-push-extend byte octets)) + (lisp::with-array-data ((data octets) (start) (end)) + (declare (ignore start end)) + (values (stream:octets-to-string data :end (length octets))))))) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -6209,7 +6209,7 @@ msgid "Same as -help." msgstr "" #: src/code/commandline.lisp -msgid "Prints the cmucl version and exits" +msgid "Prints the cmucl version and exits, without loading the lisp core." msgstr "" #: src/code/commandline.lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/bc2051dbaf71a369a3b3b1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/bc2051dbaf71a369a3b3b1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #379: Support GNU-style command line option names
by Raymond Toy (＠rtoy) 15 Feb '25

15 Feb '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 67cb15e6 by Raymond Toy at 2025-02-15T15:34:50+00:00 Fix #379: Support GNU-style command line option names - - - - - 38da65c4 by Raymond Toy at 2025-02-15T15:34:50+00:00 Merge branch 'issue-379-gnu-style-options' into 'master' Fix #379: Support GNU-style command line option names Closes #379 See merge request cmucl/cmucl!266 - - - - - 4 changed files: - src/code/commandline.lisp - src/general-info/release-21f.md - src/i18n/locale/cmucl.pot - src/lisp/lisp.c Changes: ===================================== src/code/commandline.lisp ===================================== @@ -109,7 +109,13 @@ (return (setf *command-line-switches* (nreverse *command-line-switches*)))) (let* ((position (position #\= (the simple-string str) :test #'char=)) - (switch (subseq (the simple-string str) 1 position)) + ;; Extract the name of the switch. The actual arg can be + ;; "-switch" or "--switch". + (switch (subseq (the simple-string str) + (position-if-not #'(lambda (c) + (char= c #\-)) + str) + position)) (value (if position (subseq (the simple-string str) (1+ position) (length (the simple-string str)))))) @@ -143,7 +149,14 @@ the switch. If no value was specified, then any following words are returned. If there are no following words, then t is returned. If the switch was not specified, then nil is returned." - (let* ((name (if (char= (schar sname 0) #\-) (subseq sname 1) sname)) + (let* ((posn (position-if-not #'(lambda (ch) + (char= ch #\-)) + sname)) + ;; Strip up to 2 leading "-" to get the switch name. + ;; Otherwise, return the entire switch name. + (name (if (and posn (<= posn 2)) + (subseq sname posn) + sname)) (switch (find name *command-line-switches* :test #'string-equal :key #'cmd-switch-name))) @@ -230,12 +243,12 @@ (lisp::finish-standard-output-streams) (setf start next))))) -;; Docstrings should have lines longer than 72 characters so that we -;; can print out the docstrings nicely on one line for help. -;; | <-- char 72 +;; Docstrings MUST consist of simple text and punctuation and +;; newlines; no special markup is allowed. When help is printed, the +;; help string is automatically filled and wrapped to 80 columns. (defswitch "eval" #'eval-switch-demon "Evaluate the specified Lisp expression during the start up - sequence. the value of the form will not be printed unless it is + sequence. The value of the form will not be printed unless it is wrapped in a form that does output." "expression") @@ -325,7 +338,7 @@ (defswitch "quiet" nil "Causes Lisp to start up silently, disabling printing of the herald - and causing most unnecessary noise, like GC messages,load messages, + and causing most unnecessary noise, like GC messages, load messages, etc. to be suppressed.") (defswitch "debug-lisp-search" nil @@ -338,7 +351,8 @@ (defun help-switch-demon (switch) (declare (ignore switch)) - (format t (intl:gettext "~&Usage: ~A <options>~2%") *command-line-utility-name*) + (format t (intl:gettext "~&Usage: ~A <options> [-- [app-args]*]~2%") + *command-line-utility-name*) (flet ((get-words (s) (declare (string s)) @@ -366,7 +380,12 @@ :key #'car)) (destructuring-bind (name doc arg) s - (format t " -~A ~@[~A~]~%" name (if arg (intl:gettext arg))) + ;; Print both -switch and --switch, and the optional arg + ;; value. + (format t " -~A|--~A ~@[~A~]~%" + name name + (if arg (intl:gettext arg))) + ;; Poor man's formatting of the help string (let ((*print-right-margin* 80)) ;; Extract all the words from the string and print them out @@ -392,9 +411,6 @@ (defswitch "help" #'help-switch-demon "Print out the command line options and exit") -(defswitch "-help" #'help-switch-demon - "Same as -help.") - (defun version-switch-demon (switch) (declare (ignore switch)) (format t "~A~%" (lisp-implementation-version)) @@ -406,8 +422,3 @@ ;; it out so the user knows about it. (defswitch "version" #'version-switch-demon "Prints the cmucl version and exits, without loading the lisp core.") - -;; Make --version work for the benefit of those who are accustomed to -;; GNU software. -(defswitch "-version" #'version-switch-demon - "Prints the cmucl version and exits; same as -version") ===================================== src/general-info/release-21f.md ===================================== @@ -119,6 +119,7 @@ public domain. * ~~#364~~ Add interface to `mkdtemp` and `mkstemp` * ~~#367~~ Add stream:string-count-octets to count octets in a string * ~~#369~~ Improve docstring for `unix::unix-setlocale` + * ~~#379~~ Support GNU-style command-line option names * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -6060,7 +6060,7 @@ msgstr "" #: src/code/commandline.lisp msgid "" "Evaluate the specified Lisp expression during the start up\n" -" sequence. the value of the form will not be printed unless it is\n" +" sequence. The value of the form will not be printed unless it is\n" " wrapped in a form that does output." msgstr "" @@ -6182,7 +6182,7 @@ msgstr "" #: src/code/commandline.lisp msgid "" "Causes Lisp to start up silently, disabling printing of the herald\n" -" and causing most unnecessary noise, like GC messages,load messages,\n" +" and causing most unnecessary noise, like GC messages, load messages,\n" " etc. to be suppressed." msgstr "" @@ -6197,25 +6197,17 @@ msgid "Specify the unidata.bin file to be used." msgstr "" #: src/code/commandline.lisp -msgid "~&Usage: ~A <options>~2%" +msgid "~&Usage: ~A <options> [-- [app-args]*]~2%" msgstr "" #: src/code/commandline.lisp msgid "Print out the command line options and exit" msgstr "" -#: src/code/commandline.lisp -msgid "Same as -help." -msgstr "" - #: src/code/commandline.lisp msgid "Prints the cmucl version and exits, without loading the lisp core." msgstr "" -#: src/code/commandline.lisp -msgid "Prints the cmucl version and exits; same as -version" -msgstr "" - #: src/code/env-access.lisp msgid "" "Returns information about the symbol VAR in the lexical environment ENV.\n" ===================================== src/lisp/lisp.c ===================================== @@ -460,6 +460,41 @@ core_failure(const char* core, const char* argv[]) exit(1); } +/* + * Match the actual command line option "arg" with the arg name in + * "argname". The option matches if it is exacty the arg name + * prefixed by either one or two "-" characters. + * + * Returns non-zero if it matches. + */ +int match_option(const char* arg, const char* argname) +{ + if ((strlen(arg) < 2) || strlen(argname) < 1) { + /* + * The actual arg must be at least 2 characters. The argname + * must have at least 1. + */ + return 0; + } + + /* Must start with a "-" */ + if (arg[0] != '-') { + return 0; + } + + if (strcmp(arg + 1, argname) == 0) { + /* We have "-" followed by the argname. That's a match. */ + return 1; + } + + if ((arg[1] == '-') && (strcmp(arg + 2, argname) == 0)) { + /* We have "--" followed by the argname. That's a match. */ + return 1; + } + + return 0; +} + int main(int argc, const char *argv[], const char *envp[]) { @@ -529,7 +564,7 @@ main(int argc, const char *argv[], const char *envp[]) argptr = argv; while ((arg = *++argptr) != NULL) { - if (strcmp(arg, "-core") == 0) { + if (match_option(arg, "core")) { if (builtin_image_flag) { fprintf(stderr, "Warning: specifying a core file with an executable image is unusual,\nbut should work.\n"); @@ -543,87 +578,98 @@ main(int argc, const char *argv[], const char *envp[]) core = *++argptr; if (core == NULL) { fprintf(stderr, - "-core must be followed by the name of the core file to use.\n"); + "%s must be followed by the name of the core file to use.\n", + arg); exit(1); } - } else if (strcmp(arg, "-lib") == 0) { + } else if (match_option(arg, "lib")) { lib = *++argptr; if (lib == NULL) { fprintf(stderr, - "-lib must be followed by a string denoting the CMUCL library path.\n"); + "%s must be followed by a string denoting the CMUCL library path.\n", + arg); exit(1); } - } else if (strcmp(arg, "-read-only-space-size") == 0) { + } else if (match_option(arg, "read-only-space-size")) { const char *str = *++argptr; if (str == NULL) { fprintf(stderr, - "-read-only-space-size must be followed by the size in MBytes.\n"); + "%s must be followed by the size in MBytes.\n", + arg); exit(1); } read_only_space_size = atoi(str) * 1024 * 1024; if (read_only_space_size > READ_ONLY_SPACE_SIZE) { fprintf(stderr, - "-read-only-space-size must be no greater than %lu MBytes.\n", + "%s must be no greater than %lu MBytes.\n", + arg, READ_ONLY_SPACE_SIZE / (1024 * 1024UL)); fprintf(stderr, " Continuing with default size.\n"); read_only_space_size = READ_ONLY_SPACE_SIZE; } - } else if (strcmp(arg, "-static-space-size") == 0) { + } else if (match_option(arg, "static-space-size")) { const char *str = *++argptr; if (str == NULL) { fprintf(stderr, - "-static-space-size must be followed by the size in MBytes.\n"); + "%s must be followed by the size in MBytes.\n", + arg); exit(1); } static_space_size = atoi(str) * 1024 * 1024; if (static_space_size > STATIC_SPACE_SIZE) { fprintf(stderr, - "-static-space-size must be no greater than %lu MBytes.\n", + "%s must be no greater than %lu MBytes.\n", + arg, STATIC_SPACE_SIZE / (1024 * 1024UL)); fprintf(stderr, " Continuing with default size.\n"); static_space_size = STATIC_SPACE_SIZE; } - } else if (strcmp(arg, "-binding-stack-size") == 0) { + } else if (match_option(arg, "binding-stack-size")) { const char *str = *++argptr; if (str == NULL) { fprintf(stderr, - "-binding-stack-size must be followed by the size in MBytes.\n"); + "%s must be followed by the size in MBytes.\n", + arg); exit(1); } binding_stack_size = atoi(str) * 1024 * 1024; if (binding_stack_size > BINDING_STACK_SIZE) { fprintf(stderr, - "-binding-stack-size must be no greater than %lu MBytes.\n", + "%s must be no greater than %lu MBytes.\n", + arg, BINDING_STACK_SIZE / (1024 * 1024UL)); fprintf(stderr, " Continuing with default size.\n"); binding_stack_size = BINDING_STACK_SIZE; } - } else if (strcmp(arg, "-control-stack-size") == 0) { + } else if (match_option(arg, "control-stack-size")) { const char *str = *++argptr; if (str == NULL) { fprintf(stderr, - "-control-stack-size must be followed by the size in MBytes.\n"); + "%s must be followed by the size in MBytes.\n", + arg); exit(1); } control_stack_size = atoi(str) * 1024 * 1024; if (control_stack_size > CONTROL_STACK_SIZE) { fprintf(stderr, - "-control-stack-size must be no greater than %lu MBytes.\n", + "%s must be no greater than %lu MBytes.\n", + arg, CONTROL_STACK_SIZE / (1024 * 1024UL)); fprintf(stderr, " Continuing with default size.\n"); control_stack_size = CONTROL_STACK_SIZE; } - } else if (strcmp(arg, "-dynamic-space-size") == 0) { + } else if (match_option(arg, "dynamic-space-size")) { const char *str; str = *++argptr; if (str == NULL) { fprintf(stderr, - "-dynamic-space-size must be followed by the size to use in MBytes.\n"); + "%s must be followed by the size to use in MBytes.\n", + arg); exit(1); } #ifndef sparc @@ -669,15 +715,16 @@ main(int argc, const char *argv[], const char *envp[]) #endif if (dynamic_space_size > DYNAMIC_SPACE_SIZE) { fprintf(stderr, - "-dynamic-space-size must be no greater than %lu MBytes.\n", + "%s must be no greater than %lu MBytes.\n", + arg, DYNAMIC_SPACE_SIZE / (1024 * 1024UL)); exit(1); } - } else if (strcmp(arg, "-monitor") == 0) { + } else if (match_option(arg, "monitor")) { monitor = TRUE; - } else if (strcmp(arg, "-debug-lisp-search") == 0) { + } else if (match_option(arg, "debug-lisp-search")) { debug_lisp_search = TRUE; - } else if (strcmp(arg, "-unidata") == 0) { + } else if (match_option(arg, "unidata")) { unidata = *++argptr; } else if ((strcmp(arg, "-version") == 0) || (strcmp(arg, "--version") == 0)) { @@ -904,7 +951,7 @@ main(int argc, const char *argv[], const char *envp[]) argptr = argv; while ((arg = *++argptr) != NULL) { - if (strcmp(arg, "-batch") == 0) + if (match_option(arg, "batch")) SetSymbolValue(BATCH_MODE, T); } View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5269a666ef5ffd4e32a7d1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5269a666ef5ffd4e32a7d1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-379-gnu-style-options] Add this issue to release notes.
by Raymond Toy (＠rtoy) 15 Feb '25

15 Feb '25

Raymond Toy pushed to branch issue-379-gnu-style-options at cmucl / cmucl Commits: cbcaa957 by Raymond Toy at 2025-02-15T06:43:40-08:00 Add this issue to release notes. - - - - - 1 changed file: - src/general-info/release-21f.md Changes: ===================================== src/general-info/release-21f.md ===================================== @@ -119,6 +119,7 @@ public domain. * ~~#364~~ Add interface to `mkdtemp` and `mkstemp` * ~~#367~~ Add stream:string-count-octets to count octets in a string * ~~#369~~ Improve docstring for `unix::unix-setlocale` + * ~~#379~~ Support GNU-style command-line option names * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/cbcaa957e8332d8e003d4ed… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/cbcaa957e8332d8e003d4ed… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0