fix usb_id and let scsi_id ignore "illegal request"

[elogind.git] / udevinitsend.c

diff --git a/udevinitsend.c b/udevinitsend.c
index 31a7109d1b6a7e9553349da6ec18e6a2615a680d..204e9cecd57af1554eb9d65d58e72d7bb0e296c7 100644 (file)
--- a/udevinitsend.c
+++ b/udevinitsend.c
@@ -100,7 +100,7 @@ static int udevsend(char *filename, int sock, int disable_loop_detection)
 
        memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
        strcpy(usend_msg.magic, UDEV_MAGIC);
-       usend_msg.type = UDEVD_INITSEND;
+       usend_msg.type = UDEVD_UEVENT_INITSEND;
 
        ls = fdmap;
        ch = le = ls;
@@ -132,11 +132,11 @@ static int udevsend(char *filename, int sock, int disable_loop_detection)
                        strncpy(&usend_msg.envbuf[bufpos],ls,(ch - ls) + 1);
                        bufpos += (ch - ls) + 1;
                        if (ch[1] == '\'' && le[-1] == '\'') {
-                               strncpy(&usend_msg.envbuf[bufpos],ch + 2, (le - ch) -3);
+                               strncpy(&usend_msg.envbuf[bufpos],ch + 2, (le - ch) - 3);
                                bufpos += (le - ch) - 3;
                        } else {
-                               strncpy(&usend_msg.envbuf[bufpos],ch, (le - ch));
-                               bufpos += (le - ch);
+                               strncpy(&usend_msg.envbuf[bufpos],ch + 1, (le - ch) - 1);
+                               bufpos += (le - ch) - 1;
                        }
                        bufpos++;
                }