mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace vim_strncpy calls: spell.c

Browse Source
This commit is contained in:
Douglas Schneider
2014-05-29 20:04:30 -06:00
committed by Justin M. Keyes
parent bdf79dd619
commit fe4a7fc7e7
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/nvim/spell.c
View File

@@ -1553,7 +1553,7 @@ static void find_word(matchinf_T *mip, int mode)
if (ptr == mip->mi_word) if (ptr == mip->mi_word)
(void)spell_casefold(ptr, wlen, fword, MAXWLEN); (void)spell_casefold(ptr, wlen, fword, MAXWLEN);
else else
vim_strncpy(fword, ptr, endlen[endidxcnt]); STRLCPY(fword, ptr, endlen[endidxcnt] + 1);
} }
if (!can_compound(slang, fword, mip->mi_compflags)) if (!can_compound(slang, fword, mip->mi_compflags))
continue; continue;
@@ -2274,7 +2274,7 @@ void spell_cat_line(char_u *buf, char_u *line, int maxlen)
n = (int)(p - line) + 1; n = (int)(p - line) + 1;
if (n < maxlen - 1) { if (n < maxlen - 1) {
memset(buf, ' ', n); memset(buf, ' ', n);
vim_strncpy(buf + n, p, maxlen - 1 - n); STRLCPY(buf + n, p, maxlen - n);
} }
} }
} }
@@ -3064,7 +3064,7 @@ count_common_word (
if (len == -1) if (len == -1)
p = word; p = word;
else { else {
vim_strncpy(buf, word, len); STRLCPY(buf, word, len + 1);
p = buf; p = buf;
} }
@@ -3354,7 +3354,7 @@ static int init_syl_tab(slang_T *slang)
ga_grow(&slang->sl_syl_items, 1); ga_grow(&slang->sl_syl_items, 1);
syl = ((syl_item_T *)slang->sl_syl_items.ga_data) syl = ((syl_item_T *)slang->sl_syl_items.ga_data)
+ slang->sl_syl_items.ga_len++; + slang->sl_syl_items.ga_len++;
vim_strncpy(syl->sy_chars, s, l); STRLCPY(syl->sy_chars, s, l + 1);
syl->sy_len = l; syl->sy_len = l;
} }
return OK; return OK;
@@ -3761,7 +3761,7 @@ char_u *did_set_spelllang(win_T *wp)
p = vim_strchr(path_tail(lang), '_'); p = vim_strchr(path_tail(lang), '_');
if (p != NULL && ASCII_ISALPHA(p[1]) && ASCII_ISALPHA(p[2]) if (p != NULL && ASCII_ISALPHA(p[1]) && ASCII_ISALPHA(p[2])
&& !ASCII_ISALPHA(p[3])) { && !ASCII_ISALPHA(p[3])) {
vim_strncpy(region_cp, p + 1, 2); STRLCPY(region_cp, p + 1, 3);
memmove(p, p + 3, len - (p - lang) - 2); memmove(p, p + 3, len - (p - lang) - 2);
len -= 3; len -= 3;
region = region_cp; region = region_cp;
@@ -3883,7 +3883,7 @@ char_u *did_set_spelllang(win_T *wp)
if (round == 0) if (round == 0)
STRCPY(lang, "internal wordlist"); STRCPY(lang, "internal wordlist");
else { else {
vim_strncpy(lang, path_tail(spf_name), MAXWLEN); STRLCPY(lang, path_tail(spf_name), MAXWLEN + 1);
p = vim_strchr(lang, '.'); p = vim_strchr(lang, '.');
if (p != NULL) if (p != NULL)
*p = NUL; // truncate at ".encoding.add" *p = NUL; // truncate at ".encoding.add"
@@ -4004,7 +4004,7 @@ static void use_midword(slang_T *lp, win_T *wp)
bp = vim_strnsave(wp->w_s->b_spell_ismw_mb, n + l); bp = vim_strnsave(wp->w_s->b_spell_ismw_mb, n + l);
free(wp->w_s->b_spell_ismw_mb); free(wp->w_s->b_spell_ismw_mb);
wp->w_s->b_spell_ismw_mb = bp; wp->w_s->b_spell_ismw_mb = bp;
vim_strncpy(bp + n, p, l); STRLCPY(bp + n, p, l + 1);
} }
p += l; p += l;
} else } else
@@ -4652,7 +4652,7 @@ static afffile_T *spell_read_aff(spellinfo_T *spin, char_u *fname)
// times. The affix files that do this have an undocumented // times. The affix files that do this have an undocumented
// "S" flag on all but the last block, thus we check for that // "S" flag on all but the last block, thus we check for that
// and store it in ah_follows. // and store it in ah_follows.
vim_strncpy(key, items[1], AH_KEY_LEN - 1); STRLCPY(key, items[1], AH_KEY_LEN);
hi = hash_find(tp, key); hi = hash_find(tp, key);
if (!HASHITEM_EMPTY(hi)) { if (!HASHITEM_EMPTY(hi)) {
cur_aff = HI2AH(hi); cur_aff = HI2AH(hi);
@@ -5223,7 +5223,7 @@ static void process_compflags(spellinfo_T *spin, afffile_T *aff, char_u *compfla
if (flag != 0) { if (flag != 0) {
// Find the flag in the hashtable. If it was used before, use // Find the flag in the hashtable. If it was used before, use
// the existing ID. Otherwise add a new entry. // the existing ID. Otherwise add a new entry.
vim_strncpy(key, prevp, p - prevp); STRLCPY(key, prevp, p - prevp + 1);
hi = hash_find(&aff->af_comp, key); hi = hash_find(&aff->af_comp, key);
if (!HASHITEM_EMPTY(hi)) if (!HASHITEM_EMPTY(hi))
id = HI2CI(hi)->ci_newID; id = HI2CI(hi)->ci_newID;
@@ -5612,7 +5612,7 @@ static int get_pfxlist(afffile_T *affile, char_u *afflist, char_u *store_afflist
if (get_affitem(affile->af_flagtype, &p) != 0) { if (get_affitem(affile->af_flagtype, &p) != 0) {
// A flag is a postponed prefix flag if it appears in "af_pref" // A flag is a postponed prefix flag if it appears in "af_pref"
// and it's ID is not zero. // and it's ID is not zero.
vim_strncpy(key, prevp, p - prevp); STRLCPY(key, prevp, p - prevp + 1);
hi = hash_find(&affile->af_pref, key); hi = hash_find(&affile->af_pref, key);
if (!HASHITEM_EMPTY(hi)) { if (!HASHITEM_EMPTY(hi)) {
id = HI2AH(hi)->ah_newID; id = HI2AH(hi)->ah_newID;
@@ -5643,7 +5643,7 @@ static void get_compflags(afffile_T *affile, char_u *afflist, char_u *store_affl
prevp = p; prevp = p;
if (get_affitem(affile->af_flagtype, &p) != 0) { if (get_affitem(affile->af_flagtype, &p) != 0) {
// A flag is a compound flag if it appears in "af_comp". // A flag is a compound flag if it appears in "af_comp".
vim_strncpy(key, prevp, p - prevp); STRLCPY(key, prevp, p - prevp + 1);
hi = hash_find(&affile->af_comp, key); hi = hash_find(&affile->af_comp, key);
if (!HASHITEM_EMPTY(hi)) if (!HASHITEM_EMPTY(hi))
store_afflist[cnt++] = HI2CI(hi)->ci_newID; store_afflist[cnt++] = HI2CI(hi)->ci_newID;
@@ -5738,7 +5738,7 @@ store_aff_word (
if (ae->ae_add == NULL) if (ae->ae_add == NULL)
*newword = NUL; *newword = NUL;
else else
vim_strncpy(newword, ae->ae_add, MAXWLEN - 1); STRLCPY(newword, ae->ae_add, MAXWLEN);
p = word; p = word;
if (ae->ae_chop != NULL) { if (ae->ae_chop != NULL) {
// Skip chop string. // Skip chop string.
@@ -5752,7 +5752,7 @@ store_aff_word (
STRCAT(newword, p); STRCAT(newword, p);
} else { } else {
// suffix: chop/add at the end of the word // suffix: chop/add at the end of the word
vim_strncpy(newword, word, MAXWLEN - 1); STRLCPY(newword, word, MAXWLEN);
if (ae->ae_chop != NULL) { if (ae->ae_chop != NULL) {
// Remove chop string. // Remove chop string.
p = newword + STRLEN(newword); p = newword + STRLEN(newword);
@@ -5834,7 +5834,7 @@ store_aff_word (
// Obey a "COMPOUNDFORBIDFLAG" of the affix: don't // Obey a "COMPOUNDFORBIDFLAG" of the affix: don't
// use the compound flags. // use the compound flags.
if (use_pfxlist != NULL && ae->ae_compforbid) { if (use_pfxlist != NULL && ae->ae_compforbid) {
vim_strncpy(pfx_pfxlist, use_pfxlist, use_pfxlen); STRLCPY(pfx_pfxlist, use_pfxlist, use_pfxlen + 1);
use_pfxlist = pfx_pfxlist; use_pfxlist = pfx_pfxlist;
} }
@@ -7188,7 +7188,7 @@ static void spell_make_sugfile(spellinfo_T *spin, char_u *wfname)
// Write the .sug file. // Write the .sug file.
// Make the file name by changing ".spl" to ".sug". // Make the file name by changing ".spl" to ".sug".
fname = xmalloc(MAXPATHL); fname = xmalloc(MAXPATHL);
vim_strncpy(fname, wfname, MAXPATHL - 1); STRLCPY(fname, wfname, MAXPATHL);
len = (int)STRLEN(fname); len = (int)STRLEN(fname);
fname[len - 2] = 'u'; fname[len - 2] = 'u';
fname[len - 1] = 'g'; fname[len - 1] = 'g';
@@ -7612,7 +7612,7 @@ mkspell (
fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc()); fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc());
} else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0) { } else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0) {
// Name ends in ".spl", use as the file name. // Name ends in ".spl", use as the file name.
vim_strncpy(wfname, fnames[0], MAXPATHL - 1); STRLCPY(wfname, fnames[0], MAXPATHL);
} else } else
// Name should be language, make the file name from it. // Name should be language, make the file name from it.
vim_snprintf((char *)wfname, MAXPATHL, SPL_FNAME_TMPL, vim_snprintf((char *)wfname, MAXPATHL, SPL_FNAME_TMPL,
@@ -7974,8 +7974,8 @@ static void init_spellfile(void)
if (aspath) if (aspath)
// Use directory of an entry with path, e.g., for // Use directory of an entry with path, e.g., for
// "/dir/lg.utf-8.spl" use "/dir". // "/dir/lg.utf-8.spl" use "/dir".
vim_strncpy(buf, curbuf->b_s.b_p_spl, STRLCPY(buf, curbuf->b_s.b_p_spl,
lstart - curbuf->b_s.b_p_spl - 1); lstart - curbuf->b_s.b_p_spl);
else else
// Copy the path from 'runtimepath' to buf[]. // Copy the path from 'runtimepath' to buf[].
copy_option_part(&rtp, buf, MAXPATHL, ","); copy_option_part(&rtp, buf, MAXPATHL, ",");
@@ -7983,8 +7983,8 @@ static void init_spellfile(void)
// Use the first language name from 'spelllang' and the // Use the first language name from 'spelllang' and the
// encoding used in the first loaded .spl file. // encoding used in the first loaded .spl file.
if (aspath) if (aspath)
vim_strncpy(buf, curbuf->b_s.b_p_spl, STRLCPY(buf, curbuf->b_s.b_p_spl,
lend - curbuf->b_s.b_p_spl); lend - curbuf->b_s.b_p_spl + 1);
else { else {
// Create the "spell" directory if it doesn't exist yet. // Create the "spell" directory if it doesn't exist yet.
l = (int)STRLEN(buf); l = (int)STRLEN(buf);
@@ -8530,11 +8530,11 @@ void spell_suggest(int count)
// The suggested word may replace only part of the bad word, add // The suggested word may replace only part of the bad word, add
// the not replaced part. // the not replaced part.
vim_strncpy(wcopy, stp->st_word, MAXWLEN); STRLCPY(wcopy, stp->st_word, MAXWLEN + 1);
if (sug.su_badlen > stp->st_orglen) if (sug.su_badlen > stp->st_orglen)
vim_strncpy(wcopy + stp->st_wordlen, STRLCPY(wcopy + stp->st_wordlen,
sug.su_badptr + stp->st_orglen, sug.su_badptr + stp->st_orglen,
sug.su_badlen - stp->st_orglen); sug.su_badlen - stp->st_orglen + 1);
vim_snprintf((char *)IObuff, IOSIZE, "%2d", i + 1); vim_snprintf((char *)IObuff, IOSIZE, "%2d", i + 1);
if (cmdmsg_rl) if (cmdmsg_rl)
rl_mirror(IObuff); rl_mirror(IObuff);
@@ -8816,7 +8816,7 @@ spell_find_suggest (
if (su->su_badlen >= MAXWLEN) if (su->su_badlen >= MAXWLEN)
su->su_badlen = MAXWLEN - 1; // just in case su->su_badlen = MAXWLEN - 1; // just in case
vim_strncpy(su->su_badword, su->su_badptr, su->su_badlen); STRLCPY(su->su_badword, su->su_badptr, su->su_badlen + 1);
(void)spell_casefold(su->su_badptr, su->su_badlen, (void)spell_casefold(su->su_badptr, su->su_badlen,
su->su_fbadword, MAXWLEN); su->su_fbadword, MAXWLEN);
// get caps flags for bad word // get caps flags for bad word
@@ -9259,7 +9259,7 @@ onecap_copy (
l = 1; l = 1;
wcopy[0] = c; wcopy[0] = c;
} }
vim_strncpy(wcopy + l, p, MAXWLEN - l - 1); STRLCPY(wcopy + l, p, MAXWLEN - l);
} }
// Make a copy of "word" with all the letters upper cased into // Make a copy of "word" with all the letters upper cased into
@@ -9625,9 +9625,9 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, int sou
compflags[sp->ts_complen] = ((unsigned)flags >> 24); compflags[sp->ts_complen] = ((unsigned)flags >> 24);
compflags[sp->ts_complen + 1] = NUL; compflags[sp->ts_complen + 1] = NUL;
vim_strncpy(preword + sp->ts_prewordlen, STRLCPY(preword + sp->ts_prewordlen,
tword + sp->ts_splitoff, tword + sp->ts_splitoff,
sp->ts_twordlen - sp->ts_splitoff); sp->ts_twordlen - sp->ts_splitoff + 1);
// Verify CHECKCOMPOUNDPATTERN rules. // Verify CHECKCOMPOUNDPATTERN rules.
if (match_checkcompoundpattern(preword, sp->ts_prewordlen, if (match_checkcompoundpattern(preword, sp->ts_prewordlen,
@@ -10968,8 +10968,8 @@ stp_sal_score (
// Add part of the bad word to the good word, so that we soundfold // Add part of the bad word to the good word, so that we soundfold
// what replaces the bad word. // what replaces the bad word.
STRCPY(goodword, stp->st_word); STRCPY(goodword, stp->st_word);
vim_strncpy(goodword + stp->st_wordlen, STRLCPY(goodword + stp->st_wordlen,
su->su_badptr + su->su_badlen - lendiff, lendiff); su->su_badptr + su->su_badlen - lendiff, lendiff + 1);
pgood = goodword; pgood = goodword;
} else } else
pgood = stp->st_word; pgood = stp->st_word;
@@ -11545,10 +11545,10 @@ check_suggestions (
stp = &SUG(*gap, 0); stp = &SUG(*gap, 0);
for (int i = gap->ga_len - 1; i >= 0; --i) { for (int i = gap->ga_len - 1; i >= 0; --i) {
// Need to append what follows to check for "the the". // Need to append what follows to check for "the the".
vim_strncpy(longword, stp[i].st_word, MAXWLEN); STRLCPY(longword, stp[i].st_word, MAXWLEN + 1);
len = stp[i].st_wordlen; len = stp[i].st_wordlen;
vim_strncpy(longword + len, su->su_badptr + stp[i].st_orglen, STRLCPY(longword + len, su->su_badptr + stp[i].st_orglen,
MAXWLEN - len); MAXWLEN - len + 1);
attr = HLF_COUNT; attr = HLF_COUNT;
(void)spell_check(curwin, longword, &attr, NULL, FALSE); (void)spell_check(curwin, longword, &attr, NULL, FALSE);
if (attr != HLF_COUNT) { if (attr != HLF_COUNT) {
@@ -11815,7 +11815,7 @@ static void spell_soundfold_sal(slang_T *slang, char_u *inword, char_u *res)
} }
*t = NUL; *t = NUL;
} else } else
vim_strncpy(word, s, MAXWLEN - 1); STRLCPY(word, s, MAXWLEN);
smp = (salitem_T *)slang->sl_sal.ga_data; smp = (salitem_T *)slang->sl_sal.ga_data;
@@ -13269,7 +13269,7 @@ dump_prefixes (
c = valid_word_prefix(i, n, flags, word, slang, FALSE); c = valid_word_prefix(i, n, flags, word, slang, FALSE);
if (c != 0) { if (c != 0) {
vim_strncpy(prefix + depth, word, MAXWLEN - depth - 1); STRLCPY(prefix + depth, word, MAXWLEN - depth);
dump_word(slang, prefix, pat, dir, dumpflags, dump_word(slang, prefix, pat, dir, dumpflags,
(c & WF_RAREPFX) ? (flags | WF_RARE) (c & WF_RAREPFX) ? (flags | WF_RARE)
: flags, lnum); : flags, lnum);
@@ -13284,8 +13284,7 @@ dump_prefixes (
c = valid_word_prefix(i, n, flags, word_up, slang, c = valid_word_prefix(i, n, flags, word_up, slang,
TRUE); TRUE);
if (c != 0) { if (c != 0) {
vim_strncpy(prefix + depth, word_up, STRLCPY(prefix + depth, word_up, MAXWLEN - depth);
MAXWLEN - depth - 1);
dump_word(slang, prefix, pat, dir, dumpflags, dump_word(slang, prefix, pat, dir, dumpflags,
(c & WF_RAREPFX) ? (flags | WF_RARE) (c & WF_RAREPFX) ? (flags | WF_RARE)
: flags, lnum); : flags, lnum);