logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-oksh-Avoid-implicit-parameter-conversion-to-char.patch (1746B)


  1. From 537b64d1d0b49c4e74c66e2de98ce2dee51a1905 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Thu, 2 Apr 2026 17:24:45 -0700
  4. Subject: [PATCH] oksh: Avoid implicit parameter conversion to char *
  5. kb_entry.seq is always used with string functions, so make it a
  6. char * instead.
  7. ---
  8. emacs.c | 4 ++--
  9. misc.c | 6 +++---
  10. 2 files changed, 5 insertions(+), 5 deletions(-)
  11. diff --git a/emacs.c b/emacs.c
  12. index 78ac2e4..b2c7ab2 100644
  13. --- a/emacs.c
  14. +++ b/emacs.c
  15. @@ -78,7 +78,7 @@ typedef enum {
  16. /* keybindings */
  17. struct kb_entry {
  18. TAILQ_ENTRY(kb_entry) entry;
  19. - unsigned char *seq;
  20. + char *seq;
  21. int len;
  22. struct x_ftab *ftab;
  23. void *args;
  24. @@ -1343,7 +1343,7 @@ kb_add_string(kb_func func, void *args, char *str)
  25. count = strlen(str);
  26. k = alloc(sizeof *k + count + 1, AEDIT);
  27. - k->seq = (unsigned char *)(k + 1);
  28. + k->seq = (char *)(k + 1);
  29. k->len = count;
  30. k->ftab = xf;
  31. k->args = args ? strdup(args) : NULL;
  32. diff --git a/misc.c b/misc.c
  33. index 428f183..9696230 100644
  34. --- a/misc.c
  35. +++ b/misc.c
  36. @@ -714,10 +714,10 @@ do_gmatch(const unsigned char *s, const unsigned char *se,
  37. }
  38. static int
  39. -posix_cclass(const unsigned char *pattern, int test, const unsigned char **ep)
  40. +posix_cclass(const char *pattern, int test, const unsigned char **ep)
  41. {
  42. const struct cclass *cc;
  43. - const unsigned char *colon;
  44. + const char *colon;
  45. size_t len;
  46. int rval = 0;
  47. @@ -754,7 +754,7 @@ cclass(const unsigned char *p, int sub)
  48. if ((p[0] == MAGIC && p[1] == '[' && p[2] == ':') ||
  49. (p[0] == '[' && p[1] == ':')) {
  50. do {
  51. - const char *pp = p + (*p == MAGIC) + 2;
  52. + const char *pp = (char *)p + (*p == MAGIC) + 2;
  53. rv = posix_cclass(pp, sub, &p);
  54. switch (rv) {
  55. case 1:
  56. --
  57. 2.49.0