b1681f4a3a
There were mainly two problems with shebangs: - Suffix arguments handling e.g. '#!/bin/sh -x' - Recursive handling e.g. script1 fetchs '#!/path/to/script2' and script2 itself has a shebang - (did I say two?) running shebang would replace argv[optind] instead of appending e.g. script with '#!/bin/sh' and running './script -c' would run '/bin/sh -c' instead of '/bin/sh ./script -c' There also are two places where this needs parsing: - starting a fresh program from mcexec - starting a new program from execve in mcexec The first was easy to fix as we already had argv around, but the later required a new way to transfer the 'new argv elements from the script' to mckernel to append before its argv -- it used to be 'desc->shell_path' but that was no longer used at some point and just one keyword is not enough to handle this properly. This commit does: - Refactors the lookup_path + load_elf_desc that was only done at most twice in its own function that loops indefinitely and use that in both situations described above - Transmits the argv addition in the transfer to mckernel after the desc; mckernel allocates 4 pages (hardcoded) for the descs and we will hopefully have room for the script arguments on top of that... (there is no guard!!!) - Change flatten_strings to allow prepending a flattened string instead of a single string. Note that the flatten_string change also brought in a difference in the format, to have the full length embedded within the string, the latest slot that used to be zeroes now contains the position of the end of the buffer (where the last+1 string would be if there had been one) This required a trivial change in mckernel prepare args function that used this property for no real reason. Hopefully things work™, this probably warrants adding a couple of new ostests... - create a couple of scripts with recursive invocation/arguments and check their own argv. - execute "mcexec script args" and "mcexec sh -c 'script args'" Change-Id: I2cf9cde5c07c9293f730de89c9731bd93dbfa789 Refs: #1115
53 lines
1.6 KiB
C
53 lines
1.6 KiB
C
/**
|
|
* \file string.h
|
|
* License details are found in the file LICENSE.
|
|
* \brief
|
|
* Declare string manipulation functions.
|
|
* \author Taku Shimosawa <shimosawa@is.s.u-tokyo.ac.jp> \par
|
|
* Copyright (C) 2011 - 2012 Taku Shimosawa
|
|
*/
|
|
/*
|
|
* HISTORY
|
|
*/
|
|
|
|
#ifndef __STRING_H
|
|
#define __STRING_H
|
|
|
|
#include <types.h>
|
|
#include <arch-string.h>
|
|
|
|
size_t strlen(const char *p);
|
|
size_t strnlen(const char *p, size_t maxlen);
|
|
char *strcpy(char *dest, const char *src);
|
|
char *strncpy(char *dest, const char *src, size_t maxlen);
|
|
int strcmp(const char *s1, const char *s2);
|
|
int strncmp(const char *s1, const char *s2, size_t n);
|
|
char *strstr(const char *haystack, const char *needle);
|
|
char *strpbrk(const char *haystack, const char *accept);
|
|
char *strchr(const char *s, int n);
|
|
char *strrchr(const char *s, int n);
|
|
void *memcpy(void *dest, const void *src, size_t n);
|
|
void *memcpy_long(void *dest, const void *src, size_t n);
|
|
int memcmp(const void *s1, const void *s2, size_t n);
|
|
void *memset(void *s, int n, size_t l);
|
|
|
|
#ifdef ARCH_FAST_MEMCPY
|
|
#define fast_memcpy __inline_memcpy
|
|
#else
|
|
#define fast_memcpy memcpy
|
|
#endif
|
|
|
|
#ifdef ARCH_FAST_MEMSET
|
|
#define memset __inline_memset
|
|
#endif
|
|
|
|
extern int snprintf(char * buf, size_t size, const char *fmt, ...);
|
|
extern int sprintf(char * buf, const char *fmt, ...);
|
|
extern int sscanf(const char * buf, const char * fmt, ...);
|
|
extern int scnprintf(char * buf, size_t size, const char *fmt, ...);
|
|
|
|
unsigned long strtol(const char *cp, char **endp, unsigned int base);
|
|
int flatten_strings_from_user(char *pre_strings, char **strings, char **flat);
|
|
|
|
#endif
|