Merge changes from topic "logcatd-shell"
am: 0ae1272269
Change-Id: Ia437299ab7d069eafb2e35063e2b0c3b43c6543a
diff --git a/logcat/Android.bp b/logcat/Android.bp
index e472d08..61fba59 100644
--- a/logcat/Android.bp
+++ b/logcat/Android.bp
@@ -36,19 +36,13 @@
defaults: ["logcat_defaults"],
srcs: [
- "logcat_main.cpp",
"logcat.cpp",
],
}
-cc_binary {
+sh_binary {
name: "logcatd",
-
- defaults: ["logcat_defaults"],
- srcs: [
- "logcatd_main.cpp",
- "logcat.cpp",
- ],
+ src: "logcatd",
}
sh_binary {
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index dc84fd2..70ccb80 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#include "logcat.h"
-
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
@@ -1177,7 +1175,7 @@
return EXIT_SUCCESS;
}
-int RunLogcat(int argc, char** argv) {
+int main(int argc, char** argv) {
Logcat logcat;
return logcat.Run(argc, argv);
}
diff --git a/logcat/logcat.h b/logcat/logcat.h
deleted file mode 100644
index 4cc112b..0000000
--- a/logcat/logcat.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2005-2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-int RunLogcat(int argc, char** argv);
\ No newline at end of file
diff --git a/logcat/logcat_main.cpp b/logcat/logcat_main.cpp
deleted file mode 100644
index 59ab716..0000000
--- a/logcat/logcat_main.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <signal.h>
-#include <stdlib.h>
-
-#include "logcat.h"
-
-int main(int argc, char** argv) {
- signal(SIGPIPE, exit);
- return RunLogcat(argc, argv);
-}
diff --git a/logcat/logcatd b/logcat/logcatd
new file mode 100755
index 0000000..622e567
--- /dev/null
+++ b/logcat/logcatd
@@ -0,0 +1,25 @@
+#! /system/bin/sh
+
+# This is primarily meant to be used by logpersist. This script is run as an init service, which
+# first reads the 'last' logcat to persistent storage with `-L` then run logcat again without
+# `-L` to read the current logcat buffers to persistent storage.
+
+has_last="false"
+for arg in "$@"; do
+ if [ "$arg" == "-L" -o "$arg" == "--last" ]; then
+ has_last="true"
+ fi
+done
+
+if [ "$has_last" == "true" ]; then
+ logcat "$@"
+fi
+
+args_without_last=()
+for arg in "$@"; do
+ if [ "$arg" != "-L" -a "$arg" != "--last" ]; then
+ ARGS+=("$arg")
+ fi
+done
+
+exec logcat "${ARGS[@]}"
diff --git a/logcat/logcatd_main.cpp b/logcat/logcatd_main.cpp
deleted file mode 100644
index 4da933f..0000000
--- a/logcat/logcatd_main.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <string>
-#include <vector>
-
-#include "logcat.h"
-
-int main(int argc, char** argv) {
- signal(SIGPIPE, exit);
-
- // Save and detect presence of -L or --last flag
- std::vector<std::string> args;
- bool last = false;
- for (int i = 0; i < argc; ++i) {
- if (!argv[i]) continue;
- args.push_back(std::string(argv[i]));
- if (!strcmp(argv[i], "-L") || !strcmp(argv[i], "--last")) last = true;
- }
-
- // Generate argv from saved content
- std::vector<const char*> argv_hold;
- for (auto& str : args) argv_hold.push_back(str.c_str());
- argv_hold.push_back(nullptr);
-
- int ret = 0;
- if (last) {
- // Run logcat command with -L flag
- ret = RunLogcat(argv_hold.size() - 1, (char**)&argv_hold[0]);
- // Remove -L and --last flags from argument list
- for (std::vector<const char*>::iterator it = argv_hold.begin();
- it != argv_hold.end();) {
- if (!*it || (strcmp(*it, "-L") && strcmp(*it, "--last"))) {
- ++it;
- } else {
- it = argv_hold.erase(it);
- }
- }
- // fall through to re-run the command regardless of the arguments
- // passed in. For instance, we expect -h to report help stutter.
- }
-
- // Run logcat command without -L flag
- int retval = RunLogcat(argv_hold.size() - 1, (char**)&argv_hold[0]);
- if (!ret) ret = retval;
- return ret;
-}
diff --git a/logcat/logpersist b/logcat/logpersist
index c09b6b2..05b46f0 100755
--- a/logcat/logpersist
+++ b/logcat/logpersist
@@ -148,9 +148,9 @@
echo "WARNING: Can not use --size or --buffer with ${progname%.*}.stop" >&2
fi
if [ "true" = "${clear}" ]; then
- setprop ${property} "clear"
+ setprop ${property#persist.} "clear"
else
- setprop ${property} "stop"
+ setprop ${property#persist.} "stop"
fi
if [ -n "`getprop ${property#persist.}.buffer`" ]; then
setprop ${property}.buffer ""