Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9958 → Rev 9959

/contrib/sdk/sources/newlib/libc/Makefile
182,6 → 182,7
gdtoa-gethex.c \
gdtoa-hexnan.c \
getenv.c \
envlock.c \
getenv_r.c \
itoa.c \
ldiv.c \
/contrib/sdk/sources/newlib/libc/Tupfile.lua
165,6 → 165,7
"gdtoa-hexnan.c",
"getenv.c",
"getenv_r.c",
"envlock.c",
"itoa.c",
"ldiv.c",
"labs.c",
/contrib/sdk/sources/newlib/libc/crt/crtdll.c
34,6 → 34,11
int (*main)(int argc, char **argv, char **envp);
};
 
#define ENV_SIZE 16
/* TODO: Make it dynamic?* */
static char* __environ[ENV_SIZE] = {0};
char **environ = &__environ[0];
 
extern void _pei386_runtime_relocator (void);
extern void init_loader(void *libc_image);
extern void init_global_reent(void);
46,14 → 51,19
 
extern void tls_init(void);
 
char* __appenv;
int __appenv_size;
void init_environ(void)
{
ksys_ufile_t envfile = _ksys_load_file("/sys/settings/system.env");
if (!envfile.data || !envfile.size)
return;
 
 
char * __libc_getenv(const char *name)
char *pch = strtok((char*)envfile.data, " \n\t");
for (size_t env_pos = 0; pch != NULL && env_pos < ENV_SIZE-1; env_pos++)
{
return NULL;
environ[env_pos] = pch;
pch = strtok(NULL, " \n\t");
}
}
 
static int split_cmdline(char *cmdline, char **argv)
{
210,7 → 220,9
}
argv[argc] = NULL;
 
retval = header->main(argc, argv, NULL);
init_environ();
 
retval = header->main(argc, argv, environ);
done:
if(header->__subsystem__ == 3)
__fini_conio();
/contrib/sdk/sources/newlib/libc/stdlib/envlock.c
0,0 → 1,61
/*
FUNCTION
<<__env_lock>>, <<__env_unlock>>---lock environ variable
 
INDEX
__env_lock
INDEX
__env_unlock
 
ANSI_SYNOPSIS
#include <envlock.h>
void __env_lock (struct _reent *<[reent]>);
void __env_unlock (struct _reent *<[reent]>);
 
TRAD_SYNOPSIS
void __env_lock(<[reent]>)
struct _reent *<[reent]>;
 
void __env_unlock(<[reent]>)
struct _reent *<[reent]>;
 
DESCRIPTION
The <<setenv>> family of routines call these functions when they need to
modify the environ variable. The version of these routines supplied in the
library use the lock API defined in sys/lock.h. If multiple threads of
execution can call <<setenv>>, or if <<setenv>> can be called reentrantly,
then you need to define your own versions of these functions in order to
safely lock the memory pool during a call. If you do not, the memory pool
may become corrupted.
 
A call to <<setenv>> may call <<__env_lock>> recursively; that is,
the sequence of calls may go <<__env_lock>>, <<__env_lock>>,
<<__env_unlock>>, <<__env_unlock>>. Any implementation of these
routines must be careful to avoid causing a thread to wait for a lock
that it already holds.
*/
 
#include "envlock.h"
#include <sys/lock.h>
 
#ifndef __SINGLE_THREAD__
__LOCK_INIT_RECURSIVE(static, __env_lock_object);
#endif
 
void
_EXFUN(__env_lock,
(struct _reent *reent))
{
#ifndef __SINGLE_THREAD__
__lock_acquire_recursive (__env_lock_object);
#endif
}
 
void
_EXFUN(__env_unlock,
(struct _reent *reent))
{
#ifndef __SINGLE_THREAD__
__lock_release_recursive (__env_lock_object);
#endif
}
/contrib/sdk/sources/newlib/libc/stdlib/getenv.c
73,7 → 73,7
register _CONST char *name _AND
int *offset)
{
return NULL; //_findenv_r (_REENT, name, offset);
return _findenv_r (_REENT, name, offset);
}
 
/*
86,8 → 86,7
_CONST char *name)
{
int offset;
 
return NULL; //_findenv_r (_REENT, name, &offset);
return _findenv_r (_REENT, name, &offset);
}
 
#endif /* !_REENT_ONLY */
/contrib/sdk/sources/newlib/libc/stdlib/getenv_r.c
85,9 → 85,40
register _CONST char *name _AND
int *offset)
{
register int len;
register char **p;
_CONST char *c;
 
ENV_LOCK;
 
/* In some embedded systems, this does not get set. This protects
newlib from dereferencing a bad pointer. */
if (!*p_environ)
{
ENV_UNLOCK;
return NULL;
}
 
c = name;
while (*c && *c != '=') c++;
/* Identifiers may not contain an '=', so cannot match if does */
if(*c != '=')
{
len = c - name;
for (p = *p_environ; *p; ++p)
if (!strncmp (*p, name, len))
if (*(c = *p + len) == '=')
{
*offset = p - *p_environ;
ENV_UNLOCK;
return (char *) (++c);
}
}
ENV_UNLOCK;
return NULL;
}
 
/*
* _getenv_r --
* Returns ptr to value associated with name, if any, else NULL.
100,6 → 131,5
{
int offset;
 
return NULL;
// return _findenv_r (reent_ptr, name, &offset);
return _findenv_r (reent_ptr, name, &offset);
}