3 files changed, 28 insertions, 2 deletions

diff --git a/src/core/moves.h b/src/core/moves.h
index d07bc19..e3a9bc1 100644
--- a/src/core/moves.h
+++ b/src/core/moves.h
@@ -223,8 +223,9 @@ readmoves(const char *buf, int max, uint8_t *ret)
         uint8_t m;
         int c;
 
-        FOREACH_READMOVE(buf, m, c, max, -1,
-                ret[c] = m;
+        FOREACH_READMOVE(buf, m, c, max, NISSY_ERROR_INVALID_MOVES,
+                if (ret != NULL)
+                        ret[c] = m;
         )
 
         return c;
diff --git a/src/nissy.c b/src/nissy.c
index fe2747b..986f27f 100644
--- a/src/nissy.c
+++ b/src/nissy.c
@@ -1,4 +1,5 @@
 #include <inttypes.h>
+#include <limits.h>
 #include <pthread.h>
 #include <stdatomic.h>
 #include <stdarg.h>
@@ -521,6 +522,17 @@ nissy_solve(
 }
 
 long long
+nissy_countmoves(
+        const char *moves
+)
+{
+        if (moves == NULL)
+                return NISSY_ERROR_NULL_POINTER;
+
+        return readmoves(moves, INT_MAX, NULL);
+}
+
+long long
 nissy_setlogger(
         void (*log)(const char *, ...)
 )
diff --git a/src/nissy.h b/src/nissy.h
index 8f4f363..7a39927 100644
--- a/src/nissy.h
+++ b/src/nissy.h
@@ -281,6 +281,19 @@ long long nissy_solve(
 );
 
 /*
+Parameters:
+   moves  - The moves to be counted.
+
+Return values:
+   NISSY_ERROR_INVALID_MOVES - The given moves are invalid.
+   NISSY_ERROR_NULL_POINTER  - The 'moves' argument is NULL.
+   Any value >= 0            - The number of moves.
+*/
+long long nissy_countmoves(
+        const char *moves
+);
+
+/*
 Set a global logger function used by this library.
 
 Parameters: