7.3.017

   1 To: vim-dev@vim.org
   2 Subject: Patch 7.3.017
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.017
  11 Problem:    smatch reports errors.
  12 Solution:   Fix the reported errors. (Dominique Pelle)
  13 Files:      src/spell.c, src/syntax.c
  14
  15
  16 *** ../vim-7.3.016/src/spell.c  2010-09-18 13:36:41.000000000 +0200
  17 --- src/spell.c 2010-09-29 18:25:09.000000000 +0200
  18 ***************
  19 *** 4951,4957 ****
  20       char_u    *si_info;       /* info text chars or NULL  */
  21       int               si_region_count; /* number of regions supported (1 when there
  22                                     are no regions) */
  23 !     char_u    si_region_name[16]; /* region names; used only if
  24                                      * si_region_count > 1) */
  25
  26       garray_T  si_rep;         /* list of fromto_T entries from REP lines */
  27 --- 4951,4957 ----
  28       char_u    *si_info;       /* info text chars or NULL  */
  29       int               si_region_count; /* number of regions supported (1 when there
  30                                     are no regions) */
  31 !     char_u    si_region_name[17]; /* region names; used only if
  32                                      * si_region_count > 1) */
  33
  34       garray_T  si_rep;         /* list of fromto_T entries from REP lines */
  35 ***************
  36 *** 9530,9536 ****
  37             if (aspath)
  38                 /* Use directory of an entry with path, e.g., for
  39                  * "/dir/lg.utf-8.spl" use "/dir". */
  40 !               vim_strncpy(buf, curbuf->b_s.b_p_spl, lstart - curbuf->b_s.b_p_spl - 1);
  41             else
  42                 /* Copy the path from 'runtimepath' to buf[]. */
  43                 copy_option_part(&rtp, buf, MAXPATHL, ",");
  44 --- 9530,9537 ----
  45             if (aspath)
  46                 /* Use directory of an entry with path, e.g., for
  47                  * "/dir/lg.utf-8.spl" use "/dir". */
  48 !               vim_strncpy(buf, curbuf->b_s.b_p_spl,
  49 !                                           lstart - curbuf->b_s.b_p_spl - 1);
  50             else
  51                 /* Copy the path from 'runtimepath' to buf[]. */
  52                 copy_option_part(&rtp, buf, MAXPATHL, ",");
  53 ***************
  54 *** 9539,9551 ****
  55                 /* Use the first language name from 'spelllang' and the
  56                  * encoding used in the first loaded .spl file. */
  57                 if (aspath)
  58 !                   vim_strncpy(buf, curbuf->b_s.b_p_spl, lend - curbuf->b_s.b_p_spl);
  59                 else
  60                 {
  61                     /* Create the "spell" directory if it doesn't exist yet. */
  62                     l = (int)STRLEN(buf);
  63                     vim_snprintf((char *)buf + l, MAXPATHL - l, "/spell");
  64 !                   if (!filewritable(buf) != 2)
  65                         vim_mkdir(buf, 0755);
  66
  67                     l = (int)STRLEN(buf);
  68 --- 9540,9553 ----
  69                 /* Use the first language name from 'spelllang' and the
  70                  * encoding used in the first loaded .spl file. */
  71                 if (aspath)
  72 !                   vim_strncpy(buf, curbuf->b_s.b_p_spl,
  73 !                                                 lend - curbuf->b_s.b_p_spl);
  74                 else
  75                 {
  76                     /* Create the "spell" directory if it doesn't exist yet. */
  77                     l = (int)STRLEN(buf);
  78                     vim_snprintf((char *)buf + l, MAXPATHL - l, "/spell");
  79 !                   if (filewritable(buf) != 2)
  80                         vim_mkdir(buf, 0755);
  81
  82                     l = (int)STRLEN(buf);
  83 *** ../vim-7.3.016/src/syntax.c 2010-08-15 21:57:32.000000000 +0200
  84 --- src/syntax.c        2010-09-29 18:28:26.000000000 +0200
  85 ***************
  86 *** 7600,7609 ****
  87                 /*
  88                  * Copy characters from arg[] to buf[], translating <> codes.
  89                  */
  90 !               for (p = arg, off = 0; off < 100 && *p; )
  91                 {
  92                     len = trans_special(&p, buf + off, FALSE);
  93 !                   if (len)                /* recognized special char */
  94                         off += len;
  95                     else                    /* copy as normal char */
  96                         buf[off++] = *p++;
  97 --- 7600,7609 ----
  98                 /*
  99                  * Copy characters from arg[] to buf[], translating <> codes.
 100                  */
 101 !               for (p = arg, off = 0; off < 100 - 6 && *p; )
 102                 {
 103                     len = trans_special(&p, buf + off, FALSE);
 104 !                   if (len > 0)            /* recognized special char */
 105                         off += len;
 106                     else                    /* copy as normal char */
 107                         buf[off++] = *p++;
 108 *** ../vim-7.3.016/src/version.c        2010-09-29 17:26:57.000000000 +0200
 109 --- src/version.c       2010-09-29 17:47:27.000000000 +0200
 110 ***************
 111 *** 716,717 ****
 112 --- 716,719 ----
 113   {   /* Add new patch number below this line */
 114 + /**/
 115 +     17,
 116   /**/
 117
 118 --
 119 A computer without Windows is like a fish without a bicycle.
 120
 121  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 122 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 123 \\\        download, build and distribute -- http://www.A-A-P.org        ///
 124  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///