From: Khem Raj Date: Fri, 15 Mar 2024 21:34:06 +0000 (-0700) Subject: zebra: Mimic GNU basename() API for non-glibc library e.g. musl X-Git-Tag: docker/10.1.1~17^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F16642%2Fhead;p=mirror%2Ffrr.git zebra: Mimic GNU basename() API for non-glibc library e.g. musl musl only provides POSIX version of basename and it has also removed providing it via string.h header [1] which now results in compile errors with newer compilers e.g. clang-18 [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 Signed-off-by: Khem Raj (cherry picked from commit 0ef71391f0fb15039550a09c218977fa3e1abaf1) --- diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index fb326b0ddf..3ac4fdd737 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -42,6 +42,10 @@ #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 #define ZEBRA_NS_POLLING_MAX_RETRIES 200 +#if !defined(__GLIBC__) +#define basename(src) (strrchr(src, '/') ? strrchr(src, '/') + 1 : src) +#endif + DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); static struct event *zebra_netns_notify_current;