wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-02 05:52:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

initctl: Refactor, reduce code duplication

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2017-11-12 22:58:50 +01:00
parent af3e560d79
commit fcdb5c2965
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/initctl.c
+22 -14
View File
@@ -53,10 +53,9 @@ typedef struct {
int verbose = 0;
int runlevel = 0;
static int do_send(struct init_request *rq, ssize_t len)
static int do_connect(void)
{
int sd, result = 255;
int sd;
struct sockaddr_un sun = {
.sun_family = AF_UNIX,
.sun_path = INIT_SOCKET,
@@ -64,11 +63,27 @@ static int do_send(struct init_request *rq, ssize_t len)
sd = socket(AF_UNIX, SOCK_STREAM, 0);
if (-1 == sd)
return -1;
if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1)
goto error;
if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1) {
close(sd);
goto error;
}
return sd;
error:
perror("Failed connecting to finit");
return -1;
}
static int do_send(struct init_request *rq, ssize_t len)
{
int sd, result = 255;
sd = do_connect();
if (-1 == sd)
return -1;
if (write(sd, rq, len) != len)
goto error;
@@ -88,22 +103,15 @@ static int runlevel_get(void)
{
int sd, result = 255;
struct init_request rq;
struct sockaddr_un sun = {
.sun_family = AF_UNIX,
.sun_path = INIT_SOCKET,
};
memset(&rq, 0, sizeof(rq));
rq.cmd = INIT_CMD_GET_RUNLEVEL;
rq.magic = INIT_MAGIC;
sd = socket(AF_UNIX, SOCK_STREAM, 0);
sd = do_connect();
if (-1 == sd)
return -1;
if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1)
goto error;
if (write(sd, &rq, sizeof(rq)) != sizeof(rq))
goto error;