Deleted Added
sdiff udiff text old ( 232862 ) new ( 232974 )
full compact
libmap.c (232862) libmap.c (232974)
1/*
1/*
2 * $FreeBSD: head/libexec/rtld-elf/libmap.c 232862 2012-03-12 12:16:08Z kib $
2 * $FreeBSD: head/libexec/rtld-elf/libmap.c 232974 2012-03-14 15:39:59Z kib $
3 */
4
5#include <sys/param.h>
6#include <sys/fcntl.h>
7#include <sys/mman.h>
8#include <sys/queue.h>
9#include <sys/stat.h>
10#include <errno.h>

--- 55 unchanged lines hidden (view full) ---

66 int fd;
67
68 dbg("lm_init(\"%s\")", libmap_override);
69 TAILQ_INIT(&lmp_head);
70
71 fd = open(_PATH_LIBMAP_CONF, O_RDONLY);
72 if (fd == -1) {
73 dbg("lm_init: open(\"%s\") failed, %s", _PATH_LIBMAP_CONF,
3 */
4
5#include <sys/param.h>
6#include <sys/fcntl.h>
7#include <sys/mman.h>
8#include <sys/queue.h>
9#include <sys/stat.h>
10#include <errno.h>

--- 55 unchanged lines hidden (view full) ---

66 int fd;
67
68 dbg("lm_init(\"%s\")", libmap_override);
69 TAILQ_INIT(&lmp_head);
70
71 fd = open(_PATH_LIBMAP_CONF, O_RDONLY);
72 if (fd == -1) {
73 dbg("lm_init: open(\"%s\") failed, %s", _PATH_LIBMAP_CONF,
74 strerror(errno));
74 rtld_strerror(errno));
75 goto override;
76 }
77 if (fstat(fd, &st) == -1) {
78 close(fd);
79 dbg("lm_init: fstat(\"%s\") failed, %s", _PATH_LIBMAP_CONF,
75 goto override;
76 }
77 if (fstat(fd, &st) == -1) {
78 close(fd);
79 dbg("lm_init: fstat(\"%s\") failed, %s", _PATH_LIBMAP_CONF,
80 strerror(errno));
80 rtld_strerror(errno));
81 goto override;
82 }
83 lm_map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
84 if (lm_map == (const char *)MAP_FAILED) {
85 close(fd);
86 dbg("lm_init: mmap(\"%s\") failed, %s", _PATH_LIBMAP_CONF,
81 goto override;
82 }
83 lm_map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
84 if (lm_map == (const char *)MAP_FAILED) {
85 close(fd);
86 dbg("lm_init: mmap(\"%s\") failed, %s", _PATH_LIBMAP_CONF,
87 strerror(errno));
87 rtld_strerror(errno));
88 goto override;
89 }
90 close(fd);
91 lmc_parse(lm_map, st.st_size);
92 munmap(lm_map, st.st_size);
93
94override:
95 if (libmap_override) {

--- 283 unchanged lines hidden --- 		88 goto override;
89 }
90 close(fd);
91 lmc_parse(lm_map, st.st_size);
92 munmap(lm_map, st.st_size);
93
94override:
95 if (libmap_override) {

--- 283 unchanged lines hidden ---