Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl

Commits:

2 changed files:

Changes:

  • src/i18n/locale/cmucl-unix.pot
    ... ... @@ -1441,9 +1441,7 @@ msgid ""
    1441 1441
     "Generates a unique temporary file name from TEMPLATE, and creates\n"
    
    1442 1442
     "  and opens the file.  On success, the corresponding file descriptor\n"
    
    1443 1443
     "  and name of the file is returned.  Otherwise, NIL and the UNIX error\n"
    
    1444
    -"  code is returned.\n"
    
    1445
    -"\n"
    
    1446
    -"  The last six characters of the template must be \"XXXXXX\"."
    
    1444
    +"  code is returned."
    
    1447 1445
     msgstr ""
    
    1448 1446
     
    
    1449 1447
     #: src/code/unix.lisp
    

  • tests/unix.lisp
    ... ... @@ -56,18 +56,7 @@
    56 56
         (assert-false fd)
    
    57 57
         (assert-true (and (integerp errno) (plusp errno)))))
    
    58 58
     
    
    59
    -;; Darwin allows any number of X's.
    
    60
    -#-darwin
    
    61 59
     (define-test mkstemp.bad-template.2
    
    62
    -  (:tag :issues)
    
    63
    -  (multiple-value-bind (fd errno)
    
    64
    -      (unix::unix-mkstemp "test-XXXXXXX")
    
    65
    -    ;; The template has too many X's so the FD should be NIL, and a
    
    66
    -    ;; positive Unix errno value should be returned.
    
    67
    -    (assert-false fd)
    
    68
    -    (assert-true (and (integerp errno) (plusp errno)))))
    
    69
    -
    
    70
    -(define-test mkstemp.bad-template.3
    
    71 60
       (:tag :issues)
    
    72 61
       (multiple-value-bind (fd errno)
    
    73 62
           (unix::unix-mkstemp "test-XXXXXXa")
    
    ... ... @@ -123,16 +112,6 @@
    123 112
         (assert-false result)
    
    124 113
         (assert-true (and (integerp errno) (plusp errno)))))
    
    125 114
     
    
    126
    -;; Darwin allows any number of X's.
    
    127
    -#-darwin
    
    128
    -(define-test mkdtemp.bad-template.2
    
    129
    -  (:tag :issues)
    
    130
    -  (multiple-value-bind (result errno)
    
    131
    -      (unix::unix-mkdtemp "dir-XXXXXXX")
    
    132
    -    ;; Too many X's in template.
    
    133
    -    (assert-false result)
    
    134
    -    (assert-true (and (integerp errno) (plusp errno)))))
    
    135
    -
    
    136 115
     (define-test mkdtemp.bad-template.2
    
    137 116
       (:tag :issues)
    
    138 117
       (multiple-value-bind (result errno)
    
    ... ... @@ -140,4 +119,3 @@
    140 119
         ;; Template doesn't end in X's
    
    141 120
         (assert-false result)
    
    142 121
         (assert-true (and (integerp errno) (plusp errno)))))
    143
    -