Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system() works correctly, so we can use its return value now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23515 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2008-01-14 12:59:24 +00:00
parent 46a15bd6ea
commit 07a6b56636
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/terminal/Shell.cpp
View File

@ -277,7 +277,7 @@ Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **arg
/* /*
* Get a pseudo-tty. We do this by cycling through files in the * Get a pseudo-tty. We do this by cycling through files in the
* directory. The operationg system will not allow us to open a master * directory. The operating system will not allow us to open a master
* which is already in use, so we simply go until the open succeeds. * which is already in use, so we simply go until the open succeeds.
*/ */
char ttyName[B_PATH_NAME_LENGTH]; char ttyName[B_PATH_NAME_LENGTH];
@ -488,17 +488,15 @@ Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **arg
* Exec failed. * Exec failed.
*/ */
sleep(1); sleep(1);
/*const char *spawnAlertMessage = "alert --stop " const char *spawnAlertMessage = "alert --stop "
"'Cannot execute \"%s\":\n" "'Cannot execute \"%s\":\n"
"\t%s' " "\t%s' "
"'Use Default Shell' 'Abort'"; "'Use Default Shell' 'Abort'";
char errorMessage[256]; char errorMessage[256];
snprintf(errorMessage, sizeof(errorMessage), spawnAlertMessage, commandLine, strerror(errno)); snprintf(errorMessage, sizeof(errorMessage), spawnAlertMessage, *argv, strerror(errno));
// TODO: I'm not sure that system should return the return value of alert.
// At least, it's not doing that right now.
int returnValue = system(errorMessage); int returnValue = system(errorMessage);
if (returnValue == 0)*/ if (returnValue == 0)
execl("/bin/sh", "/bin/sh", "-login", NULL); execl("/bin/sh", "/bin/sh", "-login", NULL);
exit(1); exit(1);