laffer1 agreed they will need -DMKSH_MIDNIGHTBSD01ASH_COMPAT in the
short term, but only for /bin/sh – thus recommend to also define -DMKSH_BINSHREDUCED and make it dependent on FPOSIX
This commit is contained in:
4
main.c
4
main.c
@ -33,7 +33,7 @@
|
|||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.127 2009/05/16 18:40:07 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.128 2009/05/16 21:00:51 tg Exp $");
|
||||||
|
|
||||||
extern char **environ;
|
extern char **environ;
|
||||||
|
|
||||||
@ -297,7 +297,7 @@ main(int argc, const char *argv[])
|
|||||||
errorf("-c requires an argument");
|
errorf("-c requires an argument");
|
||||||
#ifdef MKSH_MIDNIGHTBSD01ASH_COMPAT
|
#ifdef MKSH_MIDNIGHTBSD01ASH_COMPAT
|
||||||
/* compatibility to MidnightBSD 0.1 /bin/sh (not desired) */
|
/* compatibility to MidnightBSD 0.1 /bin/sh (not desired) */
|
||||||
if (argv[argi] && !strcmp(argv[argi], "--"))
|
if (Flag(FPOSIX) && argv[argi] && !strcmp(argv[argi], "--"))
|
||||||
++argi;
|
++argi;
|
||||||
#endif
|
#endif
|
||||||
if (argv[argi])
|
if (argv[argi])
|
||||||
|
11
sh.h
11
sh.h
@ -122,7 +122,7 @@
|
|||||||
#define __SCCSID(x) __IDSTRING(sccsid,x)
|
#define __SCCSID(x) __IDSTRING(sccsid,x)
|
||||||
|
|
||||||
#ifdef EXTERN
|
#ifdef EXTERN
|
||||||
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.299 2009/05/16 19:34:07 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.300 2009/05/16 21:00:52 tg Exp $");
|
||||||
#endif
|
#endif
|
||||||
#define MKSH_VERSION "R38 2009/05/16"
|
#define MKSH_VERSION "R38 2009/05/16"
|
||||||
|
|
||||||
@ -333,12 +333,6 @@ typedef uint32_t mksh_uari_t;
|
|||||||
#define PATH_MAX 1024 /* pathname size */
|
#define PATH_MAX 1024 /* pathname size */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MKSH_MIDNIGHTBSD01ASH_COMPAT
|
|
||||||
#define initvsn__add_1 " MidnightBSD-0.1-ash-compat"
|
|
||||||
#else
|
|
||||||
#define initvsn__add_1 ""
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EXTERN const char *kshname; /* $0 */
|
EXTERN const char *kshname; /* $0 */
|
||||||
EXTERN pid_t kshpid; /* $$, shell pid */
|
EXTERN pid_t kshpid; /* $$, shell pid */
|
||||||
EXTERN pid_t procpid; /* pid of executing process */
|
EXTERN pid_t procpid; /* pid of executing process */
|
||||||
@ -347,8 +341,7 @@ EXTERN uid_t ksheuid; /* effective uid of shell */
|
|||||||
EXTERN int exstat; /* exit status */
|
EXTERN int exstat; /* exit status */
|
||||||
EXTERN int subst_exstat; /* exit status of last $(..)/`..` */
|
EXTERN int subst_exstat; /* exit status of last $(..)/`..` */
|
||||||
EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
|
EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
|
||||||
EXTERN const char initvsn[] I__("KSH_VERSION=@(#)MIRBSD KSH "
|
EXTERN const char initvsn[] I__("KSH_VERSION=@(#)MIRBSD KSH " MKSH_VERSION);
|
||||||
MKSH_VERSION initvsn__add_1);
|
|
||||||
#define KSH_VERSION (initvsn + /* "KSH_VERSION=@(#)" */ 16)
|
#define KSH_VERSION (initvsn + /* "KSH_VERSION=@(#)" */ 16)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user