ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes Ie9d9a7ad,If7479bdc into mnc-dev

Browse source 
* changes:
  Fix insmod module size
  Enable property expansion for insmod
This commit is contained in:
Elliott Hughes 2015-05-13 02:45:58 +00:00 • committed by Android (Google) Code Review
commit d410a9b323
5 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/builtins.cpp
View file

@ -57,8 +57,14 @@ extern "C" int init_module(void *, unsigned long, const char *);
static int insmod(const char *filename, char *options)
{
char filename_val[PROP_VALUE_MAX];
if (expand_props(filename_val, filename, sizeof(filename_val)) == -1) {
ERROR("insmod: cannot expand '%s'\n", filename);
return -EINVAL;
}
std::string module;
if (!read_file(filename, &module)) {
if (!read_file(filename_val, &module)) {
return -1;
}

7
init/init_parser.cpp
View file

@ -382,13 +382,13 @@ static void parse_new_section(struct parse_state *state, int kw,
static void parse_config(const char *fn, const std::string& data)
{
struct parse_state state;
struct listnode import_list;
struct listnode *node;
char *args[INIT_PARSER_MAXARGS];
int nargs;
nargs = 0;
int nargs = 0;
parse_state state;
state.filename = fn;
state.line = 0;
state.ptr = strdup(data.c_str()); // TODO: fix this code!
@ -444,6 +444,7 @@ int init_parse_config_file(const char* path) {
return -1;
}
data.push_back('\n'); // TODO: fix parse_config.
parse_config(path, data);
dump_parser_state();

1
init/property_service.cpp
View file

@ -420,6 +420,7 @@ static void load_properties_from_file(const char* filename, const char* filter)
Timer t;
std::string data;
if (read_file(filename, &data)) {
data.push_back('\n');
load_properties(&data[0], filter);
}
NOTICE("(Loading properties from %s took %.2fs.)\n", filename, t.duration());

7
init/ueventd_parser.cpp
View file

@ -193,10 +193,10 @@ static void parse_line(struct parse_state *state, char **args, int nargs)
static void parse_config(const char *fn, const std::string& data)
{
struct parse_state state;
char *args[UEVENTD_PARSER_MAXARGS];
int nargs;
nargs = 0;
int nargs = 0;
parse_state state;
state.filename = fn;
state.line = 1;
state.ptr = strdup(data.c_str()); // TODO: fix this code!
@ -231,6 +231,7 @@ int ueventd_parse_config_file(const char *fn)
return -1;
}
data.push_back('\n'); // TODO: fix parse_config.
parse_config(fn, data);
dump_parser_state();
return 0;

4
init/util.cpp
View file

@ -171,9 +171,6 @@ bool read_file(const char* path, std::string* content) {
bool okay = android::base::ReadFdToString(fd, content);
TEMP_FAILURE_RETRY(close(fd));
if (okay) {
content->append("\n", 1);
}
return okay;
}
@ -475,4 +472,3 @@ std::string bytes_to_hex(const uint8_t* bytes, size_t bytes_len) {
android::base::StringAppendF(&hex, "%02x", bytes[i]);
return hex;
}