Verify PATH variable in apps/examples/elf

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5445 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-12-19 22:18:30 +00:00
parent d6f761430c
commit 2545f5c1a9
8 changed files with 68 additions and 22 deletions
+1
View File
@@ -42,6 +42,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+3 -3
View File
@@ -146,11 +146,11 @@ int load_module(FAR struct binary_s *bin)
#endif
{
/* Were we given a relative path? Or an absolute path to the file to
* be loaded.
* be loaded? Absolute paths start with '/'.
*/
#ifdef CONFIG_BINFMT_EXEPATH
if (bin->filename[0] == '/')
if (bin->filename[0] != '/')
{
FAR const char *relpath;
FAR char *fullpath;
@@ -168,7 +168,7 @@ int load_module(FAR struct binary_s *bin)
{
/* Get the next absolute file path */
while ((fullpath = exepath_next(handle, relpath)))
while ((fullpath = exepath_next(handle, relpath)) != NULL)
{
/* Try to load the file at this path */
+1 -1
View File
@@ -83,7 +83,7 @@
****************************************************************************/
#ifdef CONFIG_BINFMT_CONSTRUCTORS
static inline void exec_dtors(FAR const struct binary_s *binp)
static inline int exec_dtors(FAR const struct binary_s *binp)
{
binfmt_dtor_t *dtor = binp->dtors;
#ifdef CONFIG_ADDRENV
+2 -2
View File
@@ -64,7 +64,7 @@
****************************************************************************/
/****************************************************************************
* Name: elf_addrenv_create
* Name: elf_addrenv_alloc
*
* Description:
* Allocate memory for the ELF image (elfalloc). If CONFIG_ADDRENV=n,
@@ -83,7 +83,7 @@
*
****************************************************************************/
int elf_addrenv_create(FAR struct elf_loadinfo_s *loadinfo, size_t envsize)
int elf_addrenv_alloc(FAR struct elf_loadinfo_s *loadinfo, size_t envsize)
{
#ifdef CONFIG_ADDRENV
FAR void *vaddr;
+2 -2
View File
@@ -65,7 +65,7 @@
****************************************************************************/
/****************************************************************************
* Name: nxflat_addrenv_create
* Name: nxflat_addrenv_alloc
*
* Description:
* Allocate memory for the ELF image (elfalloc). If CONFIG_ADDRENV=n,
@@ -84,7 +84,7 @@
*
****************************************************************************/
int nxflat_addrenv_create(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
{
FAR struct dspace_s *dspace;
#ifdef CONFIG_ADDRENV