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

Support BEGINLIBPATH, ENDLIBPATH and LIBPATHSTRICT on OS/2

Browse Source
This commit is contained in:
KO Myung-Hun 2015-06-03 12:20:05 +09:00
parent 011d0abf2c
commit 645b537439
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
os2.c
View File

@ -18,6 +18,9 @@
* of said person's immediate fault when using the work as intended.
*/
#define INCL_DOS
#include <os2.h>
#include "sh.h"
#include <klibc/startup.h>
@ -141,6 +144,20 @@ exit_out_of_memory:
exit(255);
}
static void
init_extlibpath(void)
{
const char *vars[] = {"BEGINLIBPATH", "ENDLIBPATH", "LIBPATHSTRICT", NULL};
char val[512];
int flag;
for (flag = 0; vars[flag]; flag++) {
DosQueryExtLIBPATH(val, flag + 1);
if (val[0])
setenv(vars[flag], val, 1);
}
}
/*
* Convert backslashes of environmental variables to forward slahes.
* A backslash may be used as an escaped character when do 'echo'. This leads
@ -152,8 +169,10 @@ env_slashify(void)
/*
* PATH and TMPDIR are used by OS/2 as well. That is, they may have
* backslashes as a directory separator.
* BEGINLIBPATH and ENDLIBPATH are special variables on OS/2.
*/
const char *var_list[] = {"PATH", "TMPDIR", NULL};
const char *var_list[] = {"PATH", "TMPDIR",
"BEGINLIBPATH", "ENDLIBPATH", NULL};
const char **var;
char *value;
@ -169,6 +188,7 @@ void os2_init(int *argcp, const char ***argvp)
{
response(argcp, argvp);
init_extlibpath();
env_slashify();
setmode(STDIN_FILENO, O_TEXT);
@ -180,6 +200,32 @@ void os2_init(int *argcp, const char ***argvp)
atexit(cleanup);
}
void setextlibpath(const char *name, const char *val)
{
int flag;
char *p;
if (!strcmp(name, "BEGINLIBPATH"))
flag = BEGIN_LIBPATH;
else if (!strcmp(name, "ENDLIBPATH"))
flag = END_LIBPATH;
else if (!strcmp(name, "LIBPATHSTRICT"))
flag = LIBPATHSTRICT;
else
return;
/* Convert slashes to backslashes. */
strdupx(p, val, ATEMP);
for (val = p; *p; p++) {
if (*p == '/')
*p = '\\';
}
DosSetExtLIBPATH(val, flag);
afree((char *)val, ATEMP);
}
/* Remove trailing dots. */
static char *
remove_trailing_dots(char *name)

1
sh.h
View File

@ -1954,6 +1954,7 @@ int unbksl(bool, int (*)(void), void (*)(int));
#ifdef __OS2__
/* os2.c */
void os2_init(int *, const char ***);
void setextlibpath(const char *, const char *);
int access_ex(int (*)(const char *, int), const char *, int);
int stat_ex(const char *, struct stat *);
const char *real_exec_name(const char *);

10
var.c
View File

@ -698,6 +698,11 @@ exportprep(struct tbl *vp, const char *val)
char *op = (vp->flag&ALLOC) ? vp->val.s : NULL;
size_t namelen, vallen;
#ifdef __OS2__
/* On OS/2, BEGIN/ENDLIBPATH and LIBPATHSTRICT are special variables. */
setextlibpath(vp->name, val);
#endif
namelen = strlen(vp->name);
vallen = strlen(val) + 1;
@ -996,6 +1001,11 @@ typeset(const char *var, uint32_t set, uint32_t clr, int field, int base)
void
unset(struct tbl *vp, int flags)
{
#ifdef __OS2__
/* On OS/2, BEGIN/ENDLIBPATH and LIBPATHSTRICT are special variables. */
setextlibpath(vp->name, "");
#endif
if (vp->flag & ALLOC)
afree(vp->val.s, vp->areap);
if ((vp->flag & ARRAY) && (flags & 1)) {