2 files changed, 6 insertions, 9 deletions
diff --git a/toys/android/getprop.c b/toys/android/getprop.c
index 390cb985..51e73444 100644
--- a/toys/android/getprop.c
+++ b/toys/android/getprop.c
@@ -39,13 +39,8 @@ static char *get_property_context(char *property)
   return context;
 }
 
-static void add_property(const prop_info *pi, void *unused)
+static void read_callback(void *unused, const char *name, const char *value)
 {
-  char name[PROP_NAME_MAX];
-  char value[PROP_VALUE_MAX];
-
-  __system_property_read(pi, name, value);
-
   if (!(TT.size&31)) TT.nv = xrealloc(TT.nv, (TT.size+32)*2*sizeof(char *));
 
   TT.nv[2*TT.size] = xstrdup(name);
@@ -56,6 +51,11 @@ static void add_property(const prop_info *pi, void *unused)
   }
 }
 
+static void add_property(const prop_info *pi, void *unused)
+{
+  __system_property_read_callback(pi, read_callback, NULL);
+}
+
 // Needed to supress extraneous "Loaded property_contexts from" message
 static int selinux_log_callback_local(int type, const char *fmt, ...)
 {
diff --git a/toys/android/setprop.c b/toys/android/setprop.c
index 2af314aa..c1356156 100644
--- a/toys/android/setprop.c
+++ b/toys/android/setprop.c
@@ -29,9 +29,6 @@ void setprop_main(void)
   // recognize most failures (because it doesn't wait for init), so
   // we duplicate all of init's checks here to help the user.
 
-  if (name_len >= PROP_NAME_MAX)
-    error_exit("name '%s' too long; try '%.*s'",
-               name, PROP_NAME_MAX - 1, name);
   if (value_len >= PROP_VALUE_MAX)
     error_exit("value '%s' too long; try '%.*s'",
                value, PROP_VALUE_MAX - 1, value);