diff options
-rw-r--r-- | Android.mk | 5 | ||||
-rw-r--r-- | prop.c | 68 | ||||
-rw-r--r-- | recovery.c | 2 | ||||
-rw-r--r-- | setprop.c | 18 |
4 files changed, 73 insertions, 20 deletions
@@ -14,9 +14,10 @@ LOCAL_SRC_FILES := \ extendedcommands.c \ nandroid.c \ ../../system/core/toolbox/reboot.c \ + ../../system/core/toolbox/dynarray.c \ firmware.c \ edifyscripting.c \ - setprop.c \ + prop.c \ default_recovery_ui.c \ adb_install.c \ verifier.c @@ -105,7 +106,7 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils include $(BUILD_EXECUTABLE) -RECOVERY_LINKS := bu make_ext4fs edify busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot volume setprop dedupe minizip +RECOVERY_LINKS := bu make_ext4fs edify busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot volume setprop getprop dedupe minizip # nc is provided by external/netcat RECOVERY_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(RECOVERY_LINKS)) @@ -0,0 +1,68 @@ +#include <stdio.h> + +#include <cutils/properties.h> +#include <sys/system_properties.h> +#include "../../system/core/toolbox/dynarray.h" + +int setprop_main(int argc, char *argv[]) +{ + if(argc != 3) { + fprintf(stderr,"usage: setprop <key> <value>\n"); + return 1; + } + + if(property_set(argv[1], argv[2])){ + fprintf(stderr,"could not set property\n"); + return 1; + } + + return 0; +} + +static void record_prop(const char* key, const char* name, void* opaque) +{ + strlist_t* list = opaque; + char temp[PROP_VALUE_MAX + PROP_NAME_MAX + 16]; + snprintf(temp, sizeof temp, "[%s]: [%s]", key, name); + strlist_append_dup(list, temp); +} + +static void list_properties(void) +{ + strlist_t list[1] = { STRLIST_INITIALIZER }; + + /* Record properties in the string list */ + (void)property_list(record_prop, list); + + /* Sort everything */ + strlist_sort(list); + + /* print everything */ + STRLIST_FOREACH(list, str, printf("%s\n", str)); + + /* voila */ + strlist_done(list); +} + +int __system_property_wait(prop_info *pi); + +int getprop_main(int argc, char *argv[]) +{ + int n = 0; + + if (argc == 1) { + list_properties(); + } else { + char value[PROPERTY_VALUE_MAX]; + char *default_value; + if(argc > 2) { + default_value = argv[2]; + } else { + default_value = ""; + } + + property_get(argv[1], value, default_value); + printf("%s\n", value); + } + return 0; +} @@ -835,6 +835,8 @@ main(int argc, char **argv) { } if (strstr(argv[0], "setprop")) return setprop_main(argc, argv); + if (strstr(argv[0], "getprop")) + return getprop_main(argc, argv); return busybox_driver(argc, argv); } __system("/sbin/postrecoveryboot.sh"); diff --git a/setprop.c b/setprop.c deleted file mode 100644 index 63ad2b4..0000000 --- a/setprop.c +++ /dev/null @@ -1,18 +0,0 @@ -#include <stdio.h> - -#include <cutils/properties.h> - -int setprop_main(int argc, char *argv[]) -{ - if(argc != 3) { - fprintf(stderr,"usage: setprop <key> <value>\n"); - return 1; - } - - if(property_set(argv[1], argv[2])){ - fprintf(stderr,"could not set property\n"); - return 1; - } - - return 0; -} |