summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry2018-01-02 13:50:16 -0600
committerTom Cherry2018-01-10 13:26:24 -0600
commit91094e06ce8fd47e02175a65c2ac0aa4afb4097b (patch)
tree6d57bc4f3ed0a509c22beeff1ee4b2762f9c69a7 /toolbox
parentea4c7d572750597c864b13c180ae6f9903a02c02 (diff)
downloadplatform-system-core-91094e06ce8fd47e02175a65c2ac0aa4afb4097b.tar.gz
platform-system-core-91094e06ce8fd47e02175a65c2ac0aa4afb4097b.tar.xz
platform-system-core-91094e06ce8fd47e02175a65c2ac0aa4afb4097b.zip
Reland: Add getprop to toolbox
Add a non-toybox version of getprop, so that we can interface with the new C++ PropertyInfoAreaFile class to return property context information. Bug: 36001741 Test: Compared toolbox getprop results with toybox getprop Change-Id: I4e90aa5b843cb5cfcbe85f05f23ae8e22729b26e
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/Android.bp5
-rw-r--r--toolbox/getprop.cpp127
-rw-r--r--toolbox/tools.h1
3 files changed, 133 insertions, 0 deletions
diff --git a/toolbox/Android.bp b/toolbox/Android.bp
index 02365c600..9f7fc3bd6 100644
--- a/toolbox/Android.bp
+++ b/toolbox/Android.bp
@@ -44,9 +44,11 @@ genrule {
44cc_defaults { 44cc_defaults {
45 name: "toolbox_binary_defaults", 45 name: "toolbox_binary_defaults",
46 defaults: ["toolbox_defaults"], 46 defaults: ["toolbox_defaults"],
47 cpp_std: "experimental",
47 srcs: [ 48 srcs: [
48 "toolbox.c", 49 "toolbox.c",
49 "getevent.c", 50 "getevent.c",
51 "getprop.cpp",
50 "newfs_msdos.c", 52 "newfs_msdos.c",
51 ], 53 ],
52 generated_headers: [ 54 generated_headers: [
@@ -54,12 +56,15 @@ cc_defaults {
54 ], 56 ],
55 whole_static_libs: ["libtoolbox_dd"], 57 whole_static_libs: ["libtoolbox_dd"],
56 shared_libs: [ 58 shared_libs: [
59 "libbase",
57 "libcutils", 60 "libcutils",
58 ], 61 ],
62 static_libs: ["libpropertyinfoparser"],
59 63
60 symlinks: [ 64 symlinks: [
61 "dd", 65 "dd",
62 "getevent", 66 "getevent",
67 "getprop",
63 "newfs_msdos", 68 "newfs_msdos",
64 ], 69 ],
65} 70}
diff --git a/toolbox/getprop.cpp b/toolbox/getprop.cpp
new file mode 100644
index 000000000..611e2448b
--- /dev/null
+++ b/toolbox/getprop.cpp
@@ -0,0 +1,127 @@
1//
2// Copyright (C) 2017 The Android Open Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17#include <getopt.h>
18#include <sys/system_properties.h>
19
20#include <iostream>
21#include <string>
22#include <vector>
23
24#include <android-base/properties.h>
25#include <property_info_parser/property_info_parser.h>
26
27using android::base::GetProperty;
28using android::properties::PropertyInfoAreaFile;
29
30PropertyInfoAreaFile property_info_file;
31
32void PrintAllProperties(bool print_property_context) {
33 std::vector<std::pair<std::string, std::string>> properties;
34 __system_property_foreach(
35 [](const prop_info* pi, void* cookie) {
36 __system_property_read_callback(
37 pi,
38 [](void* cookie, const char* name, const char* value, unsigned) {
39 auto properties =
40 reinterpret_cast<std::vector<std::pair<std::string, std::string>>*>(cookie);
41 properties->emplace_back(name, value);
42 },
43 cookie);
44 },
45 &properties);
46
47 std::sort(properties.begin(), properties.end());
48
49 if (print_property_context) {
50 for (auto& [name, value] : properties) {
51 const char* context = nullptr;
52 property_info_file->GetPropertyInfo(name.c_str(), &context, nullptr);
53 value = context;
54 }
55 }
56
57 for (const auto& [name, value] : properties) {
58 std::cout << "[" << name << "]: [" << value << "]" << std::endl;
59 }
60}
61
62void PrintProperty(const char* name, const char* default_value, bool print_property_context) {
63 if (print_property_context) {
64 const char* context = nullptr;
65 property_info_file->GetPropertyInfo(name, &context, nullptr);
66 std::cout << context << std::endl;
67 } else {
68 std::cout << GetProperty(name, default_value) << std::endl;
69 }
70}
71
72extern "C" int getprop_main(int argc, char** argv) {
73 bool print_property_context = false;
74
75 while (true) {
76 static const struct option long_options[] = {
77 {"help", no_argument, nullptr, 'h'},
78 {nullptr, 0, nullptr, 0},
79 };
80
81 int arg = getopt_long(argc, argv, "Z", long_options, nullptr);
82
83 if (arg == -1) {
84 break;
85 }
86
87 switch (arg) {
88 case 'h':
89 std::cout << "usage: getprop [-Z] [NAME [DEFAULT]]\n\n"
90 "Gets an Android system property, or lists them all.\n"
91 "Use -Z to return the property context instead of the property value\n"
92 << std::endl;
93 return 0;
94 case 'Z':
95 print_property_context = true;
96 break;
97 case '?':
98 return -1;
99 default:
100 std::cerr << "getprop: getopt returned invalid result: " << arg << std::endl;
101 return -1;
102 }
103 }
104
105 if (print_property_context) {
106 property_info_file.LoadDefaultPath();
107 if (!property_info_file) {
108 std::cerr << "Unable to load property info file" << std::endl;
109 return -1;
110 }
111 }
112
113 if (optind >= argc) {
114 PrintAllProperties(print_property_context);
115 return 0;
116 }
117
118 if (optind < argc - 2) {
119 std::cerr << "getprop: Max 2 arguments (see \"getprop --help\")" << std::endl;
120 return -1;
121 }
122
123 PrintProperty(argv[optind], (optind == argc - 1) ? "" : argv[optind + 1],
124 print_property_context);
125
126 return 0;
127}
diff --git a/toolbox/tools.h b/toolbox/tools.h
index 9134af367..505f5281b 100644
--- a/toolbox/tools.h
+++ b/toolbox/tools.h
@@ -1,4 +1,5 @@
1TOOL(dd) 1TOOL(dd)
2TOOL(getevent) 2TOOL(getevent)
3TOOL(getprop)
3TOOL(newfs_msdos) 4TOOL(newfs_msdos)
4TOOL(toolbox) 5TOOL(toolbox)