add basename and dirname

Signed-off-by: Mattias Andrée <maandree@operamail.com>

4 files changed, 185 insertions, 1 deletions

diff --git a/TODO b/TODO
index 7aa53e2..df35127 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
 functions to lock and unlock pages  (3.4.3 p76)
 character class determination for wide characters  (4.3 p82)
 collation functions  (5.6 p109)
-finding tokens in a string  (5.8 p119)
 strfry  (5.9  p124)
 trivial encryption  (5.10 p124)
 encdoe binary data  (5.11 p125)
@@ -19,3 +18,6 @@ input/output overview  (15 p429)
 debugging support  (16 p435)
 input/output on streams  (17 p439)
 
+add strstarts, strends, wcsstarts, wcsends as
+  faster specialised alternatives to strstr.
+
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
 
diff --git a/src/libgen.c b/src/libgen.c
new file mode 100644
index 0000000..f8c338b
--- /dev/null
+++ b/src/libgen.c
@@ -0,0 +1,102 @@
+/**
+ * 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/>.
+ */
+#include <string.h>
+#include <libgen.h>
+#include <stddef.h>
+
+
+
+/**
+ * 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* filename)
+{
+  char* r = filename;
+  char last = '/';
+  if (filename == NULL)
+    return ".";
+  while (*filename)
+    {
+      if ((*filename != '/') && (last == '/'))
+	r = filename;
+      last = *filename++;
+    }
+  return r;
+}
+
+
+/**
+ * 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* filename)
+{
+  char* r = __gnu_basename(filename);
+  char* p;
+  if (strcmp("."))
+    for (p = r + 1; *p; p++)
+      if (p == '/')
+	*p = 0;
+  return r;
+}
+
+
+/**
+ * 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* filename)
+{
+  int have_nonslash = 0;
+  char* last_slash = NULL;
+  char c, d;
+  if ((filename == NULL) || (!*filename))
+    return ".";
+  for (; (c = *filename); filename++)
+    {
+      d = filename[1];
+      have_nonslash |= c - '/';
+      if ((c == '/') && d && (d != '/'))
+	last_slash = filename;
+    }
+  if (!have_nonslash)      return "/";
+  if (last_slash == NULL)  return ".";
+  return *last_slash = 0, filename;
+}
+