diff options
| author | vimboss <devnull@localhost> | 2008-11-29 19:19:19 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-11-29 19:19:19 +0000 |
| commit | f49a19f13269dfe8ca315588bdd0f9733e639c90 (patch) | |
| tree | e56ec8d0d77f61ba099f41ce704baf2f9be7d665 | |
| parent | 8bd8e2ad48c51ee92482646209f7b90326c87c2b (diff) | |
| download | vim-f49a19f13269dfe8ca315588bdd0f9733e639c90.tar.gz | |
| -rw-r--r-- | src/spell.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/spell.c b/src/spell.c index 058f7d68..8c9a8918 100644 --- a/src/spell.c +++ b/src/spell.c @@ -7926,7 +7926,7 @@ write_vim_spell(spin, fname) char_u *p; int rr; int retval = OK; - int fwv = 1; /* collect return value of fwrite() to avoid + size_t fwv = 1; /* collect return value of fwrite() to avoid warnings from picky compiler */ fd = mch_fopen((char *)fname, "w"); @@ -7939,6 +7939,10 @@ write_vim_spell(spin, fname) /* <HEADER>: <fileID> <versionnr> */ /* <fileID> */ fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd); + if (fwv != (size_t)1) + /* Catch first write error, don't try writing more. */ + goto theend; + putc(VIMSPELLVERSION, fd); /* <versionnr> */ /* @@ -8300,11 +8304,11 @@ write_vim_spell(spin, fname) /* Write another byte to check for errors (file system full). */ if (putc(0, fd) == EOF) retval = FAIL; - +theend: if (fclose(fd) == EOF) retval = FAIL; - if (fwv != 1) + if (fwv != (size_t)1) retval = FAIL; if (retval == FAIL) EMSG(_(e_write)); @@ -9897,7 +9901,7 @@ write_spell_prefcond(fd, gap) char_u *p; int len; int totlen; - int x = 1; /* collect return value of fwrite() */ + size_t x = 1; /* collect return value of fwrite() */ if (fd != NULL) put_bytes(fd, (long_u)gap->ga_len, 2); /* <prefcondcnt> */ diff --git a/src/version.c b/src/version.c index bba1c7c6..7929ff0a 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 57, +/**/ 56, /**/ 55, |