projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ujail: fixup code style: "func()" -> "func(void)"
[project/procd.git]
/
jail
/
elf.c
diff --git
a/jail/elf.c
b/jail/elf.c
index
5e22606
..
c3a392c
100644
(file)
--- a/
jail/elf.c
+++ b/
jail/elf.c
@@
-22,6
+22,7
@@
#include <libgen.h>
#include <glob.h>
#include <elf.h>
#include <libgen.h>
#include <glob.h>
#include <elf.h>
+#include <linux/limits.h>
#include <libubox/utils.h>
#include <libubox/utils.h>
@@
-31,7
+32,7
@@
struct avl_tree libraries;
static LIST_HEAD(library_paths);
struct avl_tree libraries;
static LIST_HEAD(library_paths);
-void alloc_library_path(const char *path)
+
static
void alloc_library_path(const char *path)
{
struct stat s;
if (stat(path, &s))
{
struct stat s;
if (stat(path, &s))
@@
-72,7
+73,7
@@
static void alloc_library(const char *path, const char *name)
static int elf_open(char **dir, const char *file)
{
struct library_path *p;
static int elf_open(char **dir, const char *file)
{
struct library_path *p;
- char path[
256
];
+ char path[
PATH_MAX
];
int fd = -1;
*dir = NULL;
int fd = -1;
*dir = NULL;
@@
-98,7
+99,7
@@
static int elf_open(char **dir, const char *file)
const char* find_lib(const char *file)
{
struct library *l;
const char* find_lib(const char *file)
{
struct library *l;
- static char path[
256
];
+ static char path[
PATH_MAX
];
const char *p;
l = avl_find_element(&libraries, file, l, avl);
const char *p;
l = avl_find_element(&libraries, file, l, avl);
@@
-310,10
+311,10
@@
err_out:
return ret;
}
return ret;
}
-void load_ldso_conf(const char *conf)
+
static
void load_ldso_conf(const char *conf)
{
FILE* fp = fopen(conf, "r");
{
FILE* fp = fopen(conf, "r");
- char line[
256
];
+ char line[
PATH_MAX
];
if (!fp) {
DEBUG("failed to open %s\n", conf);
if (!fp) {
DEBUG("failed to open %s\n", conf);
@@
-323,7
+324,7
@@
void load_ldso_conf(const char *conf)
while (!feof(fp)) {
int len;
while (!feof(fp)) {
int len;
- if (!fgets(line,
256
, fp))
+ if (!fgets(line,
sizeof(line)
, fp))
break;
len = strlen(line);
if (len < 2)
break;
len = strlen(line);
if (len < 2)
@@
-355,3
+356,12
@@
void load_ldso_conf(const char *conf)
fclose(fp);
}
fclose(fp);
}
+
+void init_library_search(void)
+{
+ avl_init(&libraries, avl_strcmp, false, NULL);
+ alloc_library_path("/lib");
+ alloc_library_path("/lib64");
+ alloc_library_path("/usr/lib");
+ load_ldso_conf("/etc/ld.so.conf");
+}