Re: [PATCH updated] Fallback on _NSGetExecutablePath to get the executable path if using argv[0] fails
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 29, 2010, 20:24 UTC
- Message-ID
- <7veia32803.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20101129184929.GA9441@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 23 quoted lines
>> --- 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?