2 files changed, 30 insertions, 1 deletions

diff --git a/firmware/common/pathfuncs.c b/firmware/common/pathfuncs.c
index db1935db8b..b5e5ecb0cf 100644
--- a/firmware/common/pathfuncs.c
+++ b/firmware/common/pathfuncs.c
@@ -127,7 +127,35 @@ void init_volume_names(void)
                 VOL_START_TOK, voldec, volume, VOL_END_TOK);
         DEBUGF("vol<%d> = %s ", volume, buffer);
     }
-    DEBUGF("\n"); 
+    DEBUGF("\n");
+}
+
+#include <stdio.h>
+
+int path_get_volume_id(const char *name)
+{
+    int v = -1;
+
+    if (!name || *name != VOL_START_TOK)
+        goto bail;
+
+    do {
+        switch (*name)
+        {
+        case '0' ... '9':       /* digit; parse volume number */
+            v = (v * 10 + *name - '0') % VOL_NUM_MAX;
+            break;
+        case '\0':
+        case PATH_SEPCH:        /* no closing bracket; no volume */
+            v = -1;
+            goto bail;
+        default:                /* something else; reset volume */
+            v = 0;
+        }
+    } while (*++name != VOL_END_TOK);  /* found end token? */
+
+bail:
+    return v;
 }
 
 /* Returns on which volume this is and sets *nameptr to the portion of the
diff --git a/firmware/export/pathfuncs.h b/firmware/export/pathfuncs.h
index 73f20f9a52..fce8e5851c 100644
--- a/firmware/export/pathfuncs.h
+++ b/firmware/export/pathfuncs.h
@@ -83,6 +83,7 @@ int path_strip_last_volume(const char *name, const char **nameptr, bool greedy);
 int get_volume_name(int volume, char *name);
 int make_volume_root(int volume, char *dst);
 void init_volume_names(void);
+int path_get_volume_id(const char *name);
 #endif
 
 int path_strip_drive(const char *name, const char **nameptr, bool greedy);