e2ghelper: better names for variables

Author: jengelh

tools/e2ghelper.cpp

@@ -56,38 +56,45 @@ int main(int argc, char **argv) try
 		perror("pipe");
 		return EXIT_FAILURE;
 	}
-	std::unique_ptr<const char *[]> p1argv(new const char *[argc+2]);
-	const char *p2argv[4];
-	int p1argc = 0, p2argc = 0;
-	p1argv[p1argc++] = "gromox-pff2mt";
+
+	/* Arguments for subprograms */
+	std::unique_ptr<const char *[]> pff_argv(new const char *[argc+2]);
+	const char *import_argv[4];
+	int pff_argc = 0, import_argc = 0;
+	pff_argv[pff_argc++] = "gromox-pff2mt";
 	if (g_splice)
-		p1argv[p1argc++] = "-s";
+		pff_argv[pff_argc++] = "-s";
 	for (int i = 1; i < argc; ++i)
-		p1argv[p1argc++] = argv[i];
-	p1argv[p1argc] = nullptr;
-	p2argv[p2argc++] = "gromox-mt2exm";
+		pff_argv[pff_argc++] = argv[i];
+	pff_argv[pff_argc] = nullptr;
+
+	import_argv[import_argc++] = "gromox-mt2exm";
 	if (g_username != nullptr) {
-		p2argv[p2argc++] = "-u";
-		p2argv[p2argc++] = g_username;
+		import_argv[import_argc++] = "-u";
+		import_argv[import_argc++] = g_username;
 	}
-	p2argv[p2argc] = nullptr;
-	file_actions p1fa, p2fa;
+	import_argv[import_argc] = nullptr;
+
+	/* File descriptor control block */
+	file_actions pff_actions, import_actions;
 	if (pfd[0] != STDIN_FILENO) {
-		if (posix_spawn_file_actions_adddup2(&p2fa, pfd[0], STDIN_FILENO) != 0 ||
-		    posix_spawn_file_actions_addclose(&p2fa, pfd[0]) != 0 ||
-		    posix_spawn_file_actions_addclose(&p2fa, pfd[1]) != 0) {
+		if (posix_spawn_file_actions_adddup2(&import_actions, pfd[0], STDIN_FILENO) != 0 ||
+		    posix_spawn_file_actions_addclose(&import_actions, pfd[0]) != 0 ||
+		    posix_spawn_file_actions_addclose(&import_actions, pfd[1]) != 0) {
 			perror("file_actions");
 			return EXIT_FAILURE;
 		}
 	}
 	if (pfd[1] != STDOUT_FILENO) {
-		if (posix_spawn_file_actions_adddup2(&p1fa, pfd[1], STDOUT_FILENO) != 0 ||
-		    posix_spawn_file_actions_addclose(&p1fa, pfd[0]) != 0 ||
-		    posix_spawn_file_actions_addclose(&p1fa, pfd[1]) != 0) {
+		if (posix_spawn_file_actions_adddup2(&pff_actions, pfd[1], STDOUT_FILENO) != 0 ||
+		    posix_spawn_file_actions_addclose(&pff_actions, pfd[0]) != 0 ||
+		    posix_spawn_file_actions_addclose(&pff_actions, pfd[1]) != 0) {
 			perror("file_actions");
 			return EXIT_FAILURE;
 		}
 	}
+
+	/* Process spin-up */
 	struct sigaction sact{};
 	sigemptyset(&sact.sa_mask);
 	sact.sa_handler = [](int) {};
@@ -96,29 +103,31 @@ int main(int argc, char **argv) try
 		perror("sigaction");
 		return EXIT_FAILURE;
 	}
-	pid_t p1id = -1, p2id = -1;
-	auto ret = posix_spawnp(&p1id, p1argv[0], &p1fa, nullptr,
-	           const_cast<char **>(p1argv.get()), environ);
+	pid_t pff_id = -1, import_pid = -1;
+	auto ret = posix_spawnp(&pff_id, pff_argv[0], &pff_actions, nullptr,
+	           const_cast<char **>(pff_argv.get()), environ);
 	if (ret != 0) {
-		fprintf(stderr, "spawnp %s: %s\n", p1argv[0], strerror(ret));
+		fprintf(stderr, "spawnp %s: %s\n", pff_argv[0], strerror(ret));
 		return EXIT_FAILURE;
 	}
-	ret = posix_spawnp(&p2id, p2argv[0], &p2fa, nullptr,
-	      const_cast<char **>(p2argv), environ);
+	ret = posix_spawnp(&import_pid, import_argv[0], &import_actions, nullptr,
+	      const_cast<char **>(import_argv), environ);
 	if (ret != 0) {
-		fprintf(stderr, "spawnp %s: %s\n", p2argv[0], strerror(ret));
+		fprintf(stderr, "spawnp %s: %s\n", import_argv[0], strerror(ret));
 		return EXIT_FAILURE;
 	}
 	close(pfd[0]);
 	close(pfd[1]);
+
+	/* Wait for completion */
 	int status = 0;
-	if (waitpid(p1id, &status, 0) < 0) {
+	if (waitpid(pff_id, &status, 0) < 0) {
 		perror("waitpid 1");
 		return EXIT_FAILURE;
 	}
 	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
 		return EXIT_FAILURE;
-	if (waitpid(p2id, &status, 0) < 0) {
+	if (waitpid(import_pid, &status, 0) < 0) {
 		perror("waitpid 2");
 		return EXIT_FAILURE;
 	}