Get rid of more strtok_r calls

Author: LibretroAdmin

core_option_manager.c

@@ -1200,27 +1200,23 @@ core_option_manager_t *core_option_manager_new(
           * the map */
          const char *category_key = opt->opts[_len].category_key;
          char address[256];
+         size_t __len = 0;
 
          /* Address string is nominally:
           *    <category_key><delim><tag><option_key>
           * ...where <tag> is prepended to the option
           * key in order to avoid category/option key
           * collisions */
          if (string_is_empty(category_key))
-         {
-            size_t __len     = 0;
             address[  __len] = '#';
-            address[++__len] = '\0';
-            strlcpy(address + __len, option_def->key, sizeof(address) - __len);
-         }
          else
          {
-            size_t __len      = strlcpy(address, category_key, sizeof(address) - 3);
+            __len = strlcpy(address, category_key, sizeof(address) - 3);
             address[  __len]  = ':';
             address[++__len]  = '#';
-            address[++__len]  = '\0';
-            strlcpy(address + __len, option_def->key, sizeof(address) - __len);
          }
+	 address[++__len]  = '\0';
+	 strlcpy(address + __len, option_def->key, sizeof(address) - __len);
 
          if (!nested_list_add_item(opt->option_map,
                address, ":",

libretro-common/compat/compat_getopt.c

@@ -124,39 +124,31 @@ static int parse_short(const char *optstring, char * const *argv)
 static int parse_long(const struct option *longopts, char * const *argv)
 {
    size_t i;
-   char *save  = NULL;
-   char *argv0 = strdup(&argv[0][2]);
-   char *token = strtok_r(argv0, "=", &save);
+   const char *arg = &argv[0][2];
+   const char *eq  = strchr(arg, '=');
+   size_t len      = eq ? (size_t)(eq - arg) : strlen(arg);
    const struct option *opt = NULL;
 
    for (i = 0; longopts[i].name; i++)
    {
-      if (token && !strcmp(longopts[i].name, token))
+      if (strlen(longopts[i].name) == len && !strncmp(longopts[i].name, arg, len))
       {
          opt = &longopts[i];
          break;
       }
    }
 
-   free(argv0);
-   argv0 = NULL;
-
    if (!opt)
       return '?';
 
    /* Handle args with '=' instead of space */
-   if (opt->has_arg)
+   if (opt->has_arg && eq)
    {
-      char *special_arg = strchr(argv[0], '=');
-      if (special_arg)
-      {
-         optarg = ++special_arg;
-         optind++;
-         return opt->val;
-      }
+      optarg = (char *)(eq + 1);
+      optind++;
+      return opt->val;
    }
 
-   /* getopt_long has an "optional" arg, but we don't bother with that. */
    if (opt->has_arg && !argv[1])
       return '?';
 

libretro-common/include/string/stdstring.h

@@ -267,13 +267,15 @@ char *string_tokenize(char **str, const char *delim);
 
 /**
  * string_remove_all_chars:
- * @str                : input string (must be non-NULL, otherwise UB)
+ * @s                 : input string (must be non-NULL, otherwise UB)
  *
  * Leaf function.
  *
- * Removes every instance of character @c from @str
+ * Removes every instance of character @c from @s
+ *
+ * Returns the length of the resulting string.
  **/
-void string_remove_all_chars(char *str, char c);
+size_t string_remove_all_chars(char *s, char c);
 
 /**
  * string_replace_all_chars:

libretro-common/string/stdstring.c

@@ -513,21 +513,22 @@ char* string_tokenize(char **str, const char *delim)
  * Leaf function.
  *
  * Removes every instance of character @c from @s
+ *
+ * Returns the length of the resulting string.
  **/
-void string_remove_all_chars(char *s, char c)
+size_t string_remove_all_chars(char *s, char c)
 {
-   char *read_ptr  = s;
-   char *write_ptr = s;
-
-   while (*read_ptr != '\0')
+   char *dst = s;
+   char *src = s;
+   while (*src)
    {
       /* Only write if the character is not the one to remove */
-      if (*read_ptr != c)
-         *write_ptr++ = *read_ptr;
-      read_ptr++;
+      if (*src != c)
+         *dst++ = *src;
+      src++;
    }
-
-   *write_ptr = '\0';
+   *dst = '\0';
+   return (size_t)(dst - s);
 }
 
 /**

menu/drivers/ozone.c

@@ -7050,7 +7050,6 @@ static void ozone_draw_osk(
       0.00, 0.00, 0.00, 0.15,
       0.00, 0.00, 0.00, 0.15,
    };
-   char *tok, *save               = NULL;
    unsigned i                     = 0;
    static retro_time_t last_time  = 0;
    unsigned list_size             = 0;
@@ -7061,6 +7060,8 @@ static void ozone_draw_osk(
    unsigned y_offset              = 0;
    bool draw_placeholder          = string_is_empty(str);
    retro_time_t current_time      = menu_driver_get_current_time();
+   const char *line               = NULL;
+   const char *next               = NULL;
 
    if (current_time - last_time >= INTERVAL_OSK_CURSOR)
    {
@@ -7163,16 +7164,28 @@ static void ozone_draw_osk(
          ozone->fonts.entries_label.wideglyph_width,
          0);
 
-   tok       = strtok_r(message, "\n", &save);
    list_size = string_count_occurrences_single_character(message, '\n');
 
-   while (tok)
+   for (line = message; line; line = next ? next + 1 : NULL)
    {
-      const char *msg = tok;
+      char line_buf[2048];
+      size_t _len;
+
+      next  = strchr(line, '\n');
+      _len  = next ? (size_t)(next - line) : strlen(line);
+
+      if (_len == 0 && !next)
+         break;
+
+      if (_len >= sizeof(line_buf))
+         _len = sizeof(line_buf) - 1;
+
+      memcpy(line_buf, line, _len);
+      line_buf[_len] = '\0';
 
       gfx_display_draw_text(
             ozone->fonts.entries_label.font,
-            msg,
+            line_buf,
             margin + (padding * 2),
             margin + padding + ozone->fonts.entries_label.line_height + y_offset,
             video_width,
@@ -7191,7 +7204,7 @@ static void ozone_draw_osk(
          {
             unsigned cursor_x = draw_placeholder
                   ? 0
-                  : font_driver_get_message_width(ozone->fonts.entries_label.font, msg, strlen(msg), 1.0f);
+                  : font_driver_get_message_width(ozone->fonts.entries_label.font, line_buf, _len, 1.0f);
             gfx_display_draw_quad(
                   p_disp,
                   userdata,
@@ -7217,7 +7230,6 @@ static void ozone_draw_osk(
       else
          y_offset += 25 * scale_factor;
 
-      tok = strtok_r(NULL, "\n", &save);
       i++;
    }
 

tasks/task_overlay.c

@@ -201,16 +201,18 @@ static void task_overlay_redefine_eightway_direction(
       char *str, input_bits_t *data)
 {
    unsigned bit;
-   char *tok, *save = NULL;
-
+   char *cur = str;
+   char *next;
    BIT256_CLEAR_ALL(*data);
-
-   for (tok = strtok_r(str, "|", &save); tok;
-         tok = strtok_r(NULL, "|", &save))
+   while (cur && *cur)
    {
-      bit = input_config_translate_str_to_bind_id(tok);
+      next = strchr(cur, '|');
+      if (next)
+         *next++ = '\0';
+      bit = input_config_translate_str_to_bind_id(cur);
       if (bit < RARCH_CUSTOM_BIND_LIST_END)
          BIT256_SET(*data, bit);
+      cur = next;
    }
 }
 
@@ -330,7 +332,6 @@ static bool task_overlay_load_desc(
    char overlay[256];
    unsigned list_size          = 0;
    char *elems[6]              = {NULL, NULL, NULL, NULL, NULL, NULL};
-   char *tok, *save            = NULL;
    float tmp_float             = 0.0f;
    bool tmp_bool               = false;
    bool by_pixel               = false;
@@ -366,10 +367,23 @@ static bool task_overlay_load_desc(
 
    /* Tokenize in-place — overlay[] is a local buffer,
     * no heap allocation needed */
-   for (tok = strtok_r(overlay, ", ", &save);
-        tok && list_size < 6;
-        tok = strtok_r(NULL, ", ", &save))
-      elems[list_size++] = tok;
+   {
+      char *p = overlay;
+      while (*p && list_size < 6)
+      {
+         /* skip delimiters */
+         while (*p == ',' || *p == ' ')
+            p++;
+         if (!*p)
+            break;
+         elems[list_size++] = p;
+         /* advance to next delimiter or end */
+         while (*p && *p != ',' && *p != ' ')
+            p++;
+         if (*p)
+            *p++ = '\0';
+      }
+   }
 
    if (list_size < 6)
    {
@@ -378,7 +392,7 @@ static bool task_overlay_load_desc(
    }
 
    /* elems[0] (key) will be mutated by the button-parsing
-    * strtok_r below, so read x/y/box from their own pointers
+    * below, so read x/y/box from their own pointers
     * before that happens. They are separate tokens in the
     * buffer and won't be touched. */
    box                 = elems[3];
@@ -402,13 +416,19 @@ static bool task_overlay_load_desc(
    }
    else
    {
-      char      *save2 = NULL;
-      const char *tmp   = strtok_r(elems[0], "|", &save2);
+      const char *tmp;
+      char *p = elems[0];
 
       desc->type = OVERLAY_TYPE_BUTTONS;
 
-      for (; tmp; tmp = strtok_r(NULL, "|", &save2))
+      while (p)
       {
+         char *delim = strchr(p, '|');
+         if (delim)
+            *delim = '\0';
+         tmp = p;
+         p   = delim ? delim + 1 : NULL;
+
          if (!string_is_equal(tmp, "nul"))
          {
             unsigned bind_id = input_config_translate_str_to_bind_id(tmp);