JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

strchr related fixes

Browse Source
This commit is contained in:
tg 2009-12-05 22:19:42 +00:00
parent df51db99c9
commit 65a3713605
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit.c
View File

@ -25,7 +25,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.185 2009/12/05 17:43:44 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.186 2009/12/05 22:19:41 tg Exp $");
/* tty driver characters we are interested in */
typedef struct {
@ -3891,7 +3891,7 @@ vi_cmd(int argcnt, const char *cmd)
return (-1);
/* check if this is a recursive call... */
if ((p = (char *)macro.p))
while ((p = strchr(p, '\0')) && p[1])
while ((p = strnul(p)) && p[1])
if (*++p == cmd[1])
return (-1);
/* insert alias into macro buffer */

3
sh.h
View File

@ -134,7 +134,7 @@
#endif
#ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.368 2009/12/05 17:43:49 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.369 2009/12/05 22:19:42 tg Exp $");
#endif
#define MKSH_VERSION "R39 2009/12/05"
@ -392,6 +392,7 @@ union mksh_ccphack {
!defined(__INTEL_COMPILER) && !defined(__SUNPRO_C)
char *ucstrchr(char *, int);
char *ucstrstr(char *, const char *);
#undef strchr
#define strchr ucstrchr
#define strstr ucstrstr
#define cstrchr(s,c) ({ \