diff options
| author | Rob Landley <rob@landley.net> | 2016-08-04 10:16:59 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-08-04 10:16:59 -0500 |
| commit | 027a73a903af306449710ce12bc09e0e3550c6c9 (patch) | |
| tree | a415cb11fa6f2b34e63b8259fc52342aaa8fec75 /toys/android | |
| parent | 145b7024b5fbb74f16d5e403fb004ff8209bc4a0 (diff) | |
| download | toybox-027a73a903af306449710ce12bc09e0e3550c6c9.tar.gz | |
Make xopen() skip stdin/stdout/stderr, add xopen_stdio() if you want stdout,
add xopenro() that takes one argument and understands "-" means stdin,
and switch over lots of users.
Diffstat (limited to 'toys/android')
| -rw-r--r-- | toys/android/load_policy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/toys/android/load_policy.c b/toys/android/load_policy.c index 84967360..d9ff1486 100644 --- a/toys/android/load_policy.c +++ b/toys/android/load_policy.c @@ -19,14 +19,13 @@ config LOAD_POLICY void load_policy_main(void) { - char *path = *toys.optargs; - int fd = xopen(path, O_RDONLY); + int fd = xopenro(*toys.optargs); off_t policy_len = fdlength(fd); char *policy_data = mmap(0, policy_len, PROT_READ, MAP_PRIVATE, fd, 0); close(fd); if (!policy_data || security_load_policy(policy_data, policy_len) < 0) - perror_exit("Couldn't %s %s", policy_data ? "load" : "read", path); + perror_exit("Couldn't %s %s", policy_data ? "load" : "read", *toys.optargs); munmap(policy_data, policy_len); } |