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

Simplify find_detach_socket() in scr-bx

Browse Source 
This should cause no user-visible change.
This commit is contained in:
Kevin Easton
2017-11-17 23:51:05 +11:00
parent 0abfa67aa8
commit a3e6f10be4
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/scr-bx.c
View File

@@ -231,7 +231,7 @@ char *find_detach_socket(const char *path, char *name)
DIR *dptr; DIR *dptr;
struct dirent *dir; struct dirent *dir;
struct stat st; struct stat st;
char *ret = NULL, *p; char *ret;
int count = 0; int count = 0;
if (!(dptr = opendir(path))) if (!(dptr = opendir(path)))
@@ -246,36 +246,16 @@ char *find_detach_socket(const char *path, char *name)
if (dir->d_name[0] == '.') if (dir->d_name[0] == '.')
continue; continue;
sprintf(ret, "%s/%s", path, dir->d_name); sprintf(ret, "%s/%s", path, dir->d_name);
p = strrchr(ret, '/'); p++;
if ((stat(ret, &st) == -1) || (st.st_uid != getuid()) || S_ISDIR(st.st_mode)) if ((stat(ret, &st) == -1) || (st.st_uid != getuid()) || S_ISDIR(st.st_mode))
{ {
*ret = 0; *ret = 0;
continue; continue;
} }
if (name) if (name && !strstr(dir->d_name, name))
{
char *pid, *n_tty, *h_name;
pid = LOCAL_COPY(p);
n_tty = strchr(pid, '.'); *n_tty++ = 0;
h_name = strchr(n_tty, '.'); *h_name++ = 0;
if (strcmp(name, pid))
{
if (strcmp(n_tty, name))
{
if (strcmp(h_name, name))
{
if (strcmp(p, name))
{
if (!strstr(p, name))
{ {
*ret = 0; *ret = 0;
continue; continue;
} }
}
}
}
}
}
if ((st.st_mode & 0700) == 0600) if ((st.st_mode & 0700) == 0600)
break; break;
count++; count++;