Merge "Add rename code back" (a1a42818) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.cpp

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1858,6 +1858,17 @@ static void FinalizeFile() {
	do_text_file = true;		do_text_file = true;
	} else {		} else {
	do_text_file = false;		do_text_file = false;
			// If the user has changed the suffix, we need to change the zip file name.
			std::string new_path = ds.GetPath(".zip");
			if (ds.path_ != new_path) {
			MYLOGD("Renaming zip file from %s to %s\n", ds.path_.c_str(), new_path.c_str());
			if (rename(ds.path_.c_str(), new_path.c_str())) {
			MYLOGE("rename(%s, %s): %s\n", ds.path_.c_str(), new_path.c_str(),
			strerror(errno));
			} else {
			ds.path_ = new_path;
			}
			}
	}		}
	}		}
	if (do_text_file) {		if (do_text_file) {