patch 8.1.1985: code for dealing with paths is spread outv8.1.1985

Problem:    Code for dealing with paths is spread out.
Solution:   Move path related functions from misc1.c to filepath.c.
            Remove NO_EXPANDPATH.

14 files changed, 2152 insertions, 2173 deletions

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 3e8c48b7a2..e14aa0452e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -282,8 +282,6 @@ static void f_synIDattr(typval_T *argvars, typval_T *rettv);
 static void f_synIDtrans(typval_T *argvars, typval_T *rettv);
 static void f_synstack(typval_T *argvars, typval_T *rettv);
 static void f_synconcealed(typval_T *argvars, typval_T *rettv);
-static void f_system(typval_T *argvars, typval_T *rettv);
-static void f_systemlist(typval_T *argvars, typval_T *rettv);
 static void f_tabpagebuflist(typval_T *argvars, typval_T *rettv);
 static void f_tabpagenr(typval_T *argvars, typval_T *rettv);
 static void f_tabpagewinnr(typval_T *argvars, typval_T *rettv);
@@ -9252,205 +9250,6 @@ f_synstack(typval_T *argvars UNUSED, typval_T *rettv)
 #endif
 }
 
-    static void
-get_cmd_output_as_rettv(
-    typval_T	*argvars,
-    typval_T	*rettv,
-    int		retlist)
-{
-    char_u	*res = NULL;
-    char_u	*p;
-    char_u	*infile = NULL;
-    int		err = FALSE;
-    FILE	*fd;
-    list_T	*list = NULL;
-    int		flags = SHELL_SILENT;
-
-    rettv->v_type = VAR_STRING;
-    rettv->vval.v_string = NULL;
-    if (check_restricted() || check_secure())
-	goto errret;
-
-    if (argvars[1].v_type != VAR_UNKNOWN)
-    {
-	/*
-	 * Write the text to a temp file, to be used for input of the shell
-	 * command.
-	 */
-	if ((infile = vim_tempname('i', TRUE)) == NULL)
-	{
-	    emsg(_(e_notmp));
-	    goto errret;
-	}
-
-	fd = mch_fopen((char *)infile, WRITEBIN);
-	if (fd == NULL)
-	{
-	    semsg(_(e_notopen), infile);
-	    goto errret;
-	}
-	if (argvars[1].v_type == VAR_NUMBER)
-	{
-	    linenr_T	lnum;
-	    buf_T	*buf;
-
-	    buf = buflist_findnr(argvars[1].vval.v_number);
-	    if (buf == NULL)
-	    {
-		semsg(_(e_nobufnr), argvars[1].vval.v_number);
-		fclose(fd);
-		goto errret;
-	    }
-
-	    for (lnum = 1; lnum <= buf->b_ml.ml_line_count; lnum++)
-	    {
-		for (p = ml_get_buf(buf, lnum, FALSE); *p != NUL; ++p)
-		    if (putc(*p == '\n' ? NUL : *p, fd) == EOF)
-		    {
-			err = TRUE;
-			break;
-		    }
-		if (putc(NL, fd) == EOF)
-		{
-		    err = TRUE;
-		    break;
-		}
-	    }
-	}
-	else if (argvars[1].v_type == VAR_LIST)
-	{
-	    if (write_list(fd, argvars[1].vval.v_list, TRUE) == FAIL)
-		err = TRUE;
-	}
-	else
-	{
-	    size_t	len;
-	    char_u	buf[NUMBUFLEN];
-
-	    p = tv_get_string_buf_chk(&argvars[1], buf);
-	    if (p == NULL)
-	    {
-		fclose(fd);
-		goto errret;		/* type error; errmsg already given */
-	    }
-	    len = STRLEN(p);
-	    if (len > 0 && fwrite(p, len, 1, fd) != 1)
-		err = TRUE;
-	}
-	if (fclose(fd) != 0)
-	    err = TRUE;
-	if (err)
-	{
-	    emsg(_("E677: Error writing temp file"));
-	    goto errret;
-	}
-    }
-
-    /* Omit SHELL_COOKED when invoked with ":silent".  Avoids that the shell
-     * echoes typeahead, that messes up the display. */
-    if (!msg_silent)
-	flags += SHELL_COOKED;
-
-    if (retlist)
-    {
-	int		len;
-	listitem_T	*li;
-	char_u		*s = NULL;
-	char_u		*start;
-	char_u		*end;
-	int		i;
-
-	res = get_cmd_output(tv_get_string(&argvars[0]), infile, flags, &len);
-	if (res == NULL)
-	    goto errret;
-
-	list = list_alloc();
-	if (list == NULL)
-	    goto errret;
-
-	for (i = 0; i < len; ++i)
-	{
-	    start = res + i;
-	    while (i < len && res[i] != NL)
-		++i;
-	    end = res + i;
-
-	    s = alloc(end - start + 1);
-	    if (s == NULL)
-		goto errret;
-
-	    for (p = s; start < end; ++p, ++start)
-		*p = *start == NUL ? NL : *start;
-	    *p = NUL;
-
-	    li = listitem_alloc();
-	    if (li == NULL)
-	    {
-		vim_free(s);
-		goto errret;
-	    }
-	    li->li_tv.v_type = VAR_STRING;
-	    li->li_tv.v_lock = 0;
-	    li->li_tv.vval.v_string = s;
-	    list_append(list, li);
-	}
-
-	rettv_list_set(rettv, list);
-	list = NULL;
-    }
-    else
-    {
-	res = get_cmd_output(tv_get_string(&argvars[0]), infile, flags, NULL);
-#ifdef USE_CRNL
-	/* translate <CR><NL> into <NL> */
-	if (res != NULL)
-	{
-	    char_u	*s, *d;
-
-	    d = res;
-	    for (s = res; *s; ++s)
-	    {
-		if (s[0] == CAR && s[1] == NL)
-		    ++s;
-		*d++ = *s;
-	    }
-	    *d = NUL;
-	}
-#endif
-	rettv->vval.v_string = res;
-	res = NULL;
-    }
-
-errret:
-    if (infile != NULL)
-    {
-	mch_remove(infile);
-	vim_free(infile);
-    }
-    if (res != NULL)
-	vim_free(res);
-    if (list != NULL)
-	list_free(list);
-}
-
-/*
- * "system()" function
- */
-    static void
-f_system(typval_T *argvars, typval_T *rettv)
-{
-    get_cmd_output_as_rettv(argvars, rettv, FALSE);
-}
-
-/*
- * "systemlist()" function
- */
-    static void
-f_systemlist(typval_T *argvars, typval_T *rettv)
-{
-    get_cmd_output_as_rettv(argvars, rettv, TRUE);
-}
-
 /*
  * "tabpagebuflist()" function
  */
diff --git a/src/filepath.c b/src/filepath.c
index 0ba1a439d3..21cd767c53 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -36,8 +36,8 @@ get_short_pathname(char_u **fnamep, char_u **bufp, int *fnamelen)
     l = GetShortPathName((LPSTR)*fnamep, (LPSTR)*fnamep, len);
     if (l > len - 1)
     {
-	/* If that doesn't work (not enough space), then save the string
-	 * and try again with a new buffer big enough. */
+	// If that doesn't work (not enough space), then save the string
+	// and try again with a new buffer big enough.
 	newbuf = vim_strnsave(*fnamep, l);
 	if (newbuf == NULL)
 	    return FAIL;
@@ -45,7 +45,7 @@ get_short_pathname(char_u **fnamep, char_u **bufp, int *fnamelen)
 	vim_free(*bufp);
 	*fnamep = *bufp = newbuf;
 
-	/* Really should always succeed, as the buffer is big enough. */
+	// Really should always succeed, as the buffer is big enough.
 	l = GetShortPathName((LPSTR)*fnamep, (LPSTR)*fnamep, l+1);
     }
 
@@ -81,13 +81,13 @@ shortpath_for_invalid_fname(
     int		new_len, sfx_len;
     int		retval = OK;
 
-    /* Make a copy */
+    // Make a copy
     old_len = *fnamelen;
     save_fname = vim_strnsave(*fname, old_len);
     pbuf_unused = NULL;
     short_fname = NULL;
 
-    endp = save_fname + old_len - 1; /* Find the end of the copy */
+    endp = save_fname + old_len - 1; // Find the end of the copy
     save_endp = endp;
 
     /*
@@ -97,11 +97,11 @@ shortpath_for_invalid_fname(
     len = 0;
     for (;;)
     {
-	/* go back one path-separator */
+	// go back one path-separator
 	while (endp > save_fname && !after_pathsep(save_fname, endp + 1))
 	    --endp;
 	if (endp <= save_fname)
-	    break;		/* processed the complete path */
+	    break;		// processed the complete path
 
 	/*
 	 * Replace the path separator with a NUL and try to shorten the
@@ -116,12 +116,12 @@ shortpath_for_invalid_fname(
 	    retval = FAIL;
 	    goto theend;
 	}
-	*endp = ch;	/* preserve the string */
+	*endp = ch;	// preserve the string
 
 	if (len > 0)
-	    break;	/* successfully shortened the path */
+	    break;	// successfully shortened the path
 
-	/* failed to shorten the path. Skip the path separator */
+	// failed to shorten the path. Skip the path separator
 	--endp;
     }
 
@@ -140,8 +140,8 @@ shortpath_for_invalid_fname(
 	vim_free(*bufp);
 	if (new_len > old_len)
 	{
-	    /* There is not enough space in the currently allocated string,
-	     * copy it to a buffer big enough. */
+	    // There is not enough space in the currently allocated string,
+	    // copy it to a buffer big enough.
 	    *fname = *bufp = vim_strnsave(short_fname, new_len);
 	    if (*fname == NULL)
 	    {
@@ -151,15 +151,15 @@ shortpath_for_invalid_fname(
 	}
 	else
 	{
-	    /* Transfer short_fname to the main buffer (it's big enough),
-	     * unless get_short_pathname() did its work in-place. */
+	    // Transfer short_fname to the main buffer (it's big enough),
+	    // unless get_short_pathname() did its work in-place.
 	    *fname = *bufp = save_fname;
 	    if (short_fname != save_fname)
 		vim_strncpy(save_fname, short_fname, len);
 	    save_fname = NULL;
 	}
 
-	/* concat the not-shortened part of the path */
+	// concat the not-shortened part of the path
 	vim_strncpy(*fname + len, endp, sfx_len);
 	(*fname)[new_len] = NUL;
     }
@@ -186,14 +186,14 @@ shortpath_for_partial(
     char_u	*pbuf, *tfname;
     int		hasTilde;
 
-    /* Count up the path separators from the RHS.. so we know which part
-     * of the path to return. */
+    // Count up the path separators from the RHS.. so we know which part
+    // of the path to return.
     sepcount = 0;
     for (p = *fnamep; p < *fnamep + *fnamelen; MB_PTR_ADV(p))
 	if (vim_ispathsep(*p))
 	    ++sepcount;
 
-    /* Need full path first (use expand_env() to remove a "~/") */
+    // Need full path first (use expand_env() to remove a "~/")
     hasTilde = (**fnamep == '~');
     if (hasTilde)
 	pbuf = tfname = expand_env_save(*fnamep);
@@ -207,16 +207,15 @@ shortpath_for_partial(
 
     if (len == 0)
     {
-	/* Don't have a valid filename, so shorten the rest of the
-	 * path if we can. This CAN give us invalid 8.3 filenames, but
-	 * there's not a lot of point in guessing what it might be.
-	 */
+	// Don't have a valid filename, so shorten the rest of the
+	// path if we can. This CAN give us invalid 8.3 filenames, but
+	// there's not a lot of point in guessing what it might be.
 	len = tflen;
 	if (shortpath_for_invalid_fname(&tfname, &pbuf, &len) == FAIL)
 	    return FAIL;
     }
 
-    /* Count the paths backward to find the beginning of the desired string. */
+    // Count the paths backward to find the beginning of the desired string.
     for (p = tfname + len - 1; p >= tfname; --p)
     {
 	if (has_mbyte)
@@ -240,7 +239,7 @@ shortpath_for_partial(
     else
 	++p;
 
-    /* Copy in the string - p indexes into tfname - allocated at pbuf */
+    // Copy in the string - p indexes into tfname - allocated at pbuf
     vim_free(*bufp);
     *fnamelen = (int)STRLEN(p);
     *bufp = pbuf;
@@ -278,7 +277,7 @@ modify_fname(
 #endif
 
 repeat:
-    /* ":p" - full path/file_name */
+    // ":p" - full path/file_name
     if (src[*usedlen] == ':' && src[*usedlen + 1] == 'p')
     {
 	has_fullname = 1;
@@ -286,7 +285,7 @@ repeat:
 	valid |= VALID_PATH;
 	*usedlen += 2;
 
-	/* Expand "~/path" for all systems and "~user/path" for Unix and VMS */
+	// Expand "~/path" for all systems and "~user/path" for Unix and VMS
 	if ((*fnamep)[0] == '~'
 #if !defined(UNIX) && !(defined(VMS) && defined(USER_HOME))
 		&& ((*fnamep)[1] == '/'
@@ -299,13 +298,13 @@ repeat:
 	   )
 	{
 	    *fnamep = expand_env_save(*fnamep);
-	    vim_free(*bufp);	/* free any allocated file name */
+	    vim_free(*bufp);	// free any allocated file name
 	    *bufp = *fnamep;
 	    if (*fnamep == NULL)
 		return -1;
 	}
 
-	/* When "/." or "/.." is used: force expansion to get rid of it. */
+	// When "/." or "/.." is used: force expansion to get rid of it.
 	for (p = *fnamep; *p != NUL; MB_PTR_ADV(p))
 	{
 	    if (vim_ispathsep(*p)
@@ -317,11 +316,11 @@ repeat:
 		break;
 	}
 
-	/* FullName_save() is slow, don't use it when not needed. */
+	// FullName_save() is slow, don't use it when not needed.
 	if (*p != NUL || !vim_isAbsName(*fnamep))
 	{
 	    *fnamep = FullName_save(*fnamep, *p != NUL);
-	    vim_free(*bufp);	/* free any allocated file name */
+	    vim_free(*bufp);	// free any allocated file name
 	    *bufp = *fnamep;
 	    if (*fnamep == NULL)
 		return -1;
@@ -354,12 +353,12 @@ repeat:
 	}
 # endif
 #endif
-	/* Append a path separator to a directory. */
+	// Append a path separator to a directory.
 	if (mch_isdir(*fnamep))
 	{
-	    /* Make room for one or two extra characters. */
+	    // Make room for one or two extra characters.
 	    *fnamep = vim_strnsave(*fnamep, (int)STRLEN(*fnamep) + 2);
-	    vim_free(*bufp);	/* free any allocated file name */
+	    vim_free(*bufp);	// free any allocated file name
 	    *bufp = *fnamep;
 	    if (*fnamep == NULL)
 		return -1;
@@ -367,9 +366,9 @@ repeat:
 	}
     }
 
-    /* ":." - path relative to the current directory */
-    /* ":~" - path relative to the home directory */
-    /* ":8" - shortname path - postponed till after */
+    // ":." - path relative to the current directory
+    // ":~" - path relative to the home directory
+    // ":8" - shortname path - postponed till after
     while (src[*usedlen] == ':'
 		  && ((c = src[*usedlen + 1]) == '.' || c == '~' || c == '8'))
     {
@@ -377,12 +376,12 @@ repeat:
 	if (c == '8')
 	{
 #ifdef MSWIN
-	    has_shortname = 1; /* Postpone this. */
+	    has_shortname = 1; // Postpone this.
 #endif
 	    continue;
 	}
 	pbuf = NULL;
-	/* Need full path first (use expand_env() to remove a "~/") */
+	// Need full path first (use expand_env() to remove a "~/")
 	if (!has_fullname)
 	{
 	    if (c == '.' && **fnamep == '~')
@@ -406,7 +405,7 @@ repeat:
 		    *fnamep = s;
 		    if (pbuf != NULL)
 		    {
-			vim_free(*bufp);   /* free any allocated file name */
+			vim_free(*bufp);   // free any allocated file name
 			*bufp = pbuf;
 			pbuf = NULL;
 		    }
@@ -415,7 +414,7 @@ repeat:
 	    else
 	    {
 		home_replace(NULL, p, dirname, MAXPATHL, TRUE);
-		/* Only replace it when it starts with '~' */
+		// Only replace it when it starts with '~'
 		if (*dirname == '~')
 		{
 		    s = vim_strsave(dirname);
@@ -434,8 +433,8 @@ repeat:
     tail = gettail(*fnamep);
     *fnamelen = (int)STRLEN(*fnamep);
 
-    /* ":h" - head, remove "/file_name", can be repeated  */
-    /* Don't remove the first "/" or "c:\" */
+    // ":h" - head, remove "/file_name", can be repeated
+    // Don't remove the first "/" or "c:\"
     while (src[*usedlen] == ':' && src[*usedlen + 1] == 'h')
     {
 	valid |= VALID_HEAD;
@@ -446,11 +445,11 @@ repeat:
 	*fnamelen = (int)(tail - *fnamep);
 #ifdef VMS
 	if (*fnamelen > 0)
-	    *fnamelen += 1; /* the path separator is part of the path */
+	    *fnamelen += 1; // the path separator is part of the path
 #endif
 	if (*fnamelen == 0)
 	{
-	    /* Result is empty.  Turn it into "." to make ":cd %:h" work. */
+	    // Result is empty.  Turn it into "." to make ":cd %:h" work.
 	    p = vim_strsave((char_u *)".");
 	    if (p == NULL)
 		return -1;
@@ -465,7 +464,7 @@ repeat:
 	}
     }
 
-    /* ":8" - shortname  */
+    // ":8" - shortname
     if (src[*usedlen] == ':' && src[*usedlen + 1] == '8')
     {
 	*usedlen += 2;
@@ -480,9 +479,9 @@ repeat:
      */
     if (has_shortname)
     {
-	/* Copy the string if it is shortened by :h and when it wasn't copied
-	 * yet, because we are going to change it in place.  Avoids changing
-	 * the buffer name for "%:8". */
+	// Copy the string if it is shortened by :h and when it wasn't copied
+	// yet, because we are going to change it in place.  Avoids changing
+	// the buffer name for "%:8".
 	if (*fnamelen < (int)STRLEN(*fnamep) || *fnamep == fname_start)
 	{
 	    p = vim_strnsave(*fnamep, *fnamelen);
@@ -492,8 +491,8 @@ repeat:
 	    *bufp = *fnamep = p;
 	}
 
-	/* Split into two implementations - makes it easier.  First is where
-	 * there isn't a full name already, second is where there is. */
+	// Split into two implementations - makes it easier.  First is where
+	// there isn't a full name already, second is where there is.
 	if (!has_fullname && !vim_isAbsName(*fnamep))
 	{
 	    if (shortpath_for_partial(fnamep, bufp, fnamelen) == FAIL)
@@ -503,14 +502,14 @@ repeat:
 	{
 	    int		l = *fnamelen;
 
-	    /* Simple case, already have the full-name.
-	     * Nearly always shorter, so try first time. */
+	    // Simple case, already have the full-name.
+	    // Nearly always shorter, so try first time.
 	    if (get_short_pathname(fnamep, bufp, &l) == FAIL)
 		return -1;
 
 	    if (l == 0)
 	    {
-		/* Couldn't find the filename, search the paths. */
+		// Couldn't find the filename, search the paths.
 		l = *fnamelen;
 		if (shortpath_for_invalid_fname(fnamep, bufp, &l) == FAIL)
 		    return -1;
@@ -520,7 +519,7 @@ repeat:
     }
 #endif // MSWIN
 
-    /* ":t" - tail, just the basename */
+    // ":t" - tail, just the basename
     if (src[*usedlen] == ':' && src[*usedlen + 1] == 't')
     {
 	*usedlen += 2;
@@ -528,15 +527,14 @@ repeat:
 	*fnamep = tail;
     }
 
-    /* ":e" - extension, can be repeated */
-    /* ":r" - root, without extension, can be repeated */
+    // ":e" - extension, can be repeated
+    // ":r" - root, without extension, can be repeated
     while (src[*usedlen] == ':'
 	    && (src[*usedlen + 1] == 'e' || src[*usedlen + 1] == 'r'))
     {
-	/* find a '.' in the tail:
-	 * - for second :e: before the current fname
-	 * - otherwise: The last '.'
-	 */
+	// find a '.' in the tail:
+	// - for second :e: before the current fname
+	// - otherwise: The last '.'
 	if (src[*usedlen + 1] == 'e' && *fnamep > tail)
 	    s = *fnamep - 2;
 	else
@@ -544,14 +542,14 @@ repeat:
 	for ( ; s > tail; --s)
 	    if (s[0] == '.')
 		break;
-	if (src[*usedlen + 1] == 'e')		/* :e */
+	if (src[*usedlen + 1] == 'e')		// :e
 	{
 	    if (s > tail)
 	    {
 		*fnamelen += (int)(*fnamep - (s + 1));
 		*fnamep = s + 1;
 #ifdef VMS
-		/* cut version from the extension */
+		// cut version from the extension
 		s = *fnamep + *fnamelen - 1;
 		for ( ; s > *fnamep; --s)
 		    if (s[0] == ';')
@@ -563,16 +561,16 @@ repeat:
 	    else if (*fnamep <= tail)
 		*fnamelen = 0;
 	}
-	else				/* :r */
+	else				// :r
 	{
-	    if (s > tail)	/* remove one extension */
+	    if (s > tail)	// remove one extension
 		*fnamelen = (int)(s - *fnamep);
 	}
 	*usedlen += 2;
     }
 
-    /* ":s?pat?foo?" - substitute */
-    /* ":gs?pat?foo?" - global substitute */
+    // ":s?pat?foo?" - substitute
+    // ":gs?pat?foo?" - global substitute
     if (src[*usedlen] == ':'
 	    && (src[*usedlen + 1] == 's'
 		|| (src[*usedlen + 1] == 'g' && src[*usedlen + 2] == 's')))
@@ -595,7 +593,7 @@ repeat:
 	sep = *s++;
 	if (sep)
 	{
-	    /* find end of pattern */
+	    // find end of pattern
 	    p = vim_strchr(s, sep);
 	    if (p != NULL)
 	    {
@@ -603,7 +601,7 @@ repeat:
 		if (pat != NULL)
 		{
 		    s = p + 1;
-		    /* find end of substitution */
+		    // find end of substitution
 		    p = vim_strchr(s, sep);
 		    if (p != NULL)
 		    {
@@ -628,7 +626,7 @@ repeat:
 		    vim_free(pat);
 		}
 	    }
-	    /* after using ":s", repeat all the modifiers */
+	    // after using ":s", repeat all the modifiers
 	    if (didit)
 		goto repeat;
 	}
@@ -636,7 +634,7 @@ repeat:
 
     if (src[*usedlen] == ':' && src[*usedlen + 1] == 'S')
     {
-	/* vim_strsave_shellescape() needs a NUL terminated string. */
+	// vim_strsave_shellescape() needs a NUL terminated string.
 	c = (*fnamep)[*fnamelen];
 	if (c != NUL)
 	    (*fnamep)[*fnamelen] = NUL;
@@ -722,13 +720,13 @@ f_delete(typval_T *argvars, typval_T *rettv)
 	flags = (char_u *)"";
 
     if (*flags == NUL)
-	/* delete a file */
+	// delete a file
 	rettv->vval.v_number = mch_remove(name) == 0 ? 0 : -1;
     else if (STRCMP(flags, "d") == 0)
-	/* delete an empty directory */
+	// delete an empty directory
 	rettv->vval.v_number = mch_rmdir(name) == 0 ? 0 : -1;
     else if (STRCMP(flags, "rf") == 0)
-	/* delete a directory recursively */
+	// delete a directory recursively
 	rettv->vval.v_number = delete_recursive(name);
     else
 	semsg(_(e_invexpr2), flags);
@@ -742,7 +740,7 @@ f_executable(typval_T *argvars, typval_T *rettv)
 {
     char_u *name = tv_get_string(&argvars[0]);
 
-    /* Check in $PATH and also check directly if there is a directory name. */
+    // Check in $PATH and also check directly if there is a directory name.
     rettv->vval.v_number = mch_can_exe(name, NULL, TRUE);
 }
 
@@ -1022,7 +1020,7 @@ f_getfsize(typval_T *argvars, typval_T *rettv)
 	{
 	    rettv->vval.v_number = (varnumber_T)st.st_size;
 
-	    /* non-perfect check for overflow */
+	    // non-perfect check for overflow
 	    if ((off_T)rettv->vval.v_number != (off_T)st.st_size)
 		rettv->vval.v_number = -2;
 	}
@@ -1095,8 +1093,8 @@ f_glob(typval_T *argvars, typval_T *rettv)
     expand_T	xpc;
     int		error = FALSE;
 
-    /* When the optional second argument is non-zero, don't remove matches
-     * for 'wildignore' and don't put matches for 'suffixes' at the end. */
+    // When the optional second argument is non-zero, don't remove matches
+    // for 'wildignore' and don't put matches for 'suffixes' at the end.
     rettv->v_type = VAR_STRING;
     if (argvars[1].v_type != VAR_UNKNOWN)
     {
@@ -1250,13 +1248,13 @@ mkdir_recurse(char_u *dir, int prot)
     char_u	*updir;
     int		r = FAIL;
 
-    /* Get end of directory name in "dir".
-     * We're done when it's "/" or "c:/". */
+    // Get end of directory name in "dir".
+    // We're done when it's "/" or "c:/".
     p = gettail_sep(dir);
     if (p <= get_past_head(dir))
 	return OK;
 
-    /* If the directory exists we're done.  Otherwise: create it.*/
+    // If the directory exists we're done.  Otherwise: create it.
     updir = vim_strnsave(dir, (int)(p - dir));
     if (updir == NULL)
 	return FAIL;
@@ -1287,7 +1285,7 @@ f_mkdir(typval_T *argvars, typval_T *rettv)
 	return;
 
     if (*gettail(dir) == NUL)
-	/* remove trailing slashes */
+	// remove trailing slashes
 	*gettail_sep(dir) = NUL;
 
     if (argvars[1].v_type != VAR_UNKNOWN)
@@ -1302,7 +1300,7 @@ f_mkdir(typval_T *argvars, typval_T *rettv)
 	{
 	    if (mch_isdir(dir))
 	    {
-		/* With the "p" flag it's OK if the dir already exists. */
+		// With the "p" flag it's OK if the dir already exists.
 		rettv->vval.v_number = OK;
 		return;
 	    }
@@ -1353,16 +1351,16 @@ f_readfile(typval_T *argvars, typval_T *rettv)
     int		failed = FALSE;
     char_u	*fname;
     FILE	*fd;
-    char_u	buf[(IOSIZE/256)*256];	/* rounded to avoid odd + 1 */
+    char_u	buf[(IOSIZE/256)*256];	// rounded to avoid odd + 1
     int		io_size = sizeof(buf);
-    int		readlen;		/* size of last fread() */
-    char_u	*prev	 = NULL;	/* previously read bytes, if any */
-    long	prevlen  = 0;		/* length of data in prev */
-    long	prevsize = 0;		/* size of prev buffer */
+    int		readlen;		// size of last fread()
+    char_u	*prev	 = NULL;	// previously read bytes, if any
+    long	prevlen  = 0;		// length of data in prev
+    long	prevsize = 0;		// size of prev buffer
     long	maxline  = MAXLNUM;
     long	cnt	 = 0;
-    char_u	*p;			/* position in buf */
-    char_u	*start;			/* start of current line */
+    char_u	*p;			// position in buf
+    char_u	*start;			// start of current line
 
     if (argvars[1].v_type != VAR_UNKNOWN)
     {
@@ -1386,8 +1384,8 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 	    return;
     }
 
-    /* Always open the file in binary mode, library functions have a mind of
-     * their own about CR-LF conversion. */
+    // Always open the file in binary mode, library functions have a mind of
+    // their own about CR-LF conversion.
     fname = tv_get_string(&argvars[0]);
     if (*fname == NUL || (fd = mch_fopen((char *)fname, READBIN)) == NULL)
     {
@@ -1410,11 +1408,11 @@ f_readfile(typval_T *argvars, typval_T *rettv)
     {
 	readlen = (int)fread(buf, 1, io_size, fd);
 
-	/* This for loop processes what was read, but is also entered at end
-	 * of file so that either:
-	 * - an incomplete line gets written
-	 * - a "binary" file gets an empty line at the end if it ends in a
-	 *   newline.  */
+	// This for loop processes what was read, but is also entered at end
+	// of file so that either:
+	// - an incomplete line gets written
+	// - a "binary" file gets an empty line at the end if it ends in a
+	//   newline.
 	for (p = buf, start = buf;
 		p < buf + readlen || (readlen <= 0 && (prevlen > 0 || binary));
 		++p)
@@ -1425,12 +1423,12 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 		char_u	    *s	= NULL;
 		long_u	    len = p - start;
 
-		/* Finished a line.  Remove CRs before NL. */
+		// Finished a line.  Remove CRs before NL.
 		if (readlen > 0 && !binary)
 		{
 		    while (len > 0 && start[len - 1] == '\r')
 			--len;
-		    /* removal may cross back to the "prev" string */
+		    // removal may cross back to the "prev" string
 		    if (len == 0)
 			while (prevlen > 0 && prev[prevlen - 1] == '\r')
 			    --prevlen;
@@ -1439,14 +1437,14 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 		    s = vim_strnsave(start, (int)len);
 		else
 		{
-		    /* Change "prev" buffer to be the right size.  This way
-		     * the bytes are only copied once, and very long lines are
-		     * allocated only once.  */
+		    // Change "prev" buffer to be the right size.  This way
+		    // the bytes are only copied once, and very long lines are
+		    // allocated only once.
 		    if ((s = vim_realloc(prev, prevlen + len + 1)) != NULL)
 		    {
 			mch_memmove(s + prevlen, start, len);
 			s[prevlen + len] = NUL;
-			prev = NULL; /* the list will own the string */
+			prev = NULL; // the list will own the string
 			prevlen = prevsize = 0;
 		    }
 		}
@@ -1468,18 +1466,18 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 		li->li_tv.vval.v_string = s;
 		list_append(rettv->vval.v_list, li);
 
-		start = p + 1; /* step over newline */
+		start = p + 1; // step over newline
 		if ((++cnt >= maxline && maxline >= 0) || readlen <= 0)
 		    break;
 	    }
 	    else if (*p == NUL)
 		*p = '\n';
-	    /* Check for utf8 "bom"; U+FEFF is encoded as EF BB BF.  Do this
-	     * when finding the BF and check the previous two bytes. */
+	    // Check for utf8 "bom"; U+FEFF is encoded as EF BB BF.  Do this
+	    // when finding the BF and check the previous two bytes.
 	    else if (*p == 0xbf && enc_utf8 && !binary)
 	    {
-		/* Find the two bytes before the 0xbf.	If p is at buf, or buf
-		 * + 1, these may be in the "prev" string. */
+		// Find the two bytes before the 0xbf.	If p is at buf, or buf
+		// + 1, these may be in the "prev" string.
 		char_u back1 = p >= buf + 1 ? p[-1]
 				     : prevlen >= 1 ? prev[prevlen - 1] : NUL;
 		char_u back2 = p >= buf + 2 ? p[-2]
@@ -1490,19 +1488,18 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 		{
 		    char_u *dest = p - 2;
 
-		    /* Usually a BOM is at the beginning of a file, and so at
-		     * the beginning of a line; then we can just step over it.
-		     */
+		    // Usually a BOM is at the beginning of a file, and so at
+		    // the beginning of a line; then we can just step over it.
 		    if (start == dest)
 			start = p + 1;
 		    else
 		    {
-			/* have to shuffle buf to close gap */
+			// have to shuffle buf to close gap
 			int adjust_prevlen = 0;
 
 			if (dest < buf)
 			{
-			    adjust_prevlen = (int)(buf - dest); /* must be 1 or 2 */
+			    adjust_prevlen = (int)(buf - dest); // must be 1 or 2
 			    dest = buf;
 			}
 			if (readlen > p - buf + 1)
@@ -1513,22 +1510,22 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 		    }
 		}
 	    }
-	} /* for */
+	} // for
 
 	if (failed || (cnt >= maxline && maxline >= 0) || readlen <= 0)
 	    break;
 	if (start < p)
 	{
-	    /* There's part of a line in buf, store it in "prev". */
+	    // There's part of a line in buf, store it in "prev".
 	    if (p - start + prevlen >= prevsize)
 	    {
-		/* need bigger "prev" buffer */
+		// need bigger "prev" buffer
 		char_u *newprev;
 
-		/* A common use case is ordinary text files and "prev" gets a
-		 * fragment of a line, so the first allocation is made
-		 * small, to avoid repeatedly 'allocing' large and
-		 * 'reallocing' small. */
+		// A common use case is ordinary text files and "prev" gets a
+		// fragment of a line, so the first allocation is made
+		// small, to avoid repeatedly 'allocing' large and
+		// 'reallocing' small.
 		if (prevsize == 0)
 		    prevsize = (long)(p - start);
 		else
@@ -1546,16 +1543,14 @@ f_readfile(typval_T *argvars, typval_T *rettv)
 		}
 		prev = newprev;
 	    }
-	    /* Add the line part to end of "prev". */
+	    // Add the line part to end of "prev".
 	    mch_memmove(prev + prevlen, start, p - start);
 	    prevlen += (long)(p - start);
 	}
-    } /* while */
+    } // while
 
-    /*
-     * For a negative line count use only the lines at the end of the file,
-     * free the rest.
-     */
+    // For a negative line count use only the lines at the end of the file,
+    // free the rest.
     if (!failed && maxline < 0)
 	while (cnt > -maxline)
 	{
@@ -1617,14 +1612,14 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 	if (len > 0 && after_pathsep(p, p + len))
 	{
 	    has_trailing_pathsep = TRUE;
-	    p[len - 1] = NUL; /* the trailing slash breaks readlink() */
+	    p[len - 1] = NUL; // the trailing slash breaks readlink()
 	}
 
 	q = getnextcomp(p);
 	if (*q != NUL)
 	{
-	    /* Separate the first path component in "p", and keep the
-	     * remainder (beginning with the path separator). */
+	    // Separate the first path component in "p", and keep the
+	    // remainder (beginning with the path separator).
 	    remain = vim_strsave(q - 1);
 	    q[-1] = NUL;
 	}
@@ -1651,13 +1646,13 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 		    goto fail;
 		}
 
-		/* Ensure that the result will have a trailing path separator
-		 * if the argument has one. */
+		// Ensure that the result will have a trailing path separator
+		// if the argument has one.
 		if (remain == NULL && has_trailing_pathsep)
 		    add_pathsep(buf);
 
-		/* Separate the first path component in the link value and
-		 * concatenate the remainders. */
+		// Separate the first path component in the link value and
+		// concatenate the remainders.
 		q = getnextcomp(vim_ispathsep(*buf) ? buf + 1 : buf);
 		if (*q != NUL)
 		{
@@ -1678,13 +1673,13 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 		q = gettail(p);
 		if (q > p && *q == NUL)
 		{
-		    /* Ignore trailing path separator. */
+		    // Ignore trailing path separator.
 		    q[-1] = NUL;
 		    q = gettail(p);
 		}
 		if (q > p && !mch_isFullName(buf))
 		{
-		    /* symlink is relative to directory of argument */
+		    // symlink is relative to directory of argument
 		    cpy = alloc(STRLEN(p) + STRLEN(buf) + 1);
 		    if (cpy != NULL)
 		    {
@@ -1704,7 +1699,7 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 	    if (remain == NULL)
 		break;
 
-	    /* Append the first path component of "remain" to "p". */
+	    // Append the first path component of "remain" to "p".
 	    q = getnextcomp(remain + 1);
 	    len = q - remain - (*q != NUL);
 	    cpy = vim_strnsave(p, STRLEN(p) + len);
@@ -1714,15 +1709,15 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 		vim_free(p);
 		p = cpy;
 	    }
-	    /* Shorten "remain". */
+	    // Shorten "remain".
 	    if (*q != NUL)
 		STRMOVE(remain, q - 1);
 	    else
 		VIM_CLEAR(remain);
 	}
 
-	/* If the result is a relative path name, make it explicitly relative to
-	 * the current directory if and only if the argument had this form. */
+	// If the result is a relative path name, make it explicitly relative to
+	// the current directory if and only if the argument had this form.
 	if (!vim_ispathsep(*p))
 	{
 	    if (is_relative_to_current
@@ -1734,7 +1729,7 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 				&& (p[2] == NUL
 				    || vim_ispathsep(p[2]))))))
 	    {
-		/* Prepend "./". */
+		// Prepend "./".
 		cpy = concat_str((char_u *)"./", p);