dmbcs/guile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression in non-mmap fallback elf loader

Browse source 
* libguile/loader.c [!HAVE_SYS_MMAN_H] (map_file_contents): updated
  variables and function calls to the current names
This commit is contained in:
Mike Gran 2017-03-03 09:50:27 -08:00
commit 8dc0e8d622
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/loader.c
View file

@ -480,7 +480,7 @@ map_file_contents (int fd, size_t len, int *is_read_only)
SCM_SYSERROR; SCM_SYSERROR;
*is_read_only = 1; *is_read_only = 1;
#else #else
if (lseek (fd, 0, SEEK_START) < 0) if (lseek (fd, 0, SEEK_SET) < 0)
{ {
int errno_save = errno; int errno_save = errno;
(void) close (fd); (void) close (fd);
@ -491,15 +491,15 @@ map_file_contents (int fd, size_t len, int *is_read_only)
/* Given that we are using the read fallback, optimistically assume /* Given that we are using the read fallback, optimistically assume
that the .go files were made with 8-byte alignment. that the .go files were made with 8-byte alignment.
alignment. */ alignment. */
data = malloc (end); data = malloc (len);
if (!data) if (!data)
{ {
(void) close (fd); (void) close (fd);
scm_misc_error (FUNC_NAME, "failed to allocate ~A bytes", scm_misc_error (FUNC_NAME, "failed to allocate ~A bytes",
scm_list_1 (scm_from_size_t (end))); scm_list_1 (scm_from_size_t (len)));
} }
if (full_read (fd, data, end) != end) if (full_read (fd, data, len) != len)
{ {
int errno_save = errno; int errno_save = errno;
(void) close (fd); (void) close (fd);
@ -512,11 +512,11 @@ map_file_contents (int fd, size_t len, int *is_read_only)
/* If our optimism failed, fall back. */ /* If our optimism failed, fall back. */
{ {
unsigned alignment = sniff_elf_alignment (data, end); unsigned alignment = elf_alignment (data, len);
if (alignment != 8) if (alignment != 8)
{ {
char *copy = copy_and_align_elf_data (data, end, alignment); char *copy = copy_and_align_elf_data (data, len);
free (data); free (data);
data = copy; data = copy;
} }