vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Preperation before making the exe events consistant. 

* Inlining a function that is only used once.
* More comments.


SVN revision: 19756
This commit is contained in:
David Walter Seikel 2006-01-13 04:31:41 +00:00
parent 744a393f2e
commit cf29de295c
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/ecore/src/lib/ecore/Ecore.h
View File

@ -71,7 +71,7 @@ extern "C" {
#define ECORE_EVENT_EXE_DATA 7 /**< Data from a child process */
#define ECORE_EVENT_EXE_ERROR 8 /**< Error from a child process */
#define ECORE_EVENT_COUNT 9
#ifndef _ECORE_PRIVATE_H
enum _Ecore_Fd_Handler_Flags
{

1
legacy/ecore/src/lib/ecore/ecore.c
View File

@ -54,6 +54,7 @@ ecore_init(void)
if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
if (_ecore_fps_debug) _ecore_fps_debug_init();
_ecore_signal_init();
_ecore_exe_init();
#endif
}

18
legacy/ecore/src/lib/ecore/ecore_exe.c
View File

@ -11,7 +11,7 @@ struct _ecore_exe_dead_exe
char *cmd;
};
static void _ecore_exe_exec_it(const char *exe_cmd);
static inline void _ecore_exe_exec_it(const char *exe_cmd);
static int _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
static int _ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler);
@ -793,6 +793,11 @@ _ecore_exe_make_sure_its_really_dead(void *data)
}
void
_ecore_exe_init(void)
{
}
void
_ecore_exe_shutdown(void)
{
@ -814,7 +819,7 @@ _ecore_exe_find(pid_t pid)
return NULL;
}
static void
static inline void
_ecore_exe_exec_it(const char *exe_cmd)
{
char use_sh = 1;
@ -822,6 +827,12 @@ _ecore_exe_exec_it(const char *exe_cmd)
char** args = NULL;
int save_errno = 0;
/* So what is this doing?
*
* We are trying to avoid wrapping the exe call with /bin/sh -c.
* We conservatively search for certain shell meta characters,
* If we don't find them, we can call the exe directly.
*/
if (!strpbrk(exe_cmd, "|&;<>()$`\\\"'*?#"))
{
char* token;
@ -1012,7 +1023,7 @@ _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_
e->size = inbuf_num;
if (is_buffered)
{
{ /* Deal with line buffering. */
int max = 0;
int count = 0;
int i;
@ -1026,6 +1037,7 @@ _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_
{
if (count >= max)
{
/* In testing, the lines seem to arrive in batches of 500 to 1000 lines at most, roughly speaking. */
max += 10; /* FIXME: Maybe keep track of the largest number of lines ever sent, and add half that many instead of 10. */
e->lines = realloc(e->lines, sizeof(Ecore_Event_Exe_Data_Line) * (max + 1)); /* Allow room for the NULL termination. */
}

1
legacy/ecore/src/lib/ecore/ecore_private.h
View File

@ -408,6 +408,7 @@ int _ecore_signal_count_get(void);
void _ecore_signal_call(void);
#ifndef WIN32
void _ecore_exe_init(void);
void _ecore_exe_shutdown(void);
Ecore_Exe *_ecore_exe_find(pid_t pid);
void *_ecore_exe_free(Ecore_Exe *exe);