1 files changed, 55 insertions, 36 deletions

diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index 83ad948a93..861743eb7d 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -7668,7 +7668,7 @@ static int searchpair_cmn(typval_T *argvars, pos_T *match_pos)
   }
 
   retval = do_searchpair(
-      (char_u *)spat, (char_u *)mpat, (char_u *)epat, dir, skip,
+      spat, mpat, epat, dir, skip,
       flags, match_pos, lnum_stop, time_limit);
 
 theend:
@@ -7712,9 +7712,9 @@ static void f_searchpairpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
  */
 long
 do_searchpair(
-    char_u *spat,          // start pattern
-    char_u *mpat,          // middle pattern
-    char_u *epat,          // end pattern
+    const char *spat,      // start pattern
+    const char *mpat,      // middle pattern
+    const char *epat,      // end pattern
     int dir,               // BACKWARD or FORWARD
     const typval_T *skip,  // skip expression
     int flags,             // SP_SETPCMARK and other SP_ values
@@ -7722,6 +7722,7 @@ do_searchpair(
     linenr_T lnum_stop,    // stop at this line if not zero
     long time_limit        // stop after this many msec
 )
+  FUNC_ATTR_NONNULL_ARG(1, 2, 3)
 {
   char_u      *save_cpo;
   char_u      *pat, *pat2 = NULL, *pat3 = NULL;
@@ -7736,8 +7737,6 @@ do_searchpair(
   bool use_skip = false;
   int options = SEARCH_KEEP;
   proftime_T tm;
-  size_t pat2_len;
-  size_t pat3_len;
 
   // Make 'cpoptions' empty, the 'l' flag should not be used here.
   save_cpo = p_cpo;
@@ -7748,9 +7747,9 @@ do_searchpair(
 
   // Make two search patterns: start/end (pat2, for in nested pairs) and
   // start/middle/end (pat3, for the top pair).
-  pat2_len = STRLEN(spat) + STRLEN(epat) + 17;
+  const size_t pat2_len = strlen(spat) + strlen(epat) + 17;
   pat2 = xmalloc(pat2_len);
-  pat3_len = STRLEN(spat) + STRLEN(mpat) + STRLEN(epat) + 25;
+  const size_t pat3_len = strlen(spat) + strlen(mpat) + strlen(epat) + 25;
   pat3 = xmalloc(pat3_len);
   snprintf((char *)pat2, pat2_len, "\\m\\(%s\\m\\)\\|\\(%s\\m\\)", spat, epat);
   if (*mpat == NUL) {
@@ -10824,52 +10823,72 @@ static void f_trim(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   const char_u *prev;
   const char_u *p;
   int c1;
+  int dir = 0;
 
   rettv->v_type = VAR_STRING;
+  rettv->vval.v_string = NULL;
   if (head == NULL) {
-    rettv->vval.v_string = NULL;
     return;
   }
 
   if (argvars[1].v_type == VAR_STRING) {
     mask = (const char_u *)tv_get_string_buf_chk(&argvars[1], buf2);
+    if (argvars[2].v_type != VAR_UNKNOWN) {
+      bool error = false;
+      // leading or trailing characters to trim
+      dir = (int)tv_get_number_chk(&argvars[2], &error);
+      if (error) {
+        return;
+      }
+      if (dir < 0 || dir > 2) {
+        emsgf(_(e_invarg2), tv_get_string(&argvars[2]));
+        return;
+      }
+    }
   }
 
-  while (*head != NUL) {
-    c1 = PTR2CHAR(head);
-    if (mask == NULL) {
-      if (c1 > ' ' && c1 != 0xa0) {
-        break;
-      }
-    } else {
-      for (p = mask; *p != NUL; MB_PTR_ADV(p)) {
-        if (c1 == PTR2CHAR(p)) {
+  if (dir == 0 || dir == 1) {
+    // Trim leading characters
+    while (*head != NUL) {
+      c1 = PTR2CHAR(head);
+      if (mask == NULL) {
+        if (c1 > ' ' && c1 != 0xa0) {
+          break;
+        }
+      } else {
+        for (p = mask; *p != NUL; MB_PTR_ADV(p)) {
+          if (c1 == PTR2CHAR(p)) {
+            break;
+          }
+        }
+        if (*p == NUL) {
           break;
         }
       }
-      if (*p == NUL) {
-        break;
-      }
+      MB_PTR_ADV(head);
     }
-    MB_PTR_ADV(head);
   }
 
-  for (tail = head + STRLEN(head); tail > head; tail = prev) {
-    prev = tail;
-    MB_PTR_BACK(head, prev);
-    c1 = PTR2CHAR(prev);
-    if (mask == NULL) {
-      if (c1 > ' ' && c1 != 0xa0) {
-        break;
-      }
-    } else {
-      for (p = mask; *p != NUL; MB_PTR_ADV(p)) {
-        if (c1 == PTR2CHAR(p)) {
+  tail = head + STRLEN(head);
+  if (dir == 0 || dir == 2) {
+    // Trim trailing characters
+    for (; tail > head; tail = prev) {
+      prev = tail;
+      MB_PTR_BACK(head, prev);
+      c1 = PTR2CHAR(prev);
+      if (mask == NULL) {
+        if (c1 > ' ' && c1 != 0xa0) {
+          break;
+        }
+      } else {
+        for (p = mask; *p != NUL; MB_PTR_ADV(p)) {
+          if (c1 == PTR2CHAR(p)) {
+            break;
+          }
+        }
+        if (*p == NUL) {
           break;
         }
-      }
-      if (*p == NUL) {
-        break;
       }
     }
   }