added cwk_path_get_basename_wout_extension()

CMakeLists.txt

@@ -70,10 +70,13 @@ if(ENABLE_TESTS)
   create_test(DEFAULT absolute check)
   create_test(DEFAULT absolute buffer_reuse)
   create_test(DEFAULT basename simple)
+  create_test(DEFAULT basename simple_wout_extension)
   create_test(DEFAULT basename empty)
   create_test(DEFAULT basename trailing_separator)
   create_test(DEFAULT basename trailing_separators)
+  create_test(DEFAULT basename trailing_separators_wout_extension)
   create_test(DEFAULT basename no_separators)
+  create_test(DEFAULT basename no_separators_wout_extension)
   create_test(DEFAULT basename special_directories)
   create_test(DEFAULT basename root)
   create_test(DEFAULT basename windows)

include/cwalk.h

@@ -228,6 +228,21 @@ CWK_PUBLIC bool cwk_path_is_relative(const char *path);
 CWK_PUBLIC void cwk_path_get_basename(const char *path, const char **basename,
   size_t *length);
 
+/**
+ * @brief Gets the basename without the extension of a file path.
+ *
+ * This is identical to cwk_path_get_basename(), except that the returned
+ * length does not account for the file extension if there is one. If there is
+ * no extension, the result is identical to cwk_path_get_basename().
+ *
+ * @param path The path which will be inspected.
+ * @param basename The output of the basename pointer.
+ * @param length The output of the length of the basename not accounting for
+ * the extension. This may be null if not required.
+ */
+CWK_PUBLIC void cwk_path_get_basename_wout_extension(const char *path,
+  const char **basename, size_t *length);
+
 /**
  * @brief Changes the basename of a file path.
  *

src/cwalk.c

@@ -969,6 +969,37 @@ void cwk_path_get_basename(const char *path, const char **basename,
   }
 }
 
+void cwk_path_get_basename_wout_extension(const char *path,
+  const char **basename, size_t *length)
+{
+  struct cwk_segment segment;
+  const char *c;
+
+  // We get the last segment of the path. The last segment will contain the
+  // basename if there is any. If there are no segments we will set the basename
+  // to NULL and the length to 0.
+  if (!cwk_path_get_last_segment(path, &segment)) {
+    *basename = NULL;
+    if (length) {
+      *length = 0;
+    }
+    return;
+  }
+
+  *basename = segment.begin;
+  if (length) {
+    *length = segment.size;
+
+    for (c = segment.end; c >= segment.begin; --c) {
+      if (*c == '.') {
+        // Okay, we found an extension. We can stop looking now.
+        *length = (size_t)(c - segment.begin);
+        return;
+      }
+    }
+  }
+}
+
 size_t cwk_path_change_basename(const char *path, const char *new_basename,
   char *buffer, size_t buffer_size)
 {

test/basename_test.c

@@ -232,6 +232,26 @@ int basename_no_separators(void)
   return EXIT_SUCCESS;
 }
 
+int basename_no_separators_wout_extension(void)
+{
+  const char *path, *basename;
+  size_t length;
+
+  cwk_path_set_style(CWK_STYLE_UNIX);
+  path = "file_name";
+  cwk_path_get_basename_wout_extension(path, &basename, &length);
+
+  if (length != 9) {
+    return EXIT_FAILURE;
+  }
+
+  if (strncmp(basename, "file_name", length) != 0) {
+    return EXIT_FAILURE;
+  }
+
+  return EXIT_SUCCESS;
+}
+
 int basename_trailing_separators(void)
 {
   const char *path, *basename;
@@ -252,6 +272,26 @@ int basename_trailing_separators(void)
   return EXIT_SUCCESS;
 }
 
+int basename_trailing_separators_wout_extension(void)
+{
+  const char *path, *basename;
+  size_t length;
+
+  cwk_path_set_style(CWK_STYLE_UNIX);
+  path = "/my/path.txt////";
+  cwk_path_get_basename_wout_extension(path, &basename, &length);
+
+  if (length != 4) {
+    return EXIT_FAILURE;
+  }
+
+  if (strncmp(basename, "path", length) != 0) {
+    return EXIT_FAILURE;
+  }
+
+  return EXIT_SUCCESS;
+}
+
 int basename_trailing_separator(void)
 {
   const char *path, *basename;
@@ -311,3 +351,23 @@ int basename_simple(void)
 
   return EXIT_SUCCESS;
 }
+
+int basename_simple_wout_extension(void)
+{
+  const char *path, *basename;
+  size_t length;
+
+  cwk_path_set_style(CWK_STYLE_UNIX);
+  path = "/my/path.txt";
+  cwk_path_get_basename_wout_extension(path, &basename, &length);
+
+  if (length != 4) {
+    return EXIT_FAILURE;
+  }
+
+  if (strncmp(basename, "path", length) != 0) {
+    return EXIT_FAILURE;
+  }
+
+  return EXIT_SUCCESS;
+}