diff options
Diffstat (limited to 'mysys/mf_path.c')
| -rw-r--r-- | mysys/mf_path.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mysys/mf_path.c b/mysys/mf_path.c index 00e6b2046b9..7baded9d715 100644 --- a/mysys/mf_path.c +++ b/mysys/mf_path.c @@ -29,16 +29,18 @@ static char *find_file_in_path(char *to,const char *name); own_path_name_part is concatinated to result. my_path puts result in to and returns to */ -my_string my_path(my_string to, const char *progname, - const char *own_pathname_part) +char * my_path(char * to, const char *progname, + const char *own_pathname_part) { - my_string start,end,prog; + char *start, *end, *prog; + size_t to_length; DBUG_ENTER("my_path"); start=to; /* Return this */ - if (progname && (dirname_part(to, progname) || + if (progname && (dirname_part(to, progname, &to_length) || find_file_in_path(to,progname) || - ((prog=getenv("_")) != 0 && dirname_part(to,prog)))) + ((prog=getenv("_")) != 0 && + dirname_part(to, prog, &to_length)))) { VOID(intern_filename(to,to)); if (!test_if_hard_path(to)) |