[Git][cmucl/cmucl][master] 2 commits: Fix #149: Call setlocale(3C) on startup

[Raymond Toy (@rtoy)]

Raymond Toy pushed to branch master at cmucl / cmucl


Commits:
33c760fa by Raymond Toy at 2022-11-03T04:47:09+00:00
Fix #149:  Call setlocale(3C) on startup

- - - - -
317a33f8 by Raymond Toy at 2022-11-03T04:47:10+00:00
Merge branch 'issue-149-add-setlocale' into 'master'

Fix #149:  Call setlocale(3C) on startup

Closes #149

See merge request cmucl/cmucl!105
- - - - -


5 changed files:

- src/code/save.lisp
- src/code/unix.lisp
- src/general-info/release-21e.md
- src/i18n/locale/cmucl-unix.pot
- src/lisp/os-common.c


Changes:

=====================================
src/code/save.lisp
=====================================
@@ -249,6 +249,10 @@
 	     (reinit)
 	     (environment-init)
 	     (dolist (f *after-save-initializations*) (funcall f))
+	     ;; Set the runtime locale
+	     (unless (zerop (unix::unix-setlocale))
+	       (warn "os_setlocale failed"))
+	     ;; Set the locale for lisp
 	     (intl::setlocale)
 	     (ext::process-command-strings process-command-line)
 	     (setf *editor-lisp-p* nil)


=====================================
src/code/unix.lisp
=====================================
@@ -2893,3 +2893,9 @@
    of the child in the parent if it works, or NIL and an error number if it
    doesn't work."
   (int-syscall ("fork")))
+
+(defun unix-setlocale ()
+  _N"Call setlocale(3c) with fixed args.  Returns 0 on success."
+  (alien:alien-funcall
+   (alien:extern-alien "os_setlocale"
+		       (function c-call:int))))


=====================================
src/general-info/release-21e.md
=====================================
@@ -61,7 +61,8 @@ public domain.
     * ~~#136~~ `ensure-directories-exist` should return the given pathspec
     * #139 `*default-external-format*` defaults to `:utf-8`
     * ~~#142~~ `(random 0)` signals incorrect error
-    * ~~#147~~ `stream-line-column` method missing for `fundamental-character-output-stream` 
+    * ~~#147~~ `stream-line-column` method missing for `fundamental-character-output-stream`
+    * ~~#149~~ Call setlocale(3C) on startup
   * Other changes:
   * Improvements to the PCL implementation of CLOS:
   * Changes to building procedure:


=====================================
src/i18n/locale/cmucl-unix.pot
=====================================
@@ -1424,3 +1424,7 @@ msgid ""
 "   doesn't work."
 msgstr ""
 
+#: src/code/unix.lisp
+msgid "Call setlocale(3c) with fixed args.  Returns 0 on success."
+msgstr ""
+


=====================================
src/lisp/os-common.c
=====================================
@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <locale.h>
 #include <math.h>
 #include <netdb.h>
 #include <pwd.h>
@@ -773,3 +774,12 @@ exit:
     
     return result;
 }
+
+int
+os_setlocale(void)
+{
+    char *result = setlocale(LC_ALL, "");
+
+    /* Return 0 if setlocale suceeded; otherwise -1. */
+    return result != NULL ? 0 : -1;
+}



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d825aa540a894949e252d778b7afd37d680247cc...317a33f8d4031fd15c854e0700b5c1be1df0900d

-- 
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d825aa540a894949e252d778b7afd37d680247cc...317a33f8d4031fd15c854e0700b5c1be1df0900d
You're receiving this email because of your account on gitlab.common-lisp.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.common-lisp.net/pipermail/cmucl-cvs/attachments/20221103/434d6b9f/attachment-0001.html>