Save errno in handle_alias()

dscho · Junio C Hamano · commit 47e5c0ca2cab · 2006-06-28T03:55:36.000-07:00
git.c:main() relies on the value of errno being set by the last attempt to
execute the command. However, if something goes awry in handle_alias(),
that assumption is wrong. So restore errno before returning from
handle_alias().

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git.c b/git.c
@@ -100,7 +100,7 @@ static int split_cmdline(char *cmdline, const char ***argv)
 
 static int handle_alias(int *argcp, const char ***argv)
 {
-	int nongit = 0, ret = 0;
+	int nongit = 0, ret = 0, saved_errno = errno;
 	const char *subdir;
 
 	subdir = setup_git_directory_gently(&nongit);
@@ -138,6 +138,8 @@ static int handle_alias(int *argcp, const char ***argv)
 	if (subdir)
 		chdir(subdir);
 
+	errno = saved_errno;
+
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static int split_cmdline(char cmdline, const char **argv)`
`100`	`100`
`101`	`101`	`static int handle_alias(int argcp, const char **argv)`
`102`	`102`	`{`
`103`		`- int nongit = 0, ret = 0;`
	`103`	`+ int nongit = 0, ret = 0, saved_errno = errno;`
`104`	`104`	`const char *subdir;`
`105`	`105`
`106`	`106`	`subdir = setup_git_directory_gently(&nongit);`
`@@ -138,6 +138,8 @@ static int handle_alias(int argcp, const char **argv)`
`138`	`138`	`if (subdir)`
`139`	`139`	`chdir(subdir);`
`140`	`140`
	`141`	`+ errno = saved_errno;`
	`142`	`+`
`141`	`143`	`return ret;`
`142`	`144`	`}`
`143`	`145`