run-command: conditionally define locate_in_PATH()

rimrul · gitster · commit bb532b534547 · 2023-08-03T21:21:07.000-07:00
This commit doesn't change any behaviour by itself, but allows us to easily
define compat replacements for locate_in_PATH(). It prepares us for the next
commit that adds a native Windows implementation of locate_in_PATH().

Signed-off-by: Matthias Aßhauer &lt;mha1993@live.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/run-command.c b/run-command.c
@@ -170,6 +170,7 @@ int is_executable(const char *name)
 	return st.st_mode & S_IXUSR;
 }
 
+#ifndef locate_in_PATH
 /*
  * Search $PATH for a command.  This emulates the path search that
  * execvp would perform, without actually executing the command so it
@@ -218,6 +219,7 @@ static char *locate_in_PATH(const char *file)
 	strbuf_release(&buf);
 	return NULL;
 }
+#endif
 
 int exists_in_PATH(const char *command)
 {

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ int is_executable(const char *name)`
`170`	`170`	`return st.st_mode & S_IXUSR;`
`171`	`171`	`}`
`172`	`172`
	`173`	`+#ifndef locate_in_PATH`
`173`	`174`	`/*`
`174`	`175`	`* Search $PATH for a command. This emulates the path search that`
`175`	`176`	`* execvp would perform, without actually executing the command so it`
`@@ -218,6 +219,7 @@ static char locate_in_PATH(const char file)`
`218`	`219`	`strbuf_release(&buf);`
`219`	`220`	`return NULL;`
`220`	`221`	`}`
	`222`	`+#endif`
`221`	`223`
`222`	`224`	`int exists_in_PATH(const char *command)`
`223`	`225`	`{`