Mercurial > vim
comparison src/memline.c @ 419:f713fc55bf7b v7.0109
updated for version 7.0109
author | vimboss |
---|---|
date | Mon, 18 Jul 2005 21:58:11 +0000 |
parents | 575dacb554d8 |
children | 7f2d3b3c15a2 |
comparison
equal
deleted
inserted
replaced
418:84825cc6f049 | 419:f713fc55bf7b |
---|---|
696 { | 696 { |
697 #if defined(MSDOS) || defined(MSWIN) || defined(AMIGA) || defined(RISCOS) | 697 #if defined(MSDOS) || defined(MSWIN) || defined(AMIGA) || defined(RISCOS) |
698 /* Systems that cannot translate "~user" back into a path: copy the | 698 /* Systems that cannot translate "~user" back into a path: copy the |
699 * file name unmodified. Do use slashes instead of backslashes for | 699 * file name unmodified. Do use slashes instead of backslashes for |
700 * portability. */ | 700 * portability. */ |
701 STRNCPY(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE); | 701 vim_strncpy(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE - 1); |
702 b0p->b0_fname[B0_FNAME_SIZE - 1] = NUL; | |
703 # ifdef BACKSLASH_IN_FILENAME | 702 # ifdef BACKSLASH_IN_FILENAME |
704 forward_slash(b0p->b0_fname); | 703 forward_slash(b0p->b0_fname); |
705 # endif | 704 # endif |
706 #else | 705 #else |
707 size_t flen, ulen; | 706 size_t flen, ulen; |
719 { | 718 { |
720 flen = STRLEN(b0p->b0_fname); | 719 flen = STRLEN(b0p->b0_fname); |
721 /* If there is no user name or it is too long, don't use "~/" */ | 720 /* If there is no user name or it is too long, don't use "~/" */ |
722 if (get_user_name(uname, B0_UNAME_SIZE) == FAIL | 721 if (get_user_name(uname, B0_UNAME_SIZE) == FAIL |
723 || (ulen = STRLEN(uname)) + flen > B0_FNAME_SIZE - 1) | 722 || (ulen = STRLEN(uname)) + flen > B0_FNAME_SIZE - 1) |
724 { | 723 vim_strncpy(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE - 1); |
725 STRNCPY(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE); | |
726 b0p->b0_fname[B0_FNAME_SIZE - 1] = NUL; | |
727 } | |
728 else | 724 else |
729 { | 725 { |
730 mch_memmove(b0p->b0_fname + ulen + 1, b0p->b0_fname + 1, flen); | 726 mch_memmove(b0p->b0_fname + ulen + 1, b0p->b0_fname + 1, flen); |
731 mch_memmove(b0p->b0_fname + 1, uname, ulen); | 727 mch_memmove(b0p->b0_fname + 1, uname, ulen); |
732 } | 728 } |