GitLab

at 2022-11-14T05:09:37+00:00

Fix #141: Use setlocale to handle localization settings

Merge branch 'issue-141-locale' into 'master'

Fix #141: Use setlocale to handle localization settings

Closes #141, #136, #142, #146, #134, and #132

See merge request cmucl/cmucl!101

 (defun setlocale (&optional locale)

   (setf *locale* (or locale

-		     (getenv "LANGUAGE")

-		     (getenv "LC_ALL")

-		     (getenv "LC_MESSAGES")

-		     (getenv "LANG")

+		     (unix::unix-get-lc-messages)

 		     *locale*)))

 (defmacro textdomain (domain)

   (alien:alien-funcall

    (alien:extern-alien "os_setlocale"

 		       (function c-call:int))))

+

+(defun unix-get-lc-messages ()

+  _N"Get LC_MESSAGES from the current locale.  If we can't, return

+  NIL.  A call to UNIX-SETLOCALE must have been done previously before

+  calling this so that the correct locale is returned."

+  (with-alien ((buf (array c-call:char 256)))

+    (let ((result

+	    (alien-funcall

+	     (extern-alien "os_get_lc_messages"

+			   (function c-call:int

+				     (* c-call:char)

+				     c-call:int))

+	     (cast buf (* c-call:char))

+	     256)))

+      (when (zerop result)

+	(cast buf c-call:c-string)))))
     * ~~#134~~ Handle the case of `(expt complex complex-rational)`

     * ~~#136~~ `ensure-directories-exist` should return the given pathspec

     * #139 `*default-external-format*` defaults to `:utf-8`

+    * ~~#141~~ Disallow locales that are pathnames to a localedef file

     * ~~#142~~ `(random 0)` signals incorrect error

     * ~~#147~~ `stream-line-column` method missing for `fundamental-character-output-stream`

     * ~~#149~~ Call setlocale(3C) on startup

 msgid "Call setlocale(3c) with fixed args.  Returns 0 on success."

 msgstr ""

+#: src/code/unix.lisp

+msgid ""

+"Get LC_MESSAGES from the current locale.  If we can't, return\n"

+"  NIL.  A call to UNIX-SETLOCALE must have been done previously before\n"

+"  calling this so that the correct locale is returned."

+msgstr ""

+
     /* Return 0 if setlocale suceeded; otherwise -1. */

     return result != NULL ? 0 : -1;

 }

+

+int

+os_get_lc_messages(char *buf, int len)

+{

+    char *locale = setlocale(LC_MESSAGES, NULL);

+    if (locale) {

+        strncpy(buf, locale, len - 1);

+        buf[len - 1] = '\0';

+    }

+

+    /* Return -1 if setlocale failed. */

+    return locale ? 0 : -1;

+}

Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

5 changed files:

Changes: