From b96990a951775e4d1a0de7d8acd2ba62dcaab1e7 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Tue, 1 Sep 2015 16:46:23 +0200
Subject: add basename and dirname
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 include/libgen.h | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/string.h | 19 ++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 include/libgen.h

(limited to 'include')

diff --git a/include/libgen.h b/include/libgen.h
new file mode 100644
index 0000000..b38bc3f
--- /dev/null
+++ b/include/libgen.h
@@ -0,0 +1,61 @@
+/**
+ * slibc — Yet another C library
+ * Copyright © 2015  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _LIBGEN_H
+#define _LIBGEN_H
+#include <slibc/version.h>
+#include <slibc/features.h>
+
+
+
+/* Override GNU-specific `basename` from <string.h>. */
+#ifdef basename
+# undef basename
+#endif
+
+
+/**
+ * Get the basename of a filename, remove
+ * trailing slashes.
+ * 
+ * @param   filename  The filename, may be edited by this function.
+ * @return            The basename, it is either a substring
+ *                    of `filename` or, if `filename` is `NULL`
+ *                    or is empty, a statically allocationed string,
+ *                    so it must not freed or edited.
+ */
+char* __xpg_basename(char*)
+  __GCC_ONLY(__attribute__((warn_unused_result)));
+#define basename  __xpg_basename
+
+/**
+ * Get the dirname of a filename.
+ * 
+ * @param   filename  The filename, may be edited by this function.
+ * @return            The dirname, it is either a substring
+ *                    of `filename` or, if `filename` is `NULL`
+ *                    or does no contain a non-trailing slash,
+ *                    a statically allocationed string, so it
+ *                    must not freed or edited.
+ */
+char* dirname(char*)
+  __GCC_ONLY(__attribute__((warn_unused_result)));
+
+
+
+#endif
+
diff --git a/include/string.h b/include/string.h
index a351e8d..c988b2e 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1072,6 +1072,25 @@ char* strsep(char** restrict, const char* restrict)
   __GCC_ONLY(__attribute__((warn_unused_result, nonnull)));
 
 
+#if defined(_GNU_SOURCE) && !defined(__PORTABLE) && !defined(basename)
+/**
+ * Get the basename of a filename.
+ * 
+ * This is a GNU extension, include <libgen.h>
+ * to override it with the XPG-compliant implementation.
+ * 
+ * @param   filename  The filename.
+ * @return            The basename, it is either a substring
+ *                    of `filename` or, if `filename` is `NULL`
+ *                    or is empty, a statically allocationed string,
+ *                    so it must not freed or edited.
+ */
+char* __gnu_basename(const char*)
+  __GCC_ONLY(__attribute__((warn_unused_result)));
+# define basename  __gnu_basename
+#endif
+
+
 
 #endif
 
-- 
cgit v1.2.3-70-g09d2