vim-patch:9.0.2180: POSIX function name in exarg causes issues (neovi…

…m#28308)

Problem:  POSIX function name in exarg struct causes issues
          on OpenVMS
Solution: Rename getline member in exarg struct to ea_getline,
          remove isinf() workaround for VMS

There are compilers that do not treat well POSIX functions - like
getline - usage in the structs.

Older VMS compilers could digest this... but the newer OpenVMS compilers
( like VSI C x86-64 X7.4-843 (GEM 50XB9) ) cannot deal with these
structs. This could be limited to getline() that is defined via
getdelim() and might not affect all POSIX functions in general - but
avoiding POSIX function names usage in the structs is a "safe side"
practice without compromising the functionality or the code readability.

The previous OpenVMS X86 port used a workaround limiting the compiler
capabilities using __CRTL_VER_OVERRIDE=80400000
In order to make the OpenVMS port future proof, this pull request
proposes a possible solution.

closes: vim/vim#13704

vim/vim@6fdb628

Co-authored-by: Zoltan Arpadffy <zoltan.arpadffy@gmail.com>

src/nvim/digraph.c

@@ -2078,7 +2078,7 @@ void ex_loadkeymap(exarg_T *eap)
   char buf[KMAP_LLEN + 11];
   char *save_cpo = p_cpo;
 
-  if (!getline_equal(eap->getline, eap->cookie, getsourceline)) {
+  if (!getline_equal(eap->ea_getline, eap->cookie, getsourceline)) {
     emsg(_("E105: Using :loadkeymap not in a sourced file"));
     return;
   }
@@ -2094,7 +2094,7 @@ void ex_loadkeymap(exarg_T *eap)
 
   // Get each line of the sourced file, break at the end.
   while (true) {
-    char *line = eap->getline(0, eap->cookie, 0, true);
+    char *line = eap->ea_getline(0, eap->cookie, 0, true);
 
     if (line == NULL) {
       break;

src/nvim/eval.c

@@ -764,8 +764,8 @@ void fill_evalarg_from_eap(evalarg_T *evalarg, exarg_T *eap, bool skip)
     return;
   }
 
-  if (getline_equal(eap->getline, eap->cookie, getsourceline)) {
-    evalarg->eval_getline = eap->getline;
+  if (getline_equal(eap->ea_getline, eap->cookie, getsourceline)) {
+    evalarg->eval_getline = eap->ea_getline;
     evalarg->eval_cookie = eap->cookie;
   }
 }
@@ -8203,7 +8203,7 @@ void ex_execute(exarg_T *eap)
         did_emsg = save_did_emsg;
       }
     } else if (eap->cmdidx == CMD_execute) {
-      do_cmdline(ga.ga_data, eap->getline, eap->cookie, DOCMD_NOWAIT|DOCMD_VERBOSE);
+      do_cmdline(ga.ga_data, eap->ea_getline, eap->cookie, DOCMD_NOWAIT|DOCMD_VERBOSE);
     }
   }
 

src/nvim/eval/userfunc.c

@@ -2409,10 +2409,10 @@ void ex_function(exarg_T *eap)
       }
     } else {
       xfree(line_to_free);
-      if (eap->getline == NULL) {
+      if (eap->ea_getline == NULL) {
         theline = getcmdline(':', 0, indent, do_concat);
       } else {
-        theline = eap->getline(':', eap->cookie, indent, do_concat);
+        theline = eap->ea_getline(':', eap->cookie, indent, do_concat);
       }
       line_to_free = theline;
     }
@@ -2433,7 +2433,7 @@ void ex_function(exarg_T *eap)
     }
 
     // Detect line continuation: SOURCING_LNUM increased more than one.
-    linenr_T sourcing_lnum_off = get_sourced_lnum(eap->getline, eap->cookie);
+    linenr_T sourcing_lnum_off = get_sourced_lnum(eap->ea_getline, eap->cookie);
     if (SOURCING_LNUM < sourcing_lnum_off) {
       sourcing_lnum_off -= SOURCING_LNUM;
     } else {

src/nvim/eval/vars.c

@@ -180,7 +180,7 @@ list_T *heredoc_get(exarg_T *eap, char *cmd, bool script_get)
   char *text_indent = NULL;
   char dot[] = ".";
 
-  if (eap->getline == NULL) {
+  if (eap->ea_getline == NULL) {
     emsg(_(e_cannot_use_heredoc_here));
     return NULL;
   }
@@ -247,7 +247,7 @@ list_T *heredoc_get(exarg_T *eap, char *cmd, bool script_get)
     int ti = 0;
 
     xfree(theline);
-    theline = eap->getline(NUL, eap->cookie, 0, false);
+    theline = eap->ea_getline(NUL, eap->cookie, 0, false);
     if (theline == NULL) {
       if (!script_get) {
         semsg(_("E990: Missing end marker '%s'"), marker);

src/nvim/ex_cmds.c

@@ -2783,7 +2783,7 @@ void ex_append(exarg_T *eap)
         indent = get_indent_lnum(lnum);
       }
     }
-    if (eap->getline == NULL) {
+    if (eap->ea_getline == NULL) {
       // No getline() function, use the lines that follow. This ends
       // when there is no more.
       if (eap->nextcmd == NULL || *eap->nextcmd == NUL) {
@@ -2803,7 +2803,8 @@ void ex_append(exarg_T *eap)
       // Set State to avoid the cursor shape to be set to MODE_INSERT
       // state when getline() returns.
       State = MODE_CMDLINE;
-      theline = eap->getline(eap->cstack->cs_looplevel > 0 ? -1 : NUL, eap->cookie, indent, true);
+      theline = eap->ea_getline(eap->cstack->cs_looplevel > 0 ? -1 : NUL,
+                                eap->cookie, indent, true);
       State = save_State;
     }
     lines_left = Rows - 1;

src/nvim/ex_cmds2.c

@@ -620,7 +620,7 @@ void ex_listdo(exarg_T *eap)
       i++;
       // execute the command
       if (execute) {
-        do_cmdline(eap->arg, eap->getline, eap->cookie, DOCMD_VERBOSE + DOCMD_NOWAIT);
+        do_cmdline(eap->arg, eap->ea_getline, eap->cookie, DOCMD_VERBOSE + DOCMD_NOWAIT);
       }
 
       if (eap->cmdidx == CMD_bufdo) {

src/nvim/ex_cmds_defs.h

@@ -167,8 +167,8 @@ struct exarg {
   int bad_char;                 ///< BAD_KEEP, BAD_DROP or replacement byte
   int useridx;                  ///< user command index
   char *errmsg;                 ///< returned error message
-  LineGetter getline;           ///< Function used to get the next line
-  void *cookie;                 ///< argument for getline()
+  LineGetter ea_getline;        ///< function used to get the next line
+  void *cookie;                 ///< argument for ea_getline()
   cstack_T *cstack;             ///< condition stack for ":if" etc.
 };
 

src/nvim/ex_docmd.c

@@ -144,7 +144,7 @@ struct loop_cookie {
   int current_line;                     // last read line from growarray
   int repeating;                        // true when looping a second time
   // When "repeating" is false use "getline" and "cookie" to get lines
-  char *(*getline)(int, void *, int, bool);
+  LineGetter lc_getline;
   void *cookie;
 };
 
@@ -622,7 +622,7 @@ int do_cmdline(char *cmdline, LineGetter fgetline, void *cookie, int flags)
       cmd_cookie = (void *)&cmd_loop_cookie;
       cmd_loop_cookie.lines_gap = &lines_ga;
       cmd_loop_cookie.current_line = current_line;
-      cmd_loop_cookie.getline = fgetline;
+      cmd_loop_cookie.lc_getline = fgetline;
       cmd_loop_cookie.cookie = cookie;
       cmd_loop_cookie.repeating = (current_line < lines_ga.ga_len);
 
@@ -1003,10 +1003,10 @@ static char *get_loop_line(int c, void *cookie, int indent, bool do_concat)
     }
     char *line;
     // First time inside the ":while"/":for": get line normally.
-    if (cp->getline == NULL) {
+    if (cp->lc_getline == NULL) {
       line = getcmdline(c, 0, indent, do_concat);
     } else {
-      line = cp->getline(c, cp->cookie, indent, do_concat);
+      line = cp->lc_getline(c, cp->cookie, indent, do_concat);
     }
     if (line != NULL) {
       store_loop_line(cp->lines_gap, line);
@@ -1043,7 +1043,7 @@ bool getline_equal(LineGetter fgetline, void *cookie, LineGetter func)
   LineGetter gp = fgetline;
   struct loop_cookie *cp = (struct loop_cookie *)cookie;
   while (gp == get_loop_line) {
-    gp = cp->getline;
+    gp = cp->lc_getline;
     cp = cp->cookie;
   }
   return gp == func;
@@ -1061,7 +1061,7 @@ void *getline_cookie(LineGetter fgetline, void *cookie)
   LineGetter gp = fgetline;
   struct loop_cookie *cp = (struct loop_cookie *)cookie;
   while (gp == get_loop_line) {
-    gp = cp->getline;
+    gp = cp->lc_getline;
     cp = cp->cookie;
   }
   return cp;
@@ -1488,7 +1488,7 @@ bool parse_cmdline(char *cmdline, exarg_T *eap, CmdParseInfo *cmdinfo, const cha
     .line2 = 1,
     .cmd = cmdline,
     .cmdlinep = &cmdline,
-    .getline = NULL,
+    .ea_getline = NULL,
     .cookie = NULL,
   };
 
@@ -1997,7 +1997,7 @@ static char *do_one_cmd(char **cmdlinep, int flags, cstack_T *cstack, LineGetter
   // The "ea" structure holds the arguments that can be used.
   ea.cmd = *cmdlinep;
   ea.cmdlinep = cmdlinep;
-  ea.getline = fgetline;
+  ea.ea_getline = fgetline;
   ea.cookie = cookie;
   ea.cstack = cstack;
 
@@ -2472,7 +2472,7 @@ int parse_command_modifiers(exarg_T *eap, const char **errormsg, cmdmod_T *cmod,
 
     // in ex mode, an empty line works like :+
     if (*eap->cmd == NUL && exmode_active
-        && getline_equal(eap->getline, eap->cookie, getexline)
+        && getline_equal(eap->ea_getline, eap->cookie, getexline)
         && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) {
       eap->cmd = "+";
       if (!skip_only) {

src/nvim/ex_getln.c

@@ -4587,7 +4587,7 @@ char *script_get(exarg_T *const eap, size_t *const lenp)
 {
   char *cmd = eap->arg;
 
-  if (cmd[0] != '<' || cmd[1] != '<' || eap->getline == NULL) {
+  if (cmd[0] != '<' || cmd[1] != '<' || eap->ea_getline == NULL) {
     *lenp = strlen(eap->arg);
     return eap->skip ? NULL : xmemdupz(eap->arg, *lenp);
   }

src/nvim/runtime.c

@@ -2733,7 +2733,7 @@ void ex_scriptencoding(exarg_T *eap)
   struct source_cookie *sp;
   char *name;
 
-  if (!getline_equal(eap->getline, eap->cookie, getsourceline)) {
+  if (!getline_equal(eap->ea_getline, eap->cookie, getsourceline)) {
     emsg(_("E167: :scriptencoding used outside of a sourced file"));
     return;
   }
@@ -2745,7 +2745,7 @@ void ex_scriptencoding(exarg_T *eap)
   }
 
   // Setup for conversion from the specified encoding to 'encoding'.
-  sp = (struct source_cookie *)getline_cookie(eap->getline, eap->cookie);
+  sp = (struct source_cookie *)getline_cookie(eap->ea_getline, eap->cookie);
   convert_setup(&sp->conv, name, p_enc);
 
   if (name != eap->arg) {
@@ -2756,7 +2756,7 @@ void ex_scriptencoding(exarg_T *eap)
 /// ":finish": Mark a sourced file as finished.
 void ex_finish(exarg_T *eap)
 {
-  if (getline_equal(eap->getline, eap->cookie, getsourceline)) {
+  if (getline_equal(eap->ea_getline, eap->cookie, getsourceline)) {
     do_finish(eap, false);
   } else {
     emsg(_("E168: :finish used outside of a sourced file"));
@@ -2769,7 +2769,7 @@ void ex_finish(exarg_T *eap)
 void do_finish(exarg_T *eap, bool reanimate)
 {
   if (reanimate) {
-    ((struct source_cookie *)getline_cookie(eap->getline,
+    ((struct source_cookie *)getline_cookie(eap->ea_getline,
                                             eap->cookie))->finished = false;
   }
 
@@ -2782,7 +2782,7 @@ void do_finish(exarg_T *eap, bool reanimate)
     eap->cstack->cs_pending[idx] = CSTP_FINISH;
     report_make_pending(CSTP_FINISH, NULL);
   } else {
-    ((struct source_cookie *)getline_cookie(eap->getline,
+    ((struct source_cookie *)getline_cookie(eap->ea_getline,
                                             eap->cookie))->finished = true;
   }
 }

src/nvim/usercmd.c

@@ -1724,7 +1724,7 @@ int do_ucmd(exarg_T *eap, bool preview)
     save_current_sctx = current_sctx;
     current_sctx.sc_sid = cmd->uc_script_ctx.sc_sid;
   }
-  do_cmdline(buf, eap->getline, eap->cookie,
+  do_cmdline(buf, eap->ea_getline, eap->cookie,
              DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED);
 
   // Careful: Do not use "cmd" here, it may have become invalid if a user