]>
Commit | Line | Data |
---|---|---|
eb0ac1ae AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.138 (extra) | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 6.2.138 (extra) | |
11 | Problem: Compilation problem on VMS with dynamic buffer on the stack. | |
12 | Solution: Read one byte less than the size of the buffer, so that we can | |
13 | check for the string length without an extra buffer. | |
14 | Files: src/os_vms.c | |
15 | ||
16 | ||
17 | *** ../vim-6.2.137/src/os_vms.c Sun May 4 22:44:43 2003 | |
18 | --- src/os_vms.c Mon Oct 20 20:00:01 2003 | |
19 | *************** | |
20 | *** 299,305 **** | |
21 | int | |
22 | vms_read(char *inbuf, size_t nbytes) | |
23 | { | |
24 | - char ibuf[nbytes]; | |
25 | int status, function, len; | |
26 | float wait = 0.05; | |
27 | TT_MODE tt_mode; | |
28 | --- 298,303 ---- | |
29 | *************** | |
30 | *** 309,325 **** | |
31 | tt_mode = get_tty(); | |
32 | ||
33 | function = (IO$_READLBLK | IO$M_NOECHO | IO$M_TIMED | IO$M_ESCAPE); | |
34 | ! memset(ibuf, 0, sizeof(ibuf)); | |
35 | ||
36 | while (1) | |
37 | { | |
38 | ! status = sys$qiow(0,iochan,function,&iosb,0,0,&ibuf,nbytes,0,0,0,0); | |
39 | ! len = strlen(ibuf); | |
40 | if (len > 0) | |
41 | - { | |
42 | - mch_memmove(inbuf, ibuf, len); | |
43 | break; | |
44 | - } | |
45 | lib$wait(&wait); | |
46 | } | |
47 | return len; | |
48 | --- 307,320 ---- | |
49 | tt_mode = get_tty(); | |
50 | ||
51 | function = (IO$_READLBLK | IO$M_NOECHO | IO$M_TIMED | IO$M_ESCAPE); | |
52 | ! memset(inbuf, 0, nbytes); | |
53 | ||
54 | while (1) | |
55 | { | |
56 | ! status = sys$qiow(0,iochan,function,&iosb,0,0,inbuf,nbytes-1,0,0,0,0); | |
57 | ! len = strlen(inbuf); | |
58 | if (len > 0) | |
59 | break; | |
60 | lib$wait(&wait); | |
61 | } | |
62 | return len; | |
63 | *** ../vim-6.2.137/src/version.c Wed Oct 29 14:37:09 2003 | |
64 | --- src/version.c Wed Oct 29 14:38:52 2003 | |
65 | *************** | |
66 | *** 639,640 **** | |
67 | --- 639,642 ---- | |
68 | { /* Add new patch number below this line */ | |
69 | + /**/ | |
70 | + 138, | |
71 | /**/ | |
72 | ||
73 | -- | |
74 | Q: How do you tell the difference between a female cat and a male cat? | |
75 | A: You ask it a question and if HE answers, it's a male but, if SHE | |
76 | answers, it's a female. | |
77 | ||
78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
79 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
80 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
81 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |