| /contrib/sdk/sources/newlib/libc/Makefile |
|---|
| 182,7 → 182,6 |
| 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,7 → 165,6 |
| "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,11 → 34,6 |
| 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); |
| 51,19 → 46,14 |
| extern void tls_init(void); |
| void init_environ(void) |
| { |
| ksys_ufile_t envfile = _ksys_load_file("/sys/settings/system.env"); |
| if (!envfile.data || !envfile.size) |
| return; |
| char* __appenv; |
| int __appenv_size; |
| char *pch = strtok((char*)envfile.data, " \n\t"); |
| for (size_t env_pos = 0; pch != NULL && env_pos < ENV_SIZE-1; env_pos++) |
| char * __libc_getenv(const char *name) |
| { |
| environ[env_pos] = pch; |
| pch = strtok(NULL, " \n\t"); |
| return NULL; |
| } |
| } |
| static int split_cmdline(char *cmdline, char **argv) |
| { |
| 220,9 → 210,7 |
| } |
| argv[argc] = NULL; |
| init_environ(); |
| retval = header->main(argc, argv, environ); |
| retval = header->main(argc, argv, NULL); |
| done: |
| if(header->__subsystem__ == 3) |
| __fini_conio(); |
| /contrib/sdk/sources/newlib/libc/stdlib/envlock.c |
|---|
| File deleted |
| /contrib/sdk/sources/newlib/libc/stdlib/getenv_r.c |
|---|
| 85,40 → 85,9 |
| 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. |
| 131,5 → 100,6 |
| { |
| int offset; |
| return _findenv_r (reent_ptr, name, &offset); |
| return NULL; |
| // return _findenv_r (reent_ptr, name, &offset); |
| } |
| /contrib/sdk/sources/newlib/libc/stdlib/getenv.c |
|---|
| 73,7 → 73,7 |
| register _CONST char *name _AND |
| int *offset) |
| { |
| return _findenv_r (_REENT, name, offset); |
| return NULL; //_findenv_r (_REENT, name, offset); |
| } |
| /* |
| 86,7 → 86,8 |
| _CONST char *name) |
| { |
| int offset; |
| return _findenv_r (_REENT, name, &offset); |
| return NULL; //_findenv_r (_REENT, name, &offset); |
| } |
| #endif /* !_REENT_ONLY */ |