[Git][cmucl/cmucl][issue-141-locale] 16 commits: Fix #132: Ansi test RENAME-FILE.1 fails

Raymond Toy (@rtoy) gitlab at common-lisp.net
Sun Oct 30 18:56:21 UTC 2022



Raymond Toy pushed to branch issue-141-locale at cmucl / cmucl


Commits:
cdd7d328 by Raymond Toy at 2022-10-15T14:39:32+00:00
Fix #132: Ansi test RENAME-FILE.1 fails

- - - - -
e0e9f62d by Raymond Toy at 2022-10-15T14:39:35+00:00
Merge branch 'issue-132-ansi-test-rename-files' into 'master'

Fix #132: Ansi test RENAME-FILE.1 fails

Closes #132

See merge request cmucl/cmucl!90
- - - - -
a05277c7 by Raymond Toy at 2022-10-15T20:53:20+00:00
Fix #134: Handle the case of (expt complex complex-rational)

- - - - -
4dacd5ac by Raymond Toy at 2022-10-15T20:53:20+00:00
Merge branch 'issue-134-expt-bug' into 'master'

Fix #134: Handle the case of (expt complex complex-rational)

Closes #134

See merge request cmucl/cmucl!91
- - - - -
8719b21c by Raymond Toy at 2022-10-15T23:27:33+00:00
Fix #146:  CI passes incorrectly

- - - - -
9c0f63ff by Raymond Toy at 2022-10-15T23:27:34+00:00
Merge branch 'issue-146-ci-passes-incorrectly' into 'master'

Fix #146:  CI passes incorrectly

Closes #146

See merge request cmucl/cmucl!100
- - - - -
cde14045 by Raymond Toy at 2022-10-16T14:26:39+00:00
Fix #142: (random 0) signals incorrect error

- - - - -
4c9cbf43 by Raymond Toy at 2022-10-16T14:26:41+00:00
Merge branch 'issue-142-random-0-wrong-error' into 'master'

Fix #142: (random 0) signals incorrect error

Closes #142

See merge request cmucl/cmucl!99
- - - - -
b59185fc by Raymond Toy at 2022-10-16T14:27:39+00:00
Fix #136: ensure-directories-exist should return the given pathspec

- - - - -
49ecc858 by Raymond Toy at 2022-10-16T14:27:39+00:00
Merge branch 'issue-136-ansi-test-ensure-directories-exist.8' into 'master'

Fix #136: ensure-directories-exist should return the given pathspec

Closes #136

See merge request cmucl/cmucl!92
- - - - -
08e5370a by Raymond Toy at 2022-10-16T07:33:23-07:00
Update release notes based on recent merges

Forgot to update the release notes with recent merges that fixed a few
issues.  Hence update the notes now.

Also testing see if we need to add a strikeout for closed issues, so
didn't add strikeout for these.

- - - - -
556b1a5b by Raymond Toy at 2022-10-16T07:35:57-07:00
Add strikeout for closed issues

Nope, gitlab doesn't mark closed issues in anyway, unlike Trac that
would automatically strikeout references to closed issues.  We have to
do it ourselves.

- - - - -
95b4fc5c by Raymond Toy at 2022-10-16T13:05:09-07:00
Fix #146: CI passes incorrectly

We forgot to update the script for macos to use separate `grep`
commands like we did for linux.

- - - - -
4a7207b6 by Raymond Toy at 2022-10-17T18:58:45+00:00
Fix #130:  Implement file_author in C

- - - - -
ba5c5d2a by Raymond Toy at 2022-10-17T18:58:45+00:00
Merge branch 'issue-130-file-author-in-c' into 'master'

Fix #130:  Implement file_author in C

Closes #130

See merge request cmucl/cmucl!88
- - - - -
6e975c79 by Raymond Toy at 2022-10-30T11:55:47-07:00
Merge branch 'master' into issue-141-locale

- - - - -


5 changed files:

- .gitlab-ci.yml
- src/code/filesys.lisp
- src/lisp/os-common.c
- tests/issues.lisp
- + tests/안녕하십니까.txt


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -167,7 +167,8 @@ osx:ansi-test:
   script:
     - cd ansi-test
     - make LISP="../dist/bin/lisp -batch -noinit -nositeinit"
-    - grep 'No unexpected \(successes\|failures\)' test.out 
+    # There should be no unexpected successes or failures; check these separately.
+    - grep -a 'No unexpected successes' test.out && grep -a 'No unexpected failures' test.out
   
 osx:benchmark:
   stage: benchmark


=====================================
src/code/filesys.lisp
=====================================
@@ -1079,13 +1079,21 @@ optionally keeping some of the most recent old versions."
 		 :pathname file
 		 :format-control (intl:gettext "~S doesn't exist.")
 		 :format-arguments (list file)))
-	(multiple-value-bind (winp dev ino mode nlink uid)
-			     (unix:unix-stat name)
-	  (declare (ignore dev ino mode nlink))
-	  (when winp
-            (let ((user-info (unix:unix-getpwuid uid)))
-              (when user-info
-                (unix:user-info-name user-info))))))))
+	;; unix-namestring converts "." to "".  Convert it back to
+	;; "." so we can stat the current directory.  (Perhaps
+	;; that's a bug in unix-namestring?)
+	(when (zerop (length name))
+	  (setf name "."))
+	(let (author)
+	  (unwind-protect
+	       (progn
+		 (setf author (alien:alien-funcall
+			       (alien:extern-alien "os_file_author"
+						   (function (alien:* c-call:c-string) c-call:c-string))
+			       (unix::%name->file name)))
+		 (unless (alien:null-alien author)
+		   (alien:cast author c-call:c-string)))
+	    (alien:free-alien author))))))
 
 
 ;;;; DIRECTORY.


=====================================
src/lisp/os-common.c
=====================================
@@ -5,12 +5,16 @@
 
 */
 
+#include <assert.h>
 #include <errno.h>
 #include <math.h>
 #include <netdb.h>
+#include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <time.h>
 
 #include "os.h"
@@ -715,3 +719,57 @@ os_lstat(const char* path, u_int64_t *dev, u_int64_t *ino, unsigned int *mode, u
 
     return rc;
 }
+
+/*
+ * Interface for file-author.  Given a pathname, returns a new string
+ * holding the author of the file or NULL if some error occurred.  The
+ * caller is responsible for freeing the memory used by the string.
+ */
+char *
+os_file_author(const char *path)
+{
+    struct stat sb;
+    char initial[1024];
+    char *buffer, *obuffer;
+    size_t size;
+    struct passwd pwd;
+    struct passwd *ppwd;
+    char *result;
+
+    if (stat(path, &sb) != 0) {
+        return NULL;
+    }
+
+    result = NULL;
+    buffer = initial;
+    obuffer = NULL;
+    size = sizeof(initial) / sizeof(initial[0]);
+
+    /*
+     * Keep trying with larger buffers until a maximum is reached.  We
+     * assume (1 << 20) is large enough for any OS.
+     */
+    while (size <= (1 << 20)) {
+        switch (getpwuid_r(sb.st_uid, &pwd, buffer, size, &ppwd)) {
+          case 0:
+              /* Success, though we might not have a matching entry */
+              result = (ppwd == NULL) ? NULL : strdup(pwd.pw_name);
+              goto exit;
+          case ERANGE:
+              /* Buffer is too small, double its size and try again */
+              size *= 2;
+              obuffer = (buffer == initial) ? NULL : buffer;
+              if ((buffer = realloc(obuffer, size)) == NULL) {
+                  goto exit;
+              }
+              continue;
+          default:
+              /* All other errors */
+              goto exit;
+        }
+    }
+exit:
+    free(obuffer);
+    
+    return result;
+}


=====================================
tests/issues.lisp
=====================================
@@ -670,3 +670,10 @@
 		 (err (relerr value answer)))
 	    (assert-true (<= err eps) base err eps)))))))
 
+(define-test issue.130
+    (:tag :issues)
+  ;; Just verify that file-author works.  In particular "." should
+  ;; work and not return NIL.
+  (assert-true (file-author "."))
+  (assert-true (file-author "bin/build.sh"))
+  (assert-true (file-author "tests/안녕하십니까.txt")))


=====================================
tests/안녕하십니까.txt
=====================================
@@ -0,0 +1,3 @@
+The file name of this file is "안녕하십니까.txt" ("Hello" in Korean.)
+
+



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/82ac3a68ea524768d6009675512cecf956e4fb6d...6e975c79c794bb61d18fa0bafdf04cdca674a317

-- 
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/82ac3a68ea524768d6009675512cecf956e4fb6d...6e975c79c794bb61d18fa0bafdf04cdca674a317
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/20221030/7b1a4b9f/attachment-0001.html>


More information about the cmucl-cvs mailing list