Merge "Fixed and improve RunCommand() when running as root." (4ad63a9b) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -110,6 +110,9 @@ static void RunDumpsys(const std::string& title, const std::vector<std::string>&
	static int DumpFile(const std::string& title, const std::string& path) {		static int DumpFile(const std::string& title, const std::string& path) {
	return ds.DumpFile(title, path);		return ds.DumpFile(title, path);
	}		}
			bool IsUserBuild() {
			return ds.IsUserBuild();
			}

	/*		/*
	* List of supported zip format versions.		* List of supported zip format versions.
	@@ -124,7 +127,7 @@ static const std::string ZIP_ROOT_DIR = "FS";
	static constexpr char PROPERTY_EXTRA_OPTIONS[] = "dumpstate.options";		static constexpr char PROPERTY_EXTRA_OPTIONS[] = "dumpstate.options";
	static constexpr char PROPERTY_LAST_ID[] = "dumpstate.last_id";		static constexpr char PROPERTY_LAST_ID[] = "dumpstate.last_id";

	bool is_user_build() {		bool Dumpstate::IsUserBuild() {
	return "user" == buildType;		return "user" == buildType;
	}		}

	@@ -381,7 +384,7 @@ static void dump_systrace() {
	}		}

	static void dump_raft() {		static void dump_raft() {
	if (is_user_build()) {		if (IsUserBuild()) {
	return;		return;
	}		}

	@@ -1103,7 +1106,7 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver
	// root can run on user builds.		// root can run on user builds.
	CommandOptions::CommandOptionsBuilder options =		CommandOptions::CommandOptionsBuilder options =
	CommandOptions::WithTimeout(rilDumpstateTimeout);		CommandOptions::WithTimeout(rilDumpstateTimeout);
	if (!is_user_build()) {		if (!IsUserBuild()) {
	options.AsRoot();		options.AsRoot();
	}		}
	RunCommand("DUMP VENDOR RIL LOGS", {"vril-dump"}, options.Build());		RunCommand("DUMP VENDOR RIL LOGS", {"vril-dump"}, options.Build());
	@@ -1244,7 +1247,7 @@ static bool finish_zip_file(const std::string& bugreport_name, const std::string
	return false;		return false;
	}		}

	if (is_user_build()) {		if (IsUserBuild()) {
	MYLOGD("Removing temporary file %s\n", bugreport_path.c_str())		MYLOGD("Removing temporary file %s\n", bugreport_path.c_str())
	if (remove(bugreport_path.c_str())) {		if (remove(bugreport_path.c_str())) {
	ALOGW("remove(%s): %s\n", bugreport_path.c_str(), strerror(errno));		ALOGW("remove(%s): %s\n", bugreport_path.c_str(), strerror(errno));
	@@ -1610,7 +1613,7 @@ int main(int argc, char *argv[]) {
	add_dir(RECOVERY_DIR, true);		add_dir(RECOVERY_DIR, true);
	add_dir(RECOVERY_DATA_DIR, true);		add_dir(RECOVERY_DATA_DIR, true);
	add_dir(LOGPERSIST_DATA_DIR, false);		add_dir(LOGPERSIST_DATA_DIR, false);
	if (!is_user_build()) {		if (!IsUserBuild()) {
	add_dir(PROFILE_DATA_DIR_CUR, true);		add_dir(PROFILE_DATA_DIR_CUR, true);
	add_dir(PROFILE_DATA_DIR_REF, true);		add_dir(PROFILE_DATA_DIR_REF, true);
	}		}

cmds/dumpstate/dumpstate.h

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -214,6 +214,11 @@ class Dumpstate {
	*/		*/
	bool IsDryRun();		bool IsDryRun();

			/*
			* Gets whether device is running a `user` build.
			*/
			bool IsUserBuild();

	/*		/*
	* Forks a command, waits for it to finish, and returns its status.		* Forks a command, waits for it to finish, and returns its status.
	*		*

cmds/dumpstate/utils.cpp

+15 −11

Original line number	Original line	Diff line number	Diff line
	@@ -772,28 +772,26 @@ int Dumpstate::RunCommand(const std::string& title, const std::vector<std::strin
	MYLOGE("No arguments on command '%s'\n", title.c_str());		MYLOGE("No arguments on command '%s'\n", title.c_str());
	return -1;		return -1;
	}		}
	DurationReporter durationReporter(title);

	int size = fullCommand.size() + 1; // null terminated		int size = fullCommand.size() + 1; // null terminated
			int startingIndex = 0;
	if (options.RootMode() == SU_ROOT) {		if (options.RootMode() == SU_ROOT) {
	size += 2; // "su" "root"		startingIndex = 2; // "su" "root"
			size += startingIndex;
	}		}

	const char* args[size];		std::vector<const char*> args;
			args.resize(size);
	if (!title.empty()) {
	printf("------ %s (", title.c_str());
	}

	std::string commandString;		std::string commandString;
	int i = 0;
	if (options.RootMode() == SU_ROOT) {		if (options.RootMode() == SU_ROOT) {
	args[0] = SU_PATH;		args[0] = SU_PATH;
	commandString += SU_PATH;		commandString += SU_PATH;
	args[1] = "root";		args[1] = "root";
	commandString += " root ";		commandString += " root ";
	}		}
	for (auto arg = fullCommand.begin(); arg < fullCommand.end(); arg++) {		int i = startingIndex;
			for (auto arg = fullCommand.begin(); arg != fullCommand.end(); ++arg) {
	args[i++] = arg->c_str();		args[i++] = arg->c_str();
	commandString += arg->c_str();		commandString += arg->c_str();
	if (arg != fullCommand.end() - 1) {		if (arg != fullCommand.end() - 1) {
	@@ -804,11 +802,17 @@ int Dumpstate::RunCommand(const std::string& title, const std::vector<std::strin
	const char* path = args[0];		const char* path = args[0];
	const char* command = commandString.c_str();		const char* command = commandString.c_str();

			if (options.RootMode() == SU_ROOT && ds.IsUserBuild()) {
			printf("Skipping '%s' on user build.\n", command);
			return 0;
			}

	if (!title.empty()) {		if (!title.empty()) {
	printf("%s) ------\n", command);		printf("------ %s (%s) ------\n", title.c_str(), command);
	}		}

	fflush(stdout);		fflush(stdout);
			DurationReporter durationReporter(title);

	const std::string& loggingMessage = options.LoggingMessage();		const std::string& loggingMessage = options.LoggingMessage();
	if (!loggingMessage.empty()) {		if (!loggingMessage.empty()) {
	@@ -861,7 +865,7 @@ int Dumpstate::RunCommand(const std::string& title, const std::vector<std::strin
	sigact.sa_handler = SIG_IGN;		sigact.sa_handler = SIG_IGN;
	sigaction(SIGPIPE, &sigact, NULL);		sigaction(SIGPIPE, &sigact, NULL);

	execvp(path, (char**)args);		execvp(path, (char**)args.data());
	// execvp's result will be handled after waitpid_with_timeout() below, but		// execvp's result will be handled after waitpid_with_timeout() below, but
	// if it failed, it's safer to exit dumpstate.		// if it failed, it's safer to exit dumpstate.
	MYLOGD("execvp on command '%s' failed (error: %s)\n", command, strerror(errno));		MYLOGD("execvp on command '%s' failed (error: %s)\n", command, strerror(errno));