On Nov 29, 2010, at 15:24, Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
>
>>> --- a/exec_cmd.c
>>> +++ b/exec_cmd.c
>> [...]
>>> @@ -53,6 +57,19 @@ const char *git_extract_argv0_path(const char *argv0)
>>> if (slash >= argv0) {
>>> argv0_path = xstrndup(argv0, slash - argv0);
>>> return slash + 1;
>>> +#if defined(__APPLE__)
>>> + } else {
>>> + char new_argv0[PATH_MAX];
>>> + uint32_t new_argv0_s = PATH_MAX;
>>> + if(_NSGetExecutablePath(new_argv0, &new_argv0_s) == 0) {
>>> + slash = new_argv0 + strlen(new_argv0);
>>> + while (new_argv0 <= slash && !is_dir_sep(*slash))
>>> + slash--;
>>> +
>>> + if (slash >= new_argv0)
>>> + argv0_path = xstrndup(new_argv0, slash - new_argv0);
>>> + }
>>> +#endif
>>
>> Can't this ifdef be avoided? The ideal is for such code to be
>> abstracted away into helper functions in git-compat-util.h and compat/*.c.
>
> I had exactly the same reaction. Also doesn't the above need to be
> protected by defined(RUNTIME_PREFIX), too?
It already is inside of an #ifdef RUNTIME_PREFIX block.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html