diff options
| author | Ken Sumrall <ksumrall@android.com> | 2011-01-18 21:59:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 21:59:27 -0800 |
| commit | a6f502683bb75e3864e8445291e559502a9edddd (patch) | |
| tree | 0e8731b639141655c60dbd6f2ad7e533ed852e7f | |
| parent | 3a16f753a694c9a0f86ea92aeeeb3ac713349f5e (diff) | |
| parent | 849bf4e088aa7d9e3ac43441aa5aeaa248ecf03e (diff) | |
| download | system_core-a6f502683bb75e3864e8445291e559502a9edddd.zip system_core-a6f502683bb75e3864e8445291e559502a9edddd.tar.gz system_core-a6f502683bb75e3864e8445291e559502a9edddd.tar.bz2 | |
am 849bf4e0: am 203bad59: Add the commands rm and rmdir to init.
* commit '849bf4e088aa7d9e3ac43441aa5aeaa248ecf03e':
Add the commands rm and rmdir to init.
| -rw-r--r-- | init/builtins.c | 10 | ||||
| -rw-r--r-- | init/init_parser.c | 2 | ||||
| -rw-r--r-- | init/keywords.h | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/init/builtins.c b/init/builtins.c index 915c5aa..490ad48 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -485,6 +485,16 @@ int do_symlink(int nargs, char **args) return symlink(args[1], args[2]); } +int do_rm(int nargs, char **args) +{ + return unlink(args[1]); +} + +int do_rmdir(int nargs, char **args) +{ + return rmdir(args[1]); +} + int do_sysclktz(int nargs, char **args) { struct timezone tz; diff --git a/init/init_parser.c b/init/init_parser.c index 00e6b9e..0898ae8 100644 --- a/init/init_parser.c +++ b/init/init_parser.c @@ -125,6 +125,8 @@ int lookup_keyword(const char *s) break; case 'r': if (!strcmp(s, "estart")) return K_restart; + if (!strcmp(s, "mdir")) return K_rmdir; + if (!strcmp(s, "m")) return K_rm; break; case 's': if (!strcmp(s, "ervice")) return K_service; diff --git a/init/keywords.h b/init/keywords.h index d15ad49..c977fd7 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -15,6 +15,8 @@ int do_import(int nargs, char **args); int do_mkdir(int nargs, char **args); int do_mount(int nargs, char **args); int do_restart(int nargs, char **args); +int do_rm(int nargs, char **args); +int do_rmdir(int nargs, char **args); int do_setkey(int nargs, char **args); int do_setprop(int nargs, char **args); int do_setrlimit(int nargs, char **args); @@ -59,6 +61,8 @@ enum { KEYWORD(oneshot, OPTION, 0, 0) KEYWORD(onrestart, OPTION, 0, 0) KEYWORD(restart, COMMAND, 1, do_restart) + KEYWORD(rm, COMMAND, 1, do_rm) + KEYWORD(rmdir, COMMAND, 1, do_rmdir) KEYWORD(service, SECTION, 0, 0) KEYWORD(setenv, OPTION, 2, 0) KEYWORD(setkey, COMMAND, 0, do_setkey) |