kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/in-obsd-basename-dirname-take-const' 

Portability fix.

* rs/in-obsd-basename-dirname-take-const:
  test-path-utils: handle const parameter of basename and dirname
maint
Junio C Hamano 2017-08-22 10:29:05 -07:00
parent 33e588083d 29c2eda80b
commit 6e14df9e2f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/helper/test-path-utils.c
View File

@ -38,6 +38,20 @@ struct test_data {
const char *alternative; /* output: ... or this. */ const char *alternative; /* output: ... or this. */
}; };


/*
* Compatibility wrappers for OpenBSD, whose basename(3) and dirname(3)
* have const parameters.
*/
static char *posix_basename(char *path)
{
return basename(path);
}

static char *posix_dirname(char *path)
{
return dirname(path);
}

static int test_function(struct test_data *data, char *(*func)(char *input), static int test_function(struct test_data *data, char *(*func)(char *input),
const char *funcname) const char *funcname)
{ {
@ -251,10 +265,10 @@ int cmd_main(int argc, const char **argv)
} }


if (argc == 2 && !strcmp(argv[1], "basename")) if (argc == 2 && !strcmp(argv[1], "basename"))
return test_function(basename_data, basename, argv[1]); return test_function(basename_data, posix_basename, argv[1]);


if (argc == 2 && !strcmp(argv[1], "dirname")) if (argc == 2 && !strcmp(argv[1], "dirname"))
return test_function(dirname_data, dirname, argv[1]); return test_function(dirname_data, posix_dirname, argv[1]);


fprintf(stderr, "%s: unknown function name: %s\n", argv[0], fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
argv[1] ? argv[1] : "(there was none)"); argv[1] ? argv[1] : "(there was none)");