philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve error handling in /detach - will now soft-fail the detach instead

Browse Source 
of killing the whole client.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@163 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-04-30 08:05:04 +00:00
parent 3090365354
commit cb0c2aabc2
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/commands2.c
View File

@@ -2587,7 +2587,7 @@ static int create_ipc_socket(void)
if ((s = connect_by_number(NULL, &port, SERVICE_SERVER, PROTOCOL_TCP, 0)) < 0) if ((s = connect_by_number(NULL, &port, SERVICE_SERVER, PROTOCOL_TCP, 0)) < 0)
{ {
fprintf(stderr, "error creating socket (%d: %s)\r\n", s, strerror(errno)); bitchsay("Error creating IPC socket: [%d] %s", s, strerror(errno));
return 1; return 1;
} }
@@ -2663,8 +2663,7 @@ BUILT_IN_COMMAND(detachcmd)
{ {
#if !defined(__EMX__) && !defined(WINNT) && !defined (GUI) && defined(WANT_DETACH) #if !defined(__EMX__) && !defined(WINNT) && !defined (GUI) && defined(WANT_DETACH)
#ifndef PUBLIC_ACCESS #ifndef PUBLIC_ACCESS
pid_t pid = getpid(); pid_t pid;
pid_t sid;
/* /*
* this is written so that a running bx client will attempt to * this is written so that a running bx client will attempt to
* detach and then later a screen type program can be used to re-attach * detach and then later a screen type program can be used to re-attach
@@ -2681,29 +2680,26 @@ pid_t sid;
/* /*
* create a server socket with the above name. * create a server socket with the above name.
*/ */
if (create_ipc_socket())
return;
switch(pid = fork()) switch(pid = fork())
{ {
case -1: case -1:
put_it("error in fork"); bitchsay("fork() failed: %s", strerror(errno));
return; return;
default: default:
{
do_detach(pid, args); do_detach(pid, args);
/* Not reached */
return; return;
}
case 0: case 0:
break; break;
} }
if ((sid = setpgid(0, 0)) == -1)
return; setpgid(0, 0);
already_detached = 1; already_detached = 1;
use_input = 0; use_input = 0;
if (create_ipc_socket())
{
yell("Error creating IPC socket.");
_exit(0);
}
close_detach_fd(); close_detach_fd();
kill_attached_if_needed(1); kill_attached_if_needed(1);
disable_stop(); disable_stop();