* Some build fixes for diet libc have been made.

This commit is contained in:
Gunnar Ritter 2005-01-16 13:47:23 +00:00
parent bac07daedd
commit 3a23482887
5 changed files with 16 additions and 5 deletions

View File

@ -35,6 +35,7 @@ Release ...
following 'p' vi command pasted the text affected by the former vi command. following 'p' vi command pasted the text affected by the former vi command.
It now pastes the text of the last yank or delete even if that was an ex It now pastes the text of the last yank or delete even if that was an ex
command. command.
* Some build fixes for diet libc have been made.
Release 12/2/04 Release 12/2/04
* Support for multibyte character locales was added. * Support for multibyte character locales was added.

View File

@ -73,7 +73,7 @@
#ifndef lint #ifndef lint
#ifdef DOSCCS #ifdef DOSCCS
static char sccsid[] = "@(#)ex_put.c 1.27 (gritter) 1/13/05"; static char sccsid[] = "@(#)ex_put.c 1.28 (gritter) 1/16/05";
#endif #endif
#endif #endif
@ -1120,12 +1120,14 @@ ttcharoff(void)
long vdis; long vdis;
errno = 0; errno = 0;
#ifndef __dietlibc__
vdis = fpathconf(1, _PC_VDISABLE); vdis = fpathconf(1, _PC_VDISABLE);
if (errno) if (errno)
/* /*
* Use the old value of 0377, hope it is not * Use the old value of 0377, hope it is not
* the user's favourite character. * the user's favourite character.
*/ */
#endif /* !__dietlibc__ */
vdis = '\377'; vdis = '\377';
#else /* !_PC_VDISABLE */ #else /* !_PC_VDISABLE */
#define vdis '\377'; #define vdis '\377';

View File

@ -70,12 +70,12 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* Sccsid @(#)ex_version.c 1.115 (gritter) 1/13/05 * Sccsid @(#)ex_version.c 1.116 (gritter) 1/16/05
*/ */
#include "ex.h" #include "ex.h"
static char *versionstring = "@(#)Version 4.0 (gritter) 1/13/05"; static char *versionstring = "@(#)Version 4.0 (gritter) 1/16/05";
void void
printver(void) printver(void)

View File

@ -73,7 +73,7 @@
#ifndef lint #ifndef lint
#ifdef DOSCCS #ifdef DOSCCS
static char sccsid[] = "@(#)ex_vget.c 1.26 (gritter) 11/27/04"; static char sccsid[] = "@(#)ex_vget.c 1.27 (gritter) 1/16/05";
#endif #endif
#endif #endif
@ -579,10 +579,14 @@ imacpush(int *ip, int canundo)
char buf[BUFSIZ], *bp = buf; char buf[BUFSIZ], *bp = buf;
int n; int n;
#ifdef MB
do { do {
n = wctomb(bp, *ip&TRIM); n = wctomb(bp, *ip&TRIM);
bp += n; bp += n;
} while (*ip++); } while (*ip++);
#else /* !MB */
while (*bp++ = *ip++);
#endif /* !MB */
macpush(buf, canundo); macpush(buf, canundo);
} }

View File

@ -73,7 +73,7 @@
#ifndef lint #ifndef lint
#ifdef DOSCCS #ifdef DOSCCS
static char sccsid[] = "@(#)ex_vput.c 1.41 (gritter) 1/13/05"; static char sccsid[] = "@(#)ex_vput.c 1.42 (gritter) 1/16/05";
#endif #endif
#endif #endif
@ -600,8 +600,10 @@ vinschar(int c)
return c; return c;
} }
vputchar(c); vputchar(c);
#ifdef MB
if (insmc1 == 0 && (vtube0[destcol]&(TRIM|MULTICOL))==MULTICOL) if (insmc1 == 0 && (vtube0[destcol]&(TRIM|MULTICOL))==MULTICOL)
vtube0[destcol] = INVBIT; vtube0[destcol] = INVBIT;
#endif /* MB */
if (DEPTH(vcline) * WCOLS + !value(REDRAW) > if (DEPTH(vcline) * WCOLS + !value(REDRAW) >
(destline - LINE(vcline)) * WCOLS + destcol) (destline - LINE(vcline)) * WCOLS + destcol)
return c; return c;
@ -686,9 +688,11 @@ vinschar(int c)
endim(); endim();
if (inscol + insmc0 != linend) if (inscol + insmc0 != linend)
doomed -= inssiz + insmc1; doomed -= inssiz + insmc1;
#ifdef MB
if (insmc1 == 0 && c != '\t' && if (insmc1 == 0 && c != '\t' &&
vtube0[inscol+insmc0] & MULTICOL) vtube0[inscol+insmc0] & MULTICOL)
vtube0[inscol+insmc0] = INVBIT; vtube0[inscol+insmc0] = INVBIT;
#endif /* MB */
do do
vputchar(c); vputchar(c);
while (--inssiz); while (--inssiz);