Draft: Minor fixes

cmake/sspschemafiles.cmake

@@ -41,6 +41,8 @@ set(OUT_DIR "${INCLUDE_DIR}/reader/ssp/schema")
 
 add_library(ssp_headers INTERFACE)
 
+find_package(Python3 REQUIRED)
+
 # process schema files
 file(GLOB_RECURSE SCHEMA_FILES "${SSP_ROOT}/*.xsd")
 foreach(SCHEMA_FILE ${SCHEMA_FILES})
@@ -61,7 +63,7 @@ foreach(SCHEMA_FILE ${SCHEMA_FILES})
 
         add_custom_command(
             OUTPUT "${OUT_DIR}/${SUB_DIR}/${SCHEMA_FILE_NAME}.h"
-            COMMAND python "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}/${SUB_DIR}" -p "${SUB_DIR}"
+            COMMAND "${Python3_EXECUTABLE}" "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}/${SUB_DIR}" -p "${SUB_DIR}"
             DEPENDS "${SCHEMA_FILE}"
             COMMENT "${CMD_COMMENT}")
 
@@ -77,7 +79,7 @@ foreach(SCHEMA_FILE ${SCHEMA_FILES})
 
         add_custom_command(
             OUTPUT "${OUT_DIR}/${SCHEMA_FILE_NAME}.h"
-            COMMAND python "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}"
+            COMMAND "${Python3_EXECUTABLE}" "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}"
             DEPENDS "${SCHEMA_FILE}"
             COMMENT "${CMD_COMMENT}")
 

libs/util/include/util/os.h

@@ -40,11 +40,11 @@ McxStatus mcx_os_set_env_var(const char * name, const char * value);
  * %VAR%, $(VAR) or ${VAR} in path with their respective values and
  * returns the result.
  */
-char * mcx_resolve_env_var(char * path);
+char * mcx_resolve_env_var(const char * path);
 
-int mcx_parse_win_env_var(char * path, char ** res);
-int mcx_parse_linux_par_env_var(char * path, char ** res);
-int mcx_parse_linux_bra_env_var(char * path, char ** res);
+int mcx_parse_win_env_var(const char * path, char ** res);
+int mcx_parse_linux_par_env_var(const char * path, char ** res);
+int mcx_parse_linux_bra_env_var(const char * path, char ** res);
 
 /**
  * Get string description of errno.

libs/util/include/util/paths.h

@@ -40,6 +40,8 @@ extern "C" {
 char * mcx_path_dir_name(const char * path);
 char * mcx_path_file_name(const char * path);
 
+void mcx_path_strip_ext(char * path);
+
 char * mcx_path_get_absolute(const char * path);
 int mcx_path_is_absolute(const char * path);
 

libs/util/include/util/string.h

@@ -19,8 +19,11 @@ extern "C" {
 
 char * mcx_string_dup(const char * s);
 
+char * mcx_string_decode(const char * str, char _escape_char);
 char * mcx_string_encode(const char * str, char _escape_char, const char _chars_to_escape[]);
+char* mcx_string_encode_special_characters_except_hash(const char* str);
 char * mcx_string_encode_filename(const char * str);
+char * mcx_string_encode_filename_result_files(const char* str);
 
 wchar_t * mcx_string_to_widechar(const char * str);
 char * mcx_string_to_utf8(const wchar_t * wstr);
@@ -38,6 +41,7 @@ char * mcx_string_merge_array_with_spaces(char * args[]);
 char * mcx_string_merge_quoted_array_with_spaces(char * strs[]);
 
 char* mcx_string_sep(char** stringp, const char* delim);
+void mcx_string_replace_char(char * str, char searched_char, char replacement_char);
 
 #ifdef __cplusplus
 } /* closing brace for extern "C" */

libs/util/src/common/os.c

@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include "common/memory.h"
+#include "common/logging.h"
 
 #include "util/os.h"
 #include "util/paths.h"
@@ -84,7 +85,7 @@ int mcx_os_fprintf(FILE *stream, const char *format, ...) {
     return ret;
 }
 
-int mcx_parse_win_env_var(char * path, char ** res) {
+int mcx_parse_win_env_var(const char * path, char ** res) {
     size_t i = 0;
 
     *res = NULL;
@@ -119,7 +120,7 @@ int mcx_parse_win_env_var(char * path, char ** res) {
     return (int)i;
 }
 
-static int input_parse_linux_env_var(char * path, char ** res, char open, char close) {
+static int input_parse_linux_env_var(const char * path, char ** res, char open, char close) {
     size_t i = 0;
 
     *res = NULL;
@@ -160,11 +161,11 @@ static int input_parse_linux_env_var(char * path, char ** res, char open, char c
     return (int)i;
 }
 
-int mcx_parse_linux_par_env_var(char * path, char ** res) {
+int mcx_parse_linux_par_env_var(const char * path, char ** res) {
     return input_parse_linux_env_var(path, res, '(', ')');
 }
 
-int mcx_parse_linux_bra_env_var(char * path, char ** res) {
+int mcx_parse_linux_bra_env_var(const char * path, char ** res) {
     return input_parse_linux_env_var(path, res, '{', '}');
 }
 
@@ -183,7 +184,7 @@ int mcx_parse_linux_bra_env_var(char * path, char ** res) {
  * If path does not start with an environment variable, *res is set to
  * NULL and 0 is returned.
  */
-static int mcx_parse_env_var(char * path, char ** res) {
+static int mcx_parse_env_var(const char * path, char ** res) {
     int num;
 
     if (num = mcx_parse_win_env_var(path, res)) {
@@ -200,23 +201,23 @@ static int mcx_parse_env_var(char * path, char ** res) {
     return 0;
 }
 
-static int mcx_parse_escaped_env_delimiter_win(char * path) {
+static int mcx_parse_escaped_env_delimiter_win(const char * path) {
     if (strlen(path) > 1 && path[0] == '%' && path[1] == '%') {
         return (int)'%';
     } else {
         return 0;
     }
 }
 
-static int mcx_parse_escaped_env_delimiter_linux(char * path) {
+static int mcx_parse_escaped_env_delimiter_linux(const char * path) {
     if (strlen(path) > 1 && path[0] == '$' && path[1] == '$') {
         return (int)'$';
     } else {
         return 0;
     }
 }
 
-static int mcx_parse_escaped_env_delimiter(char * path) {
+static int mcx_parse_escaped_env_delimiter(const char * path) {
     int num;
 
     if (num = mcx_parse_escaped_env_delimiter_win(path)) {
@@ -229,7 +230,7 @@ static int mcx_parse_escaped_env_delimiter(char * path) {
     return 0;
 }
 
-char * mcx_resolve_env_var(char * path) {
+char * mcx_resolve_env_var(const char * path) {
     int i = 0;
 
     int resolved_len = 1; // for '\0'
@@ -239,9 +240,9 @@ char * mcx_resolve_env_var(char * path) {
     }
 
     while (path[i]) {
-        char * name;
-        char quote;
-        int num;
+        char * name = NULL;
+        char quote = 0;
+        int num = 0;
 
         // skip over chars until we find a variable or a quote
         while (path[i] &&
@@ -281,9 +282,7 @@ char * mcx_resolve_env_var(char * path) {
 
         // copy env-var value
         if (name) {
-            char * value;
-
-            value = mcx_os_get_env_var(name);
+            char * value = mcx_os_get_env_var(name);
             if (value) {
                 resolved_len += (int)strlen(value);
                 resolved = mcx_realloc(resolved, resolved_len);
@@ -296,6 +295,20 @@ char * mcx_resolve_env_var(char * path) {
 
                 strcat(resolved, value);
                 mcx_free(value);
+
+                if (path[i] == '%') {
+                    mcx_log(LOG_WARNING, "Defining environment variables via '%%env_var%%' (%s) is deprecated. Please switch to the '${env_var}' construct instead", path);
+                }
+            } else {
+                resolved_len += num;
+                resolved = mcx_realloc(resolved, resolved_len);
+                if (!resolved) {
+                    mcx_free(name);
+                    return NULL;
+                }
+
+                strncat(resolved, path + i, num);
+                resolved[resolved_len - 1] = '\0';
             }
 
             mcx_free(name);

libs/util/src/common/paths.c

@@ -17,6 +17,9 @@
 #include "util/paths.h"
 
 
+#define LOCATION_PREFIX "file://"
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -60,6 +63,14 @@ char * mcx_path_file_name(const char * path) {
     return dir;
 }
 
+void mcx_path_strip_ext(char * path) {
+    char * dot = strrchr(path, '.');
+
+    if (dot) {
+        *dot = '\0';
+    }
+}
+
 char ** mcx_path_split(char * path) {
     size_t partsNum = 0;
     size_t pos = 0;
@@ -247,60 +258,6 @@ char * mcx_path_get_relative(const char * fileName, const char * path) {
     return mergedPath;
 }
 
-char * mcx_path_from_uri(const char * uri) {
-    char * buffer = NULL;
-    size_t i = 0;
-    size_t j = 0;
-#if defined (OS_WINDOWS)
-    /* use of PathCreateFromUrl was considered, dismissed because of
-       needed effort */
-#define LOCATION_PREFIX          "file:///"
-#define LOCATION_PREFIX_2SLASHES "file://"
-    if (0 == strncmp(uri, LOCATION_PREFIX, strlen(LOCATION_PREFIX))) {
-        uri += strlen(LOCATION_PREFIX);
-    } else if (0 == strncmp(uri, LOCATION_PREFIX_2SLASHES, strlen(LOCATION_PREFIX_2SLASHES))) {
-        uri += strlen(LOCATION_PREFIX_2SLASHES);
-    }
-#else
-#define LOCATION_PREFIX "file://"
-    /* check if this is file uri */
-    if (strncmp(uri, LOCATION_PREFIX, strlen(LOCATION_PREFIX))) {
-        /* not a file uri */
-        return NULL;
-    }
-
-    /* check if uri has authority component */
-    if (uri[strlen(LOCATION_PREFIX)] == '/') {
-        /* no authority component */
-        uri += strlen(LOCATION_PREFIX);
-    } else {
-        /* skip over authority component */
-        uri += strlen(LOCATION_PREFIX);
-        while (*uri != '\0' && *uri != '/') {
-            uri++;
-        }
-    }
-#endif /* OS_WINDOWS */
-    buffer = (char *)mcx_calloc(strlen(uri) + 1, sizeof(char));
-    if (!buffer) { return NULL; }
-
-    /* convert escaped characters back */
-    while (uri[i]) {
-        if (uri[i] == '%') {
-            char str[3] = {uri[i+1], uri[i+2], 0};
-            buffer[j] = (char) strtol(str, NULL, 16);
-            i += 3;
-            j += 1;
-        } else {
-            buffer[j] = uri[i];
-            i += 1;
-            j += 1;
-        }
-    }
-    buffer[j] = '\0';
-
-    return buffer;
-}
 
 char * mcx_path_to_uri(const char * path) {
     char * uri = NULL;

libs/util/src/common/string.c

@@ -11,8 +11,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "common/memory.h"
+#include "common/logging.h"
 
 #include "util/string.h"
 
@@ -44,6 +46,37 @@ static int mcx_string_contains_char(const char * str, char c) {
     return 0;
 }
 
+char * mcx_string_decode(const char * str, char _escape_char) {
+    int i = 0;
+    int j = 0;
+    char * buffer = NULL;
+
+    buffer = (char *) mcx_calloc(strlen(str) + 1, sizeof(char));
+    if (!buffer) {
+        return NULL;
+    }
+
+    while (str[i]) {
+        if (str[i] == _escape_char) {
+            if (!str[i+1] || !str[i+2]) {
+                mcx_log(LOG_ERROR, "Invalid escape sequence encountered in string: %s", str);
+                return NULL;
+            }
+            char escape_sequence[3] = {str[i+1], str[i+2], 0};
+            buffer[j] = (char) strtol(escape_sequence, NULL, 16);
+            i += 3;
+            j += 1;
+        } else {
+            buffer[j] = str[i];
+            i += 1;
+            j += 1;
+        }
+    }
+    buffer[j] = '\0';
+
+    return buffer;
+}
+
 char * mcx_string_encode(const char * str, char _escape_char, const char _chars_to_escape[]) {
     size_t len = strlen(str);
     size_t num = 0;
@@ -78,6 +111,17 @@ char * mcx_string_encode_filename(const char * str) {
     return mcx_string_encode(str, '%', "\\\"<>|!#$&'()*+,/:;=?@[]%");
 }
 
+char* mcx_string_encode_special_characters_except_hash(const char* str) {
+    return mcx_string_encode(str, '%', "\\\"<>|!$&'()*+,/:;=?@[]%._`*{}");
+}
+
+char* mcx_string_encode_filename_result_files(const char* str) {
+    char* str_encoded = mcx_string_encode_special_characters_except_hash(str);
+    mcx_string_replace_char(str_encoded, ' ', '_');
+    mcx_string_replace_char(str_encoded, '#', '.');
+    return  str_encoded;
+}
+
 int mcx_string_ends_with(const char * str, const char * suffix) {
     if ( *str ) {
         char * pos = strstr(str, suffix);
@@ -243,6 +287,18 @@ char* mcx_string_sep(char** stringp, const char* delim)
     return start;
 }
 
+void mcx_string_replace_char(char* str, char searched_char, char replacement_char) {
+    size_t len = strlen(str);
+    size_t i = 0;
+
+    for (i = 0; i < len; i++) {
+        if (searched_char == str[i]) {
+            str[i] = replacement_char;
+        }
+    }
+}
+
+
 #ifdef __cplusplus
 } /* closing brace for extern "C" */
 #endif /* __cplusplus */