Skip to content

Commit c568699

Browse files
authored
Merge pull request #1502 from housel/release-fixes-2023.1
Release fixes 2023.1
2 parents c504c38 + 8ae2597 commit c568699

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

sources/lib/run-time/collector.c

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ typedef intptr_t DSINT;
7979

8080
#define MISCEXTENDBY ((size_t)16384)
8181
#define MISCAVGSIZE ((size_t)32)
82-
#define MISCMAXSIZE ((size_t)65536)
8382

8483
static void report_runtime_error (char* header, char* message);
8584

sources/lib/run-time/mps-collector.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,9 @@ MMError dylan_init_memory_manager(void)
15741574
/* Create the MVFF pool for miscellaneous objects. */
15751575
/* This is also used for wrappers. */
15761576
res = mps_pool_create(&misc_pool, arena, mps_class_mvff(),
1577-
MISCEXTENDBY, MISCAVGSIZE, MISCMAXSIZE);
1577+
MISCEXTENDBY, MISCAVGSIZE,
1578+
(size_t) 16,
1579+
TRUE, TRUE, TRUE);
15781580
if (res) { init_error("create misc pool"); return(res); }
15791581

15801582
wrapper_pool = misc_pool;

sources/system/file-system/win32-file-system.dylan

+6-5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ define function %resolve-locator
8989
end
9090
elseif (path-length > $MAX_PATH)
9191
win32-file-system-error("resolve", "%s", locator)
92-
elseif (~%file-exists?(locator))
92+
elseif (~%file-exists?(locator, #t))
9393
win32-file-system-error("resolve", "%s", locator)
9494
else
9595
as(object-class(locator), copy-sequence(path-buffer, end: path-length))
@@ -99,7 +99,8 @@ end function;
9999

100100
///
101101
define function %file-exists?
102-
(file :: <microsoft-file-system-locator>) => (exists? :: <boolean>)
102+
(file :: <microsoft-file-system-locator>, follow-links? :: <boolean>)
103+
=> (exists? :: <boolean>)
103104
let file = %expand-pathname(file);
104105
if (primitive-machine-word-not-equal?
105106
(%call-c-function ("GetFileAttributesA", c-modifiers: "__stdcall")
@@ -179,7 +180,7 @@ define function %copy-file
179180
let destination = %expand-pathname(destination);
180181
// NOTE: Contrary to the documentation, CopyFile won't copy over
181182
// an existing read-only file so we need to delete it manually.
182-
if (if-exists == #"replace" & %file-exists?(destination))
183+
if (if-exists == #"replace" & %file-exists?(destination, #f))
183184
%delete-file(destination)
184185
end;
185186
unless (primitive-raw-as-boolean
@@ -211,7 +212,7 @@ define function %rename-file
211212
// the move if the target exists because MoveFileEx isn't implemented
212213
// in Windows 95. (When this code was originally written, the
213214
// documentation for MoveFileEx failed to mention that fact. Sigh)
214-
if (if-exists == #"replace" & %file-exists?(destination))
215+
if (if-exists == #"replace" & %file-exists?(destination, #f))
215216
%delete-file(destination)
216217
end;
217218
unless (primitive-raw-as-boolean
@@ -494,7 +495,7 @@ end function %delete-directory;
494495
///---*** Is there an easier way? (Look into it ...)
495496
define function %directory-empty?
496497
(directory :: <microsoft-directory-locator>) => (empty? :: <boolean>)
497-
~%file-exists?(directory)
498+
~%file-exists?(directory, #f)
498499
| block (return)
499500
%do-directory
500501
(method (directory :: <microsoft-directory-locator>, name :: <string>, type :: <file-type>)

0 commit comments

Comments
 (0)