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

move getdrvwd() declaration out of OS/2-specific part: 

each MKSH_DOSPATH port is required to define it (and, later, others)
This commit is contained in:
tg 2017-10-14 21:09:48 +00:00
parent d76a7e5813
commit cfa08b1c3f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.797 2017/08/29 13:38:29 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.798 2017/10/14 21:09:46 tg Exp $
# -*- mode: sh -*- # -*- mode: sh -*-
#- #-
# Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@ -30,7 +30,7 @@
# (2013/12/02 20:39:44) http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/regress/bin/ksh/?sortby=date # (2013/12/02 20:39:44) http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/regress/bin/ksh/?sortby=date
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R56 2017/08/29 @(#)MIRBSD KSH R56 2017/10/14
description: description:
Check base version of full shell Check base version of full shell
stdin: stdin:
@ -39,7 +39,7 @@ name: KSH_VERSION
category: !shell:legacy-yes category: !shell:legacy-yes
--- ---
expected-stdout: expected-stdout:
@(#)LEGACY KSH R56 2017/08/29 @(#)LEGACY KSH R56 2017/10/14
description: description:
Check base version of legacy shell Check base version of legacy shell
stdin: stdin:

6
sh.h
View File

@ -182,9 +182,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.847 2017/10/11 23:23:03 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.848 2017/10/14 21:09:48 tg Exp $");
#endif #endif
#define MKSH_VERSION "R56 2017/08/29" #define MKSH_VERSION "R56 2017/10/14"
/* arithmetic types: C implementation */ /* arithmetic types: C implementation */
#if !HAVE_CAN_INTTYPES #if !HAVE_CAN_INTTYPES
@ -2566,7 +2566,6 @@ void setextlibpath(const char *, const char *);
int access_ex(int (*)(const char *, int), const char *, int); int access_ex(int (*)(const char *, int), const char *, int);
int stat_ex(const char *, struct stat *); int stat_ex(const char *, struct stat *);
const char *real_exec_name(const char *); const char *real_exec_name(const char *);
int getdrvwd(char **, unsigned int);
#endif #endif
/* shf.c */ /* shf.c */
struct shf *shf_open(const char *, int, int, int); struct shf *shf_open(const char *, int, int, int);
@ -2757,6 +2756,7 @@ extern int tty_init_fd(void); /* initialise tty_fd, tty_devtty */
(mksh_sdirsep(mksh_vdirsep_s) != NULL)) && \ (mksh_sdirsep(mksh_vdirsep_s) != NULL)) && \
(strcmp(mksh_vdirsep_s, T_builtin) != 0)); \ (strcmp(mksh_vdirsep_s, T_builtin) != 0)); \
}) })
int getdrvwd(char **, unsigned int);
#else #else
#define mksh_abspath(s) (ord((s)[0]) == ord('/')) #define mksh_abspath(s) (ord((s)[0]) == ord('/'))
#define mksh_cdirsep(c) (ord(c) == ord('/')) #define mksh_cdirsep(c) (ord(c) == ord('/'))