[PATCH] update klibc to version 0.98

[elogind.git] / udevsend.c

diff --git a/udevsend.c b/udevsend.c
index d3e5378285e8ea7797e1d7d86b97ba3c64abbadb..3f3bbacbc2eb89712ca41d834943372c279a1ddd 100644 (file)
--- a/udevsend.c
+++ b/udevsend.c
@@ -61,26 +61,18 @@ static inline char *get_seqnum(void)
        return seqnum;
 }
 
-static int build_hotplugmsg(struct hotplug_msg **ppmsg, char *action,
+static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
                            char *devpath, char *subsystem, int seqnum)
 {
-       struct hotplug_msg *pmsg;
-
-       pmsg = malloc(sizeof(struct hotplug_msg));
-       pmsg->mtype = HOTPLUGMSGTYPE;
-       pmsg->seqnum = seqnum;
-       strncpy(pmsg->action, action, 8);
-       strncpy(pmsg->devpath, devpath, 128);
-       strncpy(pmsg->subsystem, subsystem, 16);
-       *ppmsg = pmsg;
+       memset(msg, 0x00, sizeof(msg));
+       msg->mtype = HOTPLUGMSGTYPE;
+       msg->seqnum = seqnum;
+       strncpy(msg->action, action, 8);
+       strncpy(msg->devpath, devpath, 128);
+       strncpy(msg->subsystem, subsystem, 16);
        return sizeof(struct hotplug_msg);
 }
 
-static void free_hotplugmsg(struct hotplug_msg *pmsg)
-{
-       free(pmsg);
-}
-
 static int start_daemon(void)
 {
        pid_t pid;
@@ -94,7 +86,8 @@ static int start_daemon(void)
                switch (child_pid) {
                case 0:
                        /* daemon */
-                       execl(DEFAULT_UDEVD_EXEC, NULL);
+                       setsid();
+                       execl(UDEVD_EXEC, "udevd", NULL);
                        dbg("exec of daemon failed");
                        exit(1);
                case -1:
@@ -108,7 +101,7 @@ static int start_daemon(void)
                dbg("fork of helper failed");
                return -1;
        default:
-               wait(0);
+               wait(NULL);
        }
        return 0;
 }
@@ -118,8 +111,8 @@ int main(int argc, char* argv[])
 {
        int msgid;
        key_t key;
-       struct msqid_ds  msg_queue;
-       struct msgbuf *pmsg;
+       struct msqid_ds msg_queue;
+       struct hotplug_msg message;
        char *action;
        char *devpath;
        char *subsystem;
@@ -156,8 +149,8 @@ int main(int argc, char* argv[])
        seq = atoi(seqnum);
 
        /* create ipc message queue or get id of our existing one */
-       key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
-       size =  build_hotplugmsg( (struct hotplug_msg**) &pmsg, action, devpath, subsystem, seq);
+       key = ftok(UDEVD_EXEC, IPC_KEY_ID);
+       size =  build_hotplugmsg(&message, action, devpath, subsystem, seq);
        msgid = msgget(key, IPC_CREAT);
        if (msgid == -1) {
                dbg("error open ipc queue");
@@ -165,8 +158,7 @@ int main(int argc, char* argv[])
        }
 
        /* send ipc message to the daemon */
-       retval = msgsnd(msgid, pmsg, size, 0);
-       free_hotplugmsg( (struct hotplug_msg*) pmsg);
+       retval = msgsnd(msgid, &message, size, 0);
        if (retval == -1) {
                dbg("error sending ipc message");
                goto exit;
@@ -175,7 +167,7 @@ int main(int argc, char* argv[])
        /* get state of ipc queue */
        tspec.tv_sec = 0;
        tspec.tv_nsec = 10000000;  /* 10 millisec */
-       loop = 20;
+       loop = 30;
        while (loop--) {
                retval = msgctl(msgid, IPC_STAT, &msg_queue);
                if (retval == -1) {