[igt-dev] [PATCH i-g-t] Replaced get_current_dir_name() with getcwd() for BSD compatibility

[Jake Freeland]

The get_current_dir_name() function is a GNU C extension that copies
the current directory's absolute path into a memory allocated buffer.
This patch replaces get_current_dir_name() with a POSIX compliant
getcwd() that performs the same action.

On Wed, Sep 28, 2022 at 7:40 AM Kamil Konieczny <
kamil.konieczny at linux.intel.com> wrote:

> Hi Jake,
>
> please put here shot commit description, the patch itself
> looks good.
>
> Regrads,
> Kamil
>
> On 2022-09-18 at 17:39:55 -0500, Jake Freeland wrote:
> > Signed-off-by: Jake Freeland <jfree at freebsd.org>
> > ---
> >  tests/tools_test.c                  | 6 +++---
> >  tools/i915-perf/i915_perf_control.c | 2 +-
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/tests/tools_test.c b/tests/tools_test.c
> > index 89a19d11..d0684d57 100644
> > --- a/tests/tools_test.c
> > +++ b/tests/tools_test.c
> > @@ -69,7 +69,7 @@ static bool chdir_to_tools_dir(void)
> >       char path[PATH_MAX];
> >       char *cwd;
> >
> > -     cwd = get_current_dir_name();
> > +     cwd = getcwd(NULL, 0);
> >       igt_info("Current working directory: %s\n", cwd);
> >       free(cwd);
> >
> > @@ -87,7 +87,7 @@ static bool chdir_to_tools_dir(void)
> >               chdir(dirname(path));
> >       }
> >
> > -     cwd = get_current_dir_name();
> > +     cwd = getcwd(NULL, 0);
> >       igt_info("Current working directory: %s\n", cwd);
> >       free(cwd);
> >
> > @@ -103,7 +103,7 @@ igt_main
> >
> >               igt_require_f(chdir_to_tools_dir(),
> >                             "Unable to determine the tools directory,
> expecting them in $cwd/" TOOLS " or $path/" TOOLS "\n");
> > -             path = get_current_dir_name();
> > +             path = getcwd(NULL, 0);
> >               igt_info("Using tools from %s\n", path);
> >               free(path);
> >       }
> > diff --git a/tools/i915-perf/i915_perf_control.c
> b/tools/i915-perf/i915_perf_control.c
> > index be5996c0..f7db2f5c 100644
> > --- a/tools/i915-perf/i915_perf_control.c
> > +++ b/tools/i915-perf/i915_perf_control.c
> > @@ -102,7 +102,7 @@ main(int argc, char *argv[])
> >
> >                       fwrite(data, total_len, 1, command_fifo_file);
> >               } else {
> > -                     char *cwd = get_current_dir_name();
> > +                     char *cwd = getcwd(NULL, 0);
> >                       uint32_t path_len = strlen(cwd) + 1 +
> strlen(dump_file) + 1;
> >                       uint32_t total_len = sizeof(struct
> recorder_command_base) + path_len;
> >                       struct {
> > --
> > 2.37.3
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/igt-dev/attachments/20220928/7b15b631/attachment.htm>