fix cast; bump version
This commit is contained in:
4
check.t
4
check.t
@ -1,4 +1,4 @@
|
|||||||
# $MirOS: src/bin/mksh/check.t,v 1.429 2011/03/16 20:56:30 tg Exp $
|
# $MirOS: src/bin/mksh/check.t,v 1.430 2011/03/17 22:09:20 tg Exp $
|
||||||
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
|
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
|
||||||
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
|
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
|
||||||
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
|
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
|
||||||
@ -25,7 +25,7 @@
|
|||||||
# http://www.research.att.com/~gsf/public/ifs.sh
|
# http://www.research.att.com/~gsf/public/ifs.sh
|
||||||
|
|
||||||
expected-stdout:
|
expected-stdout:
|
||||||
@(#)MIRBSD KSH R39 2011/03/16
|
@(#)MIRBSD KSH R39 2011/03/17
|
||||||
description:
|
description:
|
||||||
Check version of shell.
|
Check version of shell.
|
||||||
stdin:
|
stdin:
|
||||||
|
6
misc.c
6
misc.c
@ -29,7 +29,7 @@
|
|||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.156 2011/03/17 22:00:45 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.157 2011/03/17 22:09:22 tg Exp $");
|
||||||
|
|
||||||
/* type bits for unsigned char */
|
/* type bits for unsigned char */
|
||||||
unsigned char chtypes[UCHAR_MAX + 1];
|
unsigned char chtypes[UCHAR_MAX + 1];
|
||||||
@ -498,7 +498,7 @@ simplify_gmatch_pattern(const unsigned char *sp)
|
|||||||
unsigned char *cp, *dp;
|
unsigned char *cp, *dp;
|
||||||
const unsigned char *ps, *se;
|
const unsigned char *ps, *se;
|
||||||
|
|
||||||
cp = alloc(strlen((void *)sp) + 1, ATEMP);
|
cp = alloc(strlen((const void *)sp) + 1, ATEMP);
|
||||||
goto simplify_gmatch_pat1a;
|
goto simplify_gmatch_pat1a;
|
||||||
|
|
||||||
/* foo@(b@(a)r)b@(a|a)z -> foobarb@(a|a)z */
|
/* foo@(b@(a)r)b@(a|a)z -> foobarb@(a|a)z */
|
||||||
@ -528,7 +528,7 @@ simplify_gmatch_pattern(const unsigned char *sp)
|
|||||||
/* skip MAGIC and closing parenthesis */
|
/* skip MAGIC and closing parenthesis */
|
||||||
sp += 2;
|
sp += 2;
|
||||||
/* copy the rest of the pattern */
|
/* copy the rest of the pattern */
|
||||||
memmove(dp, sp, strlen((void *)sp) + 1);
|
memmove(dp, sp, strlen((const void *)sp) + 1);
|
||||||
/* redo from start */
|
/* redo from start */
|
||||||
goto simplify_gmatch_pat1;
|
goto simplify_gmatch_pat1;
|
||||||
}
|
}
|
||||||
|
4
sh.h
4
sh.h
@ -154,9 +154,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef EXTERN
|
#ifdef EXTERN
|
||||||
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.448 2011/03/17 21:59:30 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.449 2011/03/17 22:09:23 tg Exp $");
|
||||||
#endif
|
#endif
|
||||||
#define MKSH_VERSION "R39 2011/03/16"
|
#define MKSH_VERSION "R39 2011/03/17"
|
||||||
|
|
||||||
#ifndef MKSH_INCLUDES_ONLY
|
#ifndef MKSH_INCLUDES_ONLY
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user