liblp: Use TMPDIR instead of P_tmpdir. (8cea6774) · Commits · e / os / android_system_core

fs_mgr/liblp/images.cpp

+6 −12

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ bool SparseBuilder::AddPartitionImage(const LpMetadataPartition& partition,
		uint64_t partition_size = ComputePartitionSize(partition);
		if (file_length > partition_size) {
		LERROR << "Image for partition '" << GetPartitionName(partition)
		<< "' is greater than its size (" << file_length << ", excepted " << partition_size
		<< "' is greater than its size (" << file_length << ", expected " << partition_size
		<< ")";
		return false;
		}
		@@ -419,25 +419,19 @@ int SparseBuilder::OpenImageFile(const std::string& file) {
		return fd;
		}

		char temp_file[PATH_MAX];
		snprintf(temp_file, sizeof(temp_file), "%s/imageXXXXXX", P_tmpdir);
		android::base::unique_fd temp_fd(mkstemp(temp_file));
		if (temp_fd < 0) {
		PERROR << "mkstemp failed";
		return -1;
		}
		if (unlink(temp_file) < 0) {
		PERROR << "unlink failed";
		TemporaryFile tf;
		if (tf.fd < 0) {
		PERROR << "make temporary file failed";
		return -1;
		}

		// We temporarily unsparse the file, rather than try to merge its chunks.
		int rv = sparse_file_write(source.get(), temp_fd, false, false, false);
		int rv = sparse_file_write(source.get(), tf.fd, false, false, false);
		if (rv) {
		LERROR << "sparse_file_write failed with code: " << rv;
		return -1;
		}
		temp_fds_.push_back(std::move(temp_fd));
		temp_fds_.push_back(android::base::unique_fd(tf.release()));
		return temp_fds_.back().get();
		}