vim: src/ex_cmds2.c comparison

comparison src/ex_cmds2.c @ 41:f529edb9bab3 v7.0025

updated for version 7.0025

author	vimboss
date	Mon, 27 Dec 2004 21:59:20 +0000
parents	f1d2a58883b9
children	e474bae3795f

comparison

equal deleted inserted replaced

-:f1d2a58883b9
+:f529edb9bab3
 	else
 	{
 	    if (bp->dbg_lnum == 0)	/* default line number is 1 */
 		bp->dbg_lnum = 1;
 	    BREAKP(dbg_breakp.ga_len++).dbg_nr = ++last_breakp;
-	    --dbg_breakp.ga_room;
 	    ++debug_tick;
 	}
 }
 }
 else
 {
 	vim_free(BREAKP(todel).dbg_name);
 	vim_free(BREAKP(todel).dbg_prog);
 	--dbg_breakp.ga_len;
-	++dbg_breakp.ga_room;
 	if (todel < dbg_breakp.ga_len)
 	    mch_memmove(&BREAKP(todel), &BREAKP(todel + 1),
 		    (dbg_breakp.ga_len - todel) * sizeof(struct debuggy));
 	++debug_tick;
 }
 *p = NUL;
 return str;
 }
+/*
+* Separate the arguments in "str" and return a list of pointers in the
+* growarray "gap".
+*/
+int
+get_arglist(gap, str)
+garray_T	*gap;
+char_u	*str;
+{
+ga_init2(gap, (int)sizeof(char_u *), 20);
+while (*str != NUL)
+{
+	if (ga_grow(gap, 1) == FAIL)
+	{
+	    ga_clear(gap);
+	    return FAIL;
+	}
+	((char_u **)gap->ga_data)[gap->ga_len++] = str;
+	/* Isolate one argument, change it in-place, put a NUL after it. */
+	str = do_one_arg(str);
+}
+return OK;
+}
 #if defined(FEAT_GUI) || defined(FEAT_CLIENTSERVER) || defined(PROTO)
 /*
 * Redefine the argument list.
 */
 void
 #endif
 /*
 * Collect all file name arguments in "new_ga".
 */
-ga_init2(&new_ga, (int)sizeof(char_u *), 20);
+if (get_arglist(&new_ga, str) == FAIL)
-while (*str)
+	return FAIL;
-{
-	if (ga_grow(&new_ga, 1) == FAIL)
-	{
-	    ga_clear(&new_ga);
-	    return FAIL;
-	}
-	((char_u **)new_ga.ga_data)[new_ga.ga_len++] = str;
-	--new_ga.ga_room;
-	/* Isolate one argument, change it in-place, put a NUL after it. */
-	str = do_one_arg(str);
-}
 #ifdef FEAT_LISTCMDS
 if (what == AL_DEL)
 {
 	regmatch_T	regmatch;
 		    didone = TRUE;
 		    vim_free(ARGLIST[match].ae_fname);
 		    mch_memmove(ARGLIST + match, ARGLIST + match + 1,
 			    (ARGCOUNT - match - 1) * sizeof(aentry_T));
 		    --ALIST(curwin)->al_ga.ga_len;
-		    ++ALIST(curwin)->al_ga.ga_room;
 		    if (curwin->w_arg_idx > match)
 			--curwin->w_arg_idx;
 		    --match;
 		}
 	    (void)alist_add_list(exp_count, exp_files, after);
 	    vim_free(exp_files);
 	}
 	else /* what == AL_SET */
 #endif
-	    alist_set(ALIST(curwin), exp_count, exp_files, FALSE);
+	    alist_set(ALIST(curwin), exp_count, exp_files, FALSE, NULL, 0);
 }
 alist_check_arg_idx();
 return OK;
 		    AARGLIST(curwin->w_alist)[gap->ga_len].ae_fname =
 					    vim_strsave(GARGLIST[i].ae_fname);
 		    AARGLIST(curwin->w_alist)[gap->ga_len].ae_fnum =
 							  GARGLIST[i].ae_fnum;
 		    ++gap->ga_len;
-		    --gap->ga_room;
 		}
 }
 #endif
 }
 	    for (i = eap->line1; i <= eap->line2; ++i)
 		vim_free(ARGLIST[i - 1].ae_fname);
 	    mch_memmove(ARGLIST + eap->line1 - 1, ARGLIST + eap->line2,
 			(size_t)((ARGCOUNT - eap->line2) * sizeof(aentry_T)));
 	    ALIST(curwin)->al_ga.ga_len -= n;
-	    ALIST(curwin)->al_ga.ga_room += n;
 	    if (curwin->w_arg_idx >= eap->line2)
 		curwin->w_arg_idx -= n;
 	    else if (curwin->w_arg_idx > eap->line1)
 		curwin->w_arg_idx = eap->line1;
 	}
 	{
 	    ARGLIST[after + i].ae_fname = files[i];
 	    ARGLIST[after + i].ae_fnum = buflist_add(files[i], BLN_LISTED);
 	}
 	ALIST(curwin)->al_ga.ga_len += count;
-	ALIST(curwin)->al_ga.ga_room -= count;
 	if (curwin->w_arg_idx >= after)
 	    ++curwin->w_arg_idx;
 	return after;
 }
 	{
 	    while (script_names.ga_len < current_SID)
 	    {
 		SCRIPT_NAME(script_names.ga_len + 1) = NULL;
 		++script_names.ga_len;
-		--script_names.ga_room;
 	    }
 	    SCRIPT_NAME(current_SID) = fname_exp;
 # ifdef UNIX
 	    if (stat_ok)
 	    {
 	buf = (char_u *)ga.ga_data;
 #ifdef USE_CR
 	if (sp->fileformat == EOL_MAC)
 	{
-	    if (fgets_cr((char *)buf + ga.ga_len, ga.ga_room, sp->fp) == NULL)
+	    if (fgets_cr((char *)buf + ga.ga_len, ga.ga_maxlen - ga.ga_len,
+							      sp->fp) == NULL)
 		break;
 	}
 	else
 #endif
-	    if (fgets((char *)buf + ga.ga_len, ga.ga_room, sp->fp) == NULL)
+	    if (fgets((char *)buf + ga.ga_len, ga.ga_maxlen - ga.ga_len,
+							      sp->fp) == NULL)
 		break;
 	len = (int)STRLEN(buf);
 #ifdef USE_CRNL
 	/* Ignore a trailing CTRL-Z, when in Dos mode.	Only recognize the
 	 * CTRL-Z by its own, or after a NL. */
 	    len = STRLEN(buf);
 	}
 #endif
 	have_read = TRUE;
-	ga.ga_room -= len - ga.ga_len;
 	ga.ga_len = len;
 	/* If the line was longer than the buffer, read more. */
-	if (ga.ga_room == 1 && buf[len - 1] != '\n')
+	if (ga.ga_maxlen - ga.ga_len == 1 && buf[len - 1] != '\n')
 	    continue;
 	if (len >= 1 && buf[len - 1] == '\n')	/* remove trailing NL */
 	{
 #ifdef USE_CRNL
 		if (has_cr)	    /* replace trailing CR */
 		{
 		    buf[len - 2] = '\n';
 		    --len;
 		    --ga.ga_len;
-		    ++ga.ga_room;
 		}
 		else	    /* lines like ":map xx yy^M" will have failed */
 		{
 		    if (!sp->error)
 		    {

Mercurial > vim

comparison src/ex_cmds2.c @ 41:f529edb9bab3 v7.0025