Mercurial > vim

comparison src/fileio.c @ 2717:f85fe1a05c2a v7.3.133

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.133 Problem: When using encryption it's not clear what method was used. Solution: In the file message show "blowfish" when using blowfish.
author Bram Moolenaar <bram@vim.org>
date Fri, 25 Feb 2011 16:52:17 +0100
parents cd3f52531f6c
children 25672ad7f377
comparison
equal deleted inserted replaced
2716:0b4a515b1254 2717:f85fe1a05c2a
248 off_t filesize = 0; 248 off_t filesize = 0;
249 int skip_read = FALSE; 249 int skip_read = FALSE;
250 #ifdef FEAT_CRYPT 250 #ifdef FEAT_CRYPT
251 char_u *cryptkey = NULL; 251 char_u *cryptkey = NULL;
252 int did_ask_for_key = FALSE; 252 int did_ask_for_key = FALSE;
253 int crypt_method_used;
253 #endif 254 #endif
254 #ifdef FEAT_PERSISTENT_UNDO 255 #ifdef FEAT_PERSISTENT_UNDO
255 context_sha256_T sha_ctx; 256 context_sha256_T sha_ctx;
256 int read_undo_file = FALSE; 257 int read_undo_file = FALSE;
257 #endif 258 #endif
2287 2288
2288 if (set_options) 2289 if (set_options)
2289 save_file_ff(curbuf); /* remember the current file format */ 2290 save_file_ff(curbuf); /* remember the current file format */
2290 2291
2291 #ifdef FEAT_CRYPT 2292 #ifdef FEAT_CRYPT
2293 crypt_method_used = use_crypt_method;
2292 if (cryptkey != NULL) 2294 if (cryptkey != NULL)
2293 { 2295 {
2294 crypt_pop_state(); 2296 crypt_pop_state();
2295 if (cryptkey != curbuf->b_p_key) 2297 if (cryptkey != curbuf->b_p_key)
2296 free_crypt_key(cryptkey); 2298 free_crypt_key(cryptkey);
2481 } 2483 }
2482 #endif 2484 #endif
2483 #ifdef FEAT_CRYPT 2485 #ifdef FEAT_CRYPT
2484 if (cryptkey != NULL) 2486 if (cryptkey != NULL)
2485 { 2487 {
2486 STRCAT(IObuff, _("[crypted]")); 2488 if (crypt_method_used == 1)
2489 STRCAT(IObuff, _("[blowfish]"));
2490 else
2491 STRCAT(IObuff, _("[crypted]"));
2487 c = TRUE; 2492 c = TRUE;
2488 } 2493 }
2489 #endif 2494 #endif
2490 #ifdef FEAT_MBYTE 2495 #ifdef FEAT_MBYTE
2491 if (conv_error != 0) 2496 if (conv_error != 0)
3196 backup or new file */ 3201 backup or new file */
3197 #endif 3202 #endif
3198 #ifdef FEAT_PERSISTENT_UNDO 3203 #ifdef FEAT_PERSISTENT_UNDO
3199 int write_undo_file = FALSE; 3204 int write_undo_file = FALSE;
3200 context_sha256_T sha_ctx; 3205 context_sha256_T sha_ctx;
3206 #endif
3207 #ifdef FEAT_CRYPT
3208 int crypt_method_used;
3201 #endif 3209 #endif
3202 3210
3203 if (fname == NULL || *fname == NUL) /* safety check */ 3211 if (fname == NULL || *fname == NUL) /* safety check */
3204 return FAIL; 3212 return FAIL;
3205 if (buf->b_ml.ml_mfp == NULL) 3213 if (buf->b_ml.ml_mfp == NULL)
4726 * ACL on a file the user doesn't own). */ 4734 * ACL on a file the user doesn't own). */
4727 if (!backup_copy) 4735 if (!backup_copy)
4728 mch_set_acl(wfname, acl); 4736 mch_set_acl(wfname, acl);
4729 #endif 4737 #endif
4730 #ifdef FEAT_CRYPT 4738 #ifdef FEAT_CRYPT
4739 crypt_method_used = use_crypt_method;
4731 if (wb_flags & FIO_ENCRYPTED) 4740 if (wb_flags & FIO_ENCRYPTED)
4732 crypt_pop_state(); 4741 crypt_pop_state();
4733 #endif 4742 #endif
4734 4743
4735 4744
4880 if (msg_add_fileformat(fileformat)) 4889 if (msg_add_fileformat(fileformat))
4881 c = TRUE; 4890 c = TRUE;
4882 #ifdef FEAT_CRYPT 4891 #ifdef FEAT_CRYPT
4883 if (wb_flags & FIO_ENCRYPTED) 4892 if (wb_flags & FIO_ENCRYPTED)
4884 { 4893 {
4885 STRCAT(IObuff, _("[crypted]")); 4894 if (crypt_method_used == 1)
4895 STRCAT(IObuff, _("[blowfish]"));
4896 else
4897 STRCAT(IObuff, _("[crypted]"));
4886 c = TRUE; 4898 c = TRUE;
4887 } 4899 }
4888 #endif 4900 #endif
4889 msg_add_lines(c, (long)lnum, nchars); /* add line/char count */ 4901 msg_add_lines(c, (long)lnum, nchars); /* add line/char count */
4890 if (!shortmess(SHM_WRITE)) 4902 if (!shortmess(SHM_WRITE))