Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_exe.c
Log Message:
Clean up.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ecore_exe.c 30 Dec 2005 19:17:21 -0000 1.27
+++ ecore_exe.c 30 Dec 2005 19:28:54 -0000 1.28
@@ -259,7 +259,7 @@
volatile int vfork_exec_errno = 0;
/* FIXME: I should double check this. After a quick look
around, this is already done, but via a more modern method. */
- /* signal(SIGPIPE, SIG_IGN); /* we only want EPIPE
on errors */
+ /* signal(SIGPIPE, SIG_IGN); We only want EPIPE on
errors */
pid = fork();
if (pid == -1)
@@ -395,8 +395,8 @@
{ /* Something went wrong, so pull down everything. */
IF_FN_DEL(_ecore_exe_free, exe);
}
-else
-printf("Running as %d for %s.\n", exe->pid, exe->cmd);
+ else
+ printf("Running as %d for %s.\n", exe->pid, exe->cmd);
errno = n;
return exe;
@@ -809,7 +809,6 @@
unsigned char *inbuf;
int inbuf_num;
-//printf("Reading data for %s\n", exe->cmd);
/* Get any left over data from last time. */
inbuf = exe->read_data_buf;
inbuf_num = exe->read_data_size;
@@ -918,17 +917,9 @@
}
if (lost_exe)
{
-if (exe->read_data_size)
- printf("Theer are %d bytes left unsent from the dead exe %s.\n",
exe->read_data_size, exe->cmd);
-// if (exe->exit_event)
-// { /* There is a pending exit event to send, so
send it. */
-//printf("Sending delayed exit event for %s.\n", exe->cmd);
-// _ecore_event_add(ECORE_EVENT_EXE_EXIT,
exe->exit_event,
-// _ecore_event_exe_exit_free,
NULL);
-// exe->exit_event = NULL; /* Just being
paranoid. */
-// }
-// else
-// ecore_exe_terminate(exe); /* FIXME: give
this some deep thought later. */
+ if (exe->read_data_size)
+ printf("There are %d bytes left unsent from the
dead exe %s.\n", exe->read_data_size, exe->cmd);
+ ecore_exe_terminate(exe); /* FIXME: give this
some deep thought later. */
}
break;
}
@@ -948,13 +939,13 @@
_ecore_exe_flush(exe);
/* If we have sent all there is to send, and we need to close the pipe,
then close it. */
- if ((exe->close_write == 1) && /*(!exe->write_data_buf) &&*/
(exe->write_data_size == exe->write_data_offset))
+ if ((exe->close_write == 1) && (exe->write_data_size ==
exe->write_data_offset))
{
int ok = 0;
int result;
printf("Closing stdin for %s\n", exe->cmd);
-// if (exe->child_fd_write) E_NO_ERRNO(result,
fsync(exe->child_fd_write), ok);
+ /* if (exe->child_fd_write) E_NO_ERRNO(result,
fsync(exe->child_fd_write), ok); This a) doesn't work, and b) isn't needed. */
IF_FN_DEL(ecore_main_fd_handler_del, exe->write_fd_handler);
if (exe->child_fd_write) E_NO_ERRNO(result,
close(exe->child_fd_write), ok);
exe->child_fd_write = 0;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
