Resync

Author: LibretroAdmin

file/file_path.c

@@ -672,10 +672,8 @@ const char *path_basename(const char *path)
    const char *slash     = strrchr(path, '/');
    const char *backslash = strrchr(path, '\\');
    char *last_slash      = (!slash || (backslash > slash)) ? (char*)backslash : (char*)slash;
-   if (     (ptr = path_get_archive_delim(path))
-         || (ptr = last_slash))
-      return ptr + 1;
-   return path;
+   return ((ptr = path_get_archive_delim(path)) || (ptr = last_slash))
+      ? (ptr + 1) : path;
 }
 
 /* Specialized version */

formats/logiqx_dat/logiqx_dat.c

@@ -35,12 +35,12 @@ struct logiqx_dat
 
 /* List of HTML formatting codes that must
  * be replaced when parsing XML data */
-const char *logiqx_dat_html_code_list[][2] = { 
+const char *logiqx_dat_html_code_list[][2] = {
    {"&",  "&"},
    {"'", "'"},
-   {">",   ">"}, 
+   {">",   ">"},
    {"&lt;",   "<"},
-   {"&quot;", "\""} 
+   {"&quot;", "\""}
 };
 
 #define LOGIQX_DAT_HTML_CODE_LIST_SIZE 5
@@ -53,7 +53,7 @@ const char *logiqx_dat_html_code_list[][2] = {
  * Also provides access to file size (DAT files can
  * be very large, so it is useful to have this information
  * on hand - i.e. so we can check that the system has
- * enough free memory to load the file). */ 
+ * enough free memory to load the file). */
 bool logiqx_dat_path_is_valid(const char *path, uint64_t *file_size)
 {
    const char *file_ext = NULL;
@@ -229,7 +229,8 @@ static void logiqx_dat_sanitise_element_data(
 
    /* Element data includes leading/trailing
     * newline characters - trim them away */
-   string_trim_whitespace(sanitised_data);
+   string_trim_whitespace_right(sanitised_data);
+   string_trim_whitespace_left(sanitised_data);
 
    if (string_is_empty(sanitised_data))
       return;
@@ -254,7 +255,7 @@ static void logiqx_dat_sanitise_element_data(
       if (strstr(sanitised_data, find_string))
       {
          char *tmp = string_replace_substring(
-               sanitised_data,
+               sanitised_data, strlen(sanitised_data),
                find_string,    strlen(find_string),
                replace_string, strlen(replace_string));
 

formats/m3u/m3u_file.c

@@ -145,7 +145,8 @@ static bool m3u_file_load(m3u_file_t *m3u_file)
             strlcpy(
                   entry_label, line + STRLEN_CONST(M3U_FILE_NONSTD_LABEL),
                   sizeof(entry_label));
-            string_trim_whitespace(entry_label);
+            string_trim_whitespace_right(entry_label);
+            string_trim_whitespace_left(entry_label);
          }
       }
       /* > '#EXTINF:' */
@@ -164,7 +165,8 @@ static bool m3u_file_load(m3u_file_t *m3u_file)
             if (!string_is_empty(label_ptr))
             {
                strlcpy(entry_label, label_ptr, sizeof(entry_label));
-               string_trim_whitespace(entry_label);
+               string_trim_whitespace_right(entry_label);
+               string_trim_whitespace_left(entry_label);
             }
          }
       }
@@ -190,22 +192,25 @@ static bool m3u_file_load(m3u_file_t *m3u_file)
                      entry_path, line,
                      ((len < PATH_MAX_LENGTH ?
                            len : PATH_MAX_LENGTH) * sizeof(char)));
-               string_trim_whitespace(entry_path);
+               string_trim_whitespace_right(entry_path);
+               string_trim_whitespace_left(entry_path);
             }
 
             /* Get entry_label segment */
             token_ptr++;
             if (*token_ptr != '\0')
             {
                strlcpy(entry_label, token_ptr, sizeof(entry_label));
-               string_trim_whitespace(entry_label);
+               string_trim_whitespace_right(entry_label);
+               string_trim_whitespace_left(entry_label);
             }
          }
          else
          {
             /* Just a normal file name/path */
             strlcpy(entry_path, line, sizeof(entry_path));
-            string_trim_whitespace(entry_path);
+            string_trim_whitespace_right(entry_path);
+            string_trim_whitespace_left(entry_path);
          }
 
          /* Add entry to file

include/file/file_path.h

@@ -167,7 +167,6 @@ char *path_remove_extension(char *path);
  *
  * Hidden non-leaf function cost:
  * - Calls path_get_archive_delim()
- *   - can call find_last_slash() once if it returns NULL
  *
  * @return basename from path.
  **/
@@ -180,9 +179,6 @@ const char *path_basename(const char *path);
  * Specialized version of path_basename().
  * Get basename from @path.
  *
- * Hidden non-leaf function cost:
- * - Calls find_last_slash()
- *
  * @return basename from path.
  **/
 const char *path_basename_nocompression(const char *path);
@@ -417,7 +413,6 @@ void fill_pathname_basedir(char *out_path, const char *in_path, size_t size);
  *
  * Hidden non-leaf function cost:
  * - Calls strdup
- * - Calls find_last_slash() x times
  * - Can call strlcpy
  *
  * @return Length of the string copied into @s
@@ -499,7 +494,6 @@ size_t fill_pathname_join(char *out_path, const char *dir,
  *
  * Hidden non-leaf function cost:
  * - calls strlcpy 2x
- * - calls find_last_slash()
  *
  * @return Length of the string copied into @out_path
  **/
@@ -635,8 +629,7 @@ void path_basedir_wrapper(char *path);
  * if not already there.
 
  * Hidden non-leaf function cost:
- * - calls find_last_slash()
- *   - can call strlcat once if it returns false
+ * - can call strlcat once if it returns false
  * - calls strlen
  **/
 size_t fill_pathname_slash(char *path, size_t size);

include/libretro.h

@@ -4,12 +4,12 @@
  * @file libretro.h
  * @version 1
  * @author libretro
- * @copyright Copyright (C) 2010-2023 The RetroArch team
+ * @copyright Copyright (C) 2010-2024 The RetroArch team
  *
  * @paragraph LICENSE
  * The following license statement only applies to this libretro API header (libretro.h).
  *
- * Copyright (C) 2010-2023 The RetroArch team
+ * Copyright (C) 2010-2024 The RetroArch team
  *
  * Permission is hereby granted, free of charge,
  * to any person obtaining a copy of this software and associated documentation files (the "Software"),
@@ -272,7 +272,10 @@ extern "C" {
  * [-0x7fff, 0x7fff]: -0x7fff corresponds to the far left/top of the screen,
  * and 0x7fff corresponds to the far right/bottom of the screen.
  * The "screen" is here defined as area that is passed to the frontend and
- * later displayed on the monitor.
+ * later displayed on the monitor. If the pointer is outside this screen,
+ * such as in the black surrounding areas when actual display is larger,
+ * edge position is reported. An explicit edge detection is also provided,
+ * that will return 1 if the pointer is near the screen edge or actually outside it.
  *
  * The frontend is free to scale/resize this screen as it sees fit, however,
  * (X, Y) = (-0x7fff, -0x7fff) will correspond to the top-left pixel of the
@@ -406,7 +409,8 @@ extern "C" {
 
 /* Id values for LIGHTGUN. */
 #define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X        13 /*Absolute Position*/
-#define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y        14 /*Absolute*/
+#define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y        14 /*Absolute Position*/
+/** Indicates if lightgun points off the screen or near the edge */
 #define RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN    15 /*Status Check*/
 #define RETRO_DEVICE_ID_LIGHTGUN_TRIGGER          2
 #define RETRO_DEVICE_ID_LIGHTGUN_RELOAD          16 /*Forced off-screen shot*/
@@ -421,17 +425,18 @@ extern "C" {
 #define RETRO_DEVICE_ID_LIGHTGUN_DPAD_RIGHT      12
 /* deprecated */
 #define RETRO_DEVICE_ID_LIGHTGUN_X                0 /*Relative Position*/
-#define RETRO_DEVICE_ID_LIGHTGUN_Y                1 /*Relative*/
-#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR           3 /*Use Aux:A*/
-#define RETRO_DEVICE_ID_LIGHTGUN_TURBO            4 /*Use Aux:B*/
-#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE            5 /*Use Start*/
+#define RETRO_DEVICE_ID_LIGHTGUN_Y                1 /*Relative Position*/
+#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR           3 /*Use Aux:A instead*/
+#define RETRO_DEVICE_ID_LIGHTGUN_TURBO            4 /*Use Aux:B instead*/
+#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE            5 /*Use Start instead*/
 
 /* Id values for POINTER. */
-#define RETRO_DEVICE_ID_POINTER_X         0
-#define RETRO_DEVICE_ID_POINTER_Y         1
-#define RETRO_DEVICE_ID_POINTER_PRESSED   2
-#define RETRO_DEVICE_ID_POINTER_COUNT     3
-
+#define RETRO_DEVICE_ID_POINTER_X             0
+#define RETRO_DEVICE_ID_POINTER_Y             1
+#define RETRO_DEVICE_ID_POINTER_PRESSED       2
+#define RETRO_DEVICE_ID_POINTER_COUNT         3
+/** Indicates if pointer is off the screen or near the edge */
+#define RETRO_DEVICE_ID_POINTER_IS_OFFSCREEN 15
 /** @} */
 
 /* Returned from retro_get_region(). */

include/string/stdstring.h

@@ -159,8 +159,9 @@ char *string_to_lower(char *s);
 
 char *string_ucwords(char *s);
 
-char *string_replace_substring(const char *in,
-      const char *pattern, size_t pattern_len,
+char *string_replace_substring(
+      const char *in,          size_t in_len,
+      const char *pattern,     size_t pattern_len,
       const char *replacement, size_t replacement_len);
 
 /**

string/stdstring.c

@@ -77,8 +77,9 @@ char *string_ucwords(char *s)
    return s;
 }
 
-char *string_replace_substring(const char *in,
-      const char *pattern, size_t pattern_len,
+char *string_replace_substring(
+      const char *in,          size_t in_len,
+      const char *pattern,     size_t pattern_len,
       const char *replacement, size_t replacement_len)
 {
    size_t outlen;
@@ -101,7 +102,7 @@ char *string_replace_substring(const char *in,
       numhits++;
    }
 
-   outlen          = strlen(in) - pattern_len*numhits + replacement_len*numhits;
+   outlen = in_len - pattern_len * numhits + replacement_len*numhits;
 
    if (!(out = (char *)malloc(outlen+1)))
       return NULL;