Mercurial > vim
diff src/memline.c @ 9387:f094d4085014 v7.4.1975
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jul 1 17:17:39 2016 +0200
patch 7.4.1975
Problem: On MS-Windows large files (> 2Gbyte) cause problems.
Solution: Use "off_T" instead of "off_t". Use "stat_T" instead of "struct
stat". Use 64 bit system functions if available. (Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 01 Jul 2016 17:30:07 +0200 |
| parents | 0a5adc97fac8 |
| children | b2aada04d84e |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -266,7 +266,7 @@ static long char_to_long(char_u *); static char_u *make_percent_swname(char_u *dir, char_u *name); #endif #ifdef FEAT_CRYPT -static cryptstate_T *ml_crypt_prepare(memfile_T *mfp, off_t offset, int reading); +static cryptstate_T *ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading); #endif #ifdef FEAT_BYTEOFF static void ml_updatechunk(buf_T *buf, long line, long len, int updtype); @@ -973,7 +973,7 @@ ml_upd_block0(buf_T *buf, upd_block0_T w static void set_b0_fname(ZERO_BL *b0p, buf_T *buf) { - struct stat st; + stat_T st; if (buf->b_ffname == NULL) b0p->b0_fname[0] = NUL; @@ -1114,7 +1114,7 @@ ml_recover(void) infoptr_T *ip; blocknr_T bnum; int page_count; - struct stat org_stat, swp_stat; + stat_T org_stat, swp_stat; int len; int directly; linenr_T lnum; @@ -1127,7 +1127,7 @@ ml_recover(void) int idx; int top; int txt_start; - off_t size; + off_T size; int called_from_main; int serious_error = TRUE; long mtime; @@ -1323,7 +1323,7 @@ ml_recover(void) msg_end(); goto theend; } - if ((size = lseek(mfp->mf_fd, (off_t)0L, SEEK_END)) <= 0) + if ((size = vim_lseek(mfp->mf_fd, (off_T)0L, SEEK_END)) <= 0) mfp->mf_blocknr_max = 0; /* no file or empty file */ else mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size); @@ -1908,7 +1908,7 @@ recover_names( */ if (*dirp == NUL && file_count + num_files == 0 && fname != NULL) { - struct stat st; + stat_T st; char_u *swapname; swapname = modname(fname_res, @@ -2049,7 +2049,7 @@ static int process_still_running; static time_t swapfile_info(char_u *fname) { - struct stat st; + stat_T st; int fd; struct block0 b0; time_t x = (time_t)0; @@ -2262,7 +2262,7 @@ end: ml_sync_all(int check_file, int check_char) { buf_T *buf; - struct stat st; + stat_T st; for (buf = firstbuf; buf != NULL; buf = buf->b_next) { @@ -4029,7 +4029,7 @@ attention_message( buf_T *buf, /* buffer being edited */ char_u *fname) /* swap file name */ { - struct stat st; + stat_T st; time_t x, sx; char *p; @@ -4207,7 +4207,7 @@ findswapname( { char_u *tail; char_u *fname2; - struct stat s1, s2; + stat_T s1, s2; int f1, f2; int created1 = FALSE, created2 = FALSE; int same = FALSE; @@ -4296,7 +4296,7 @@ findswapname( if (mch_getperm(fname) < 0) /* it does not exist */ { #ifdef HAVE_LSTAT - struct stat sb; + stat_T sb; /* * Extra security check: When a swap file is a symbolic link, this @@ -4663,7 +4663,7 @@ fnamecmp_ino( char_u *fname_s, /* file name from swap file */ long ino_block0) { - struct stat st; + stat_T st; ino_t ino_c = 0; /* ino of current file */ ino_t ino_s; /* ino of file from swap file */ char_u buf_c[MAXPATHL]; /* full path of fname_c */ @@ -4780,7 +4780,7 @@ ml_setflags(buf_T *buf) ml_encrypt_data( memfile_T *mfp, char_u *data, - off_t offset, + off_T offset, unsigned size) { DATA_BL *dp = (DATA_BL *)data; @@ -4825,7 +4825,7 @@ ml_encrypt_data( ml_decrypt_data( memfile_T *mfp, char_u *data, - off_t offset, + off_T offset, unsigned size) { DATA_BL *dp = (DATA_BL *)data; @@ -4859,7 +4859,7 @@ ml_decrypt_data( * Return an allocated cryptstate_T *. */ static cryptstate_T * -ml_crypt_prepare(memfile_T *mfp, off_t offset, int reading) +ml_crypt_prepare(memfile_T *mfp, off_T offset, int reading) { buf_T *buf = mfp->mf_buffer; char_u salt[50];