ifeq ($(ARCH),"x86")

	ARCH_CFLAGS += -DARCH_X86

endif

 *  Partly Copyright (C) 2004 GoldenBlue, LLC. http://www.goldenbluellc.com/

extern int execvp(const char *filename, char *const argv[]);

static int (*true_execvp) (const char *, char *const[]);

	true_execvp = dlsym(libc_handle, "execvp");

char *

get_new_ldp(char *orig_ldp)

/* Usage: orig_ldp can be NULL, returns malloc'd new LD_PRELOAD with sandbox lib prepended.

 * Bug not fixed: the relative position of sandbox_lib amongst other libs in

 * LD_PRELOAD can alter the program's behavior, but we merely check for presence!

 */

{

	int orig_ldp_len = 0;

    if (orig_ldp)

    {

        if (!strncmp(orig_ldp, "LD_PRELOAD=", 11)) orig_ldp += 11;

        orig_ldp_len = strlen(orig_ldp);

    }

    char *new_ldp = NULL;

    int sandbox_lib_len = strlen(sandbox_lib);

    /* new_ldp_len = 'LD_PRELOAD=' + sanboxlib + space + original libs + null + fudge */

    int new_ldp_len = 11 + sandbox_lib_len + 1   + orig_ldp_len  +  1   +  1;

    if ((new_ldp_len >= 4096) || (NULL == (new_ldp = malloc(new_ldp_len * sizeof(char)))))

    {

		perror("LD_PRELOAD exceeds hard-coded limit of 4096 characters, or malloc failed!");

    	errno = ENOMEM;

    	return NULL;

	}

	/* If the sanbox.so is appended, then the sandbox might easily break, without

	 * the user knowing.  Also, the semantics of the sandbox suggest it should

	 * have higher priority than other libs in LD_PRELOAD. Default to prepend.

     */ 

	strcpy(new_ldp, "LD_PRELOAD=");

#ifndef APPEND_SANDBOX_SO

	strncpy(&(new_ldp[11]), sandbox_lib, sandbox_lib_len +1);

	/* PREPEND sandbox.so to the beginning of the LD_PRELOAD environment variable */

    if (orig_ldp_len)

    {

	    new_ldp[sandbox_lib_len + 11] = ' ';

    	/* automatically null-terminated by strncpy, if sandbox_lib is */

    	strncpy(&(new_ldp[sandbox_lib_len + 12]), orig_ldp, orig_ldp_len +1);

    }

fprintf(stderr, "libsandbox.so: DEBUG: orig_ldp='%s'/%d; new_ldp='%s'/%d\n", orig_ldp, orig_ldp_len, new_ldp, new_ldp_len);

#else

	if (orig_ldp_len)

    {

    	strncpy(&(new_ldp[11]), orig_ldp, orig_ldp_len +1);

    	new_ldp[orig_ldp_len +11] = ' '; /* append sandbox.so */

    }

    else orig_ldp_len--;

   	strncpy(&(new_ldp[orig_ldp_len +11 +1]), sandbox_lib, sandbox_lib_len +1);

#	endif

    return new_ldp;

}

FILE *log=fopen("/tmp/jlog", "a"); // writing to stdout would mean that ebuild's use of `cmd` would capture this output as well

fprintf(log,"INFO: pid=%d  true_execve(filename=%s; envp[%d] = '%s', new_ldp=%s: ",(int)getpid(),filename,count,my_envp[count],new_ldp);

int i=0;

while (argv[++i]) fprintf(log,"%s,",argv[i]);

fputs("\n", log);

fflush(log);

fprintf(log,"ERROR: after true_execve()\n");

fclose(log);

    char *tmp_on = NULL;

    char *tmp_active = NULL;

#ifndef DEBUG

#ifdef __GNUC__

#if __GNUC_MINOR__ >= 3

# define HIDDEN  __attribute__((visibility ("hidden")))

# define USED    __attribute__((__used__))

#else

# define USED    __attribute__((__unused__))

#endif

#endif

#endif

#ifndef HIDDEN

#define HIDDEN

#endif

#ifndef USED

#define USED

#endif

static USED void __follow_alias_execve()

{

    asm("\t .global execve");

    asm("\t .global _execve");

    asm("\t .global __execve");

    asm("\t execve = follow_execve");

    asm("\t _execve = follow_execve");

    asm("\t __execve = follow_execve");

}

#ifndef __linux

	You are not using Linux.  I have only tested Athlon-XP with

	Linux 2.6 kernel, gcc-3.3.3, and glibc-2.3.3_pre20040207.

#else

/*

 * x86 platforms with Linux and glibc 2.? directly calls the kernel

 * from execvp, instead of execve.  Thus, we need the following:

 */

extern char **__environ;

static USED int follow_execvp(char *file, char *argv[])

{

	int old_errno = errno;

    int result = -1;

   	char *new_ldp = NULL; /* our modified "LD_PRELOAD=/lib/libsandbox.so ..." */

   	char *orig_ldp = NULL; /* original ptr containing "LD_PRELOAD=..." */

    orig_ldp = getenv("LD_PRELOAD");

    if (orig_ldp == NULL || !strstr(orig_ldp, sandbox_lib))

    {

        new_ldp = get_new_ldp(orig_ldp);

        if (new_ldp == NULL) return -1;

        if (putenv(new_ldp))

        {

            perror("Unable to putenv new/fixed LD_PRELOAD");

            return -1;

        }

    }

FILE *log=fopen("/tmp/jlog", "a"); // writing to stdout would mean that ebuild's use of `cmd` would capture this output as well

fprintf(log,"INFO: pid=%d  true_execVP(filename=%s; orig_ldp=%s, new_ldp=%s, getenv(LDP)=%s: ",(int)getpid(),file,orig_ldp,new_ldp,getenv("LD_PRELOAD"));

int i=0;

while (argv[++i]) fprintf(log,"%s, ",argv[i]);

fputs("\n", log);

fclose(log);

	errno = old_errno;

	check_dlsym(execvp);

	result = true_execvp(file, argv);

	old_errno = errno;

fputs("ERROR:\e[31;01mafter real_execvp()\033[0m  \n", stderr);

/* Since new_ldp has become part of the live environment, we should restore before free'ing it.

 * Why write this code, since we exec'd above (if successful)?

 * if (new_ldp)

 *     free(new_ldp);

 */

	errno = old_errno;

	return result;

}

static USED void __follow_alias_execvp()

{

    asm("\t .global execvp");

    asm("\t .global _execvp");

    asm("\t .global __execvp");

    asm("\t execvp = follow_execvp");

    asm("\t _execvp = follow_execvp");

    asm("\t __execvp = follow_execvp");

}

#endif

//FILE *log=fopen("/tmp/jlog2", "a");

//fprintf(log,">>>pid=%d  sandbox BEFORE execv(",(int)getpid());

//fflush(log);

    {

        if (WIFEXITED(status))

        fprintf(stderr, "sandbox ERROR: waitpid reported error: ret=%d; status=%d\n", ret, WEXITSTATUS(status));

    }

//fprintf(log, "sandbox: After waitpid for execv(%s,..)\n", argv_bash[0]);

//fclose(log);