From: Matthias Aßhauer <mha1993@live.de>
Date: Fri, 4 Aug 2023 04:08:42 +0000 (+0000)
Subject: run-command: conditionally define locate_in_PATH()
X-Git-Tag: v2.42.0-rc1~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb532b534547d0a6b203baaf2f3379d987f611b9;p=thirdparty%2Fgit.git

run-command: conditionally define locate_in_PATH()

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 <mha1993@live.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/run-command.c b/run-command.c
index 60c9419866..85fc150728 100644
--- 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)
 {