builtins + test helpers: use return instead of exit() in cmd_*

avar · gitster · commit 338abb0f045b · 2021-06-09T09:15:58.000+09:00
Change various cmd_* functions that claim to return an "int" to use "return" instead of exit() to indicate an exit code. These were not marked with NORETURN, and by directly exit()-ing we'll skip the cleanup git.c would otherwise do (e.g. closing fd's, erroring if we can't). See run_builtin() in git.c. In the case of shell.c and sh-i18n--envsubst.c this was the result of an incomplete migration to using a cmd_main() in 3f2e229 (add an extra level of indirection to main(), 2016-07-01). This was spotted by SunCC 12.5 on Solaris 10 (gcc210 on the gccfarm). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/difftool.c b/builtin/difftool.c
@@ -671,7 +671,7 @@ static int run_file_diff(int prompt, const char *prefix,
 		"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
 		NULL
 	};
-	int ret = 0, i;
+	int i;
 
 	if (prompt > 0)
 		env[2] = "GIT_DIFFTOOL_PROMPT=true";
@@ -682,8 +682,7 @@ static int run_file_diff(int prompt, const char *prefix,
 	strvec_push(&args, "diff");
 	for (i = 0; i < argc; i++)
 		strvec_push(&args, argv[i]);
-	ret = run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
-	exit(ret);
+	return run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
 }
 
 int cmd_difftool(int argc, const char **argv, const char *prefix)
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
@@ -28,6 +28,6 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix)
 	if (read_cache() < 0)
 		die_errno("read_cache failed");
 	if (index_differs_from(the_repository, "HEAD", NULL, 0))
-		exit(2);
-	exit(0);
+		return 2;
+	return 0;
 }
diff --git a/builtin/mktree.c b/builtin/mktree.c
@@ -189,5 +189,5 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
 		used=0; /* reset tree entry buffer for re-use in batch mode */
 	}
 	strbuf_release(&sb);
-	exit(0);
+	return 0;
 }
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
@@ -104,12 +104,12 @@ cmd_main (int argc, const char *argv[])
   if (ferror (stderr) || fflush (stderr))
     {
       fclose (stderr);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
   if (fclose (stderr) && errno != EBADF)
-    exit (EXIT_FAILURE);
+    return (EXIT_FAILURE);
 
-  exit (EXIT_SUCCESS);
+  return (EXIT_SUCCESS);
 }
 
 /* Parse the string and invoke the callback each time a $VARIABLE or
diff --git a/shell.c b/shell.c
@@ -177,7 +177,7 @@ int cmd_main(int argc, const char **argv)
 		default:
 			continue;
 		}
-		exit(cmd->exec(cmd->name, arg));
+		return cmd->exec(cmd->name, arg);
 	}
 
 	cd_to_homedir();
diff --git a/t/helper/test-hash-speed.c b/t/helper/test-hash-speed.c
@@ -57,5 +57,5 @@ int cmd__hash_speed(int ac, const char **av)
 		free(p);
 	}
 
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-hash.c b/t/helper/test-hash.c
@@ -54,5 +54,5 @@ int cmd_hash_impl(int ac, const char **av, int algo)
 		fwrite(hash, 1, algop->rawsz, stdout);
 	else
 		puts(hash_to_hex_algop(hash, algop));
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
@@ -23,5 +23,5 @@ int cmd__match_trees(int ac, const char **av)
 	shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);
 	printf("shifted: %s\n", oid_to_hex(&shifted));
 
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
@@ -166,5 +166,5 @@ int cmd__reach(int ac, const char **av)
 		print_sorted_commit_ids(list);
 	}
 
-	exit(0);
+	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ int cmd_merge_ours(int argc, const char *argv, const char prefix)`
`28`	`28`	`if (read_cache() < 0)`
`29`	`29`	`die_errno("read_cache failed");`
`30`	`30`	`if (index_differs_from(the_repository, "HEAD", NULL, 0))`
`31`		`- exit(2);`
`32`		`- exit(0);`
	`31`	`+ return 2;`
	`32`	`+ return 0;`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,5 +189,5 @@ int cmd_mktree(int ac, const char *av, const char prefix)`
`189`	`189`	`used=0; /* reset tree entry buffer for re-use in batch mode */`
`190`	`190`	`}`
`191`	`191`	`strbuf_release(&sb);`
`192`		`- exit(0);`
	`192`	`+ return 0;`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,12 @@ cmd_main (int argc, const char *argv[])`
`104`	`104`	`if (ferror (stderr) \|\| fflush (stderr))`
`105`	`105`	`{`
`106`	`106`	`fclose (stderr);`
`107`		`- exit (EXIT_FAILURE);`
	`107`	`+ return (EXIT_FAILURE);`
`108`	`108`	`}`
`109`	`109`	`if (fclose (stderr) && errno != EBADF)`
`110`		`- exit (EXIT_FAILURE);`
	`110`	`+ return (EXIT_FAILURE);`
`111`	`111`
`112`		`- exit (EXIT_SUCCESS);`
	`112`	`+ return (EXIT_SUCCESS);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/* Parse the string and invoke the callback each time a $VARIABLE or`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ int cmd_main(int argc, const char **argv)`
`177`	`177`	`default:`
`178`	`178`	`continue;`
`179`	`179`	`}`
`180`		`- exit(cmd->exec(cmd->name, arg));`
	`180`	`+ return cmd->exec(cmd->name, arg);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`cd_to_homedir();`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ int cmd__hash_speed(int ac, const char **av)`
`57`	`57`	`free(p);`
`58`	`58`	`}`
`59`	`59`
`60`		`- exit(0);`
	`60`	`+ return 0;`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,5 @@ int cmd_hash_impl(int ac, const char **av, int algo)`
`54`	`54`	`fwrite(hash, 1, algop->rawsz, stdout);`
`55`	`55`	`else`
`56`	`56`	`puts(hash_to_hex_algop(hash, algop));`
`57`		`- exit(0);`
	`57`	`+ return 0;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ int cmd__match_trees(int ac, const char **av)`
`23`	`23`	`shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);`
`24`	`24`	`printf("shifted: %s\n", oid_to_hex(&shifted));`
`25`	`25`
`26`		`- exit(0);`
	`26`	`+ return 0;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,5 +166,5 @@ int cmd__reach(int ac, const char **av)`
`166`	`166`	`print_sorted_commit_ids(list);`
`167`	`167`	`}`
`168`	`168`
`169`		`- exit(0);`
	`169`	`+ return 0;`
`170`	`170`	`}`