/libretro/libretro-beetle-bsnes/patches/patch-musl.patch

https://github.com/sdsddsd1/kiss-games · Patch · 62 lines · 62 code · 0 blank · 0 comment · 0 complexity · 3518b873e5d53b791da66ee04316cbf9 MD5 · raw file

  1. --- a/mednafen/snes/src/lib/nall/string/strl.hpp
  2. +++ b/mednafen/snes/src/lib/nall/string/strl.hpp
  3. @@ -1,48 +0,0 @@
  4. -#ifndef NALL_STRING_STRL_HPP
  5. -#define NALL_STRING_STRL_HPP
  6. -
  7. -//strlcpy, strlcat based on OpenBSD implementation by Todd C. Miller
  8. -
  9. -//return = strlen(src)
  10. -size_t strlcpy(char *dest, const char *src, size_t length) {
  11. - char *d = dest;
  12. - const char *s = src;
  13. - size_t n = length;
  14. -
  15. - if(n) {
  16. - while(--n && (*d++ = *s++)); //copy as many bytes as possible, or until null terminator reached
  17. - }
  18. -
  19. - if(!n) {
  20. - if(length) *d = 0;
  21. - while(*s++); //traverse rest of s, so that s - src == strlen(src)
  22. - }
  23. -
  24. - return (s - src - 1); //return length of copied string, sans null terminator
  25. -}
  26. -
  27. -//return = strlen(src) + min(length, strlen(dest))
  28. -size_t strlcat(char *dest, const char *src, size_t length) {
  29. - char *d = dest;
  30. - const char *s = src;
  31. - size_t n = length;
  32. -
  33. - while(n-- && *d) d++; //find end of dest
  34. - size_t dlength = d - dest;
  35. - n = length - dlength; //subtract length of dest from maximum string length
  36. -
  37. - if(!n) return dlength + strlen(s);
  38. -
  39. - while(*s) {
  40. - if(n != 1) {
  41. - *d++ = *s;
  42. - n--;
  43. - }
  44. - s++;
  45. - }
  46. - *d = 0;
  47. -
  48. - return dlength + (s - src); //return length of resulting string, sans null terminator
  49. -}
  50. -
  51. -#endif
  52. --- a/mednafen/snes/src/lib/nall/string/base.hpp
  53. +++ b/mednafen/snes/src/lib/nall/string/base.hpp
  54. @@ -34,8 +34,6 @@
  55. inline bool match(const char *pattern, const char *str);
  56. inline bool strint (const char *str, int &result);
  57. inline bool strmath(const char *str, int &result);
  58. -inline size_t strlcpy(char *dest, const char *src, size_t length);
  59. -inline size_t strlcat(char *dest, const char *src, size_t length);
  60. inline char* ltrim(char *str, const char *key = " ");
  61. inline char* rtrim(char *str, const char *key = " ");
  62. inline char* trim (char *str, const char *key = " ");