* [PATCH] do not overwrite the first part of phys string
@ 2009-11-21 7:55 Németh Márton
2009-11-23 16:08 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Németh Márton @ 2009-11-21 7:55 UTC (permalink / raw)
To: Dmitry Torokhov, linux-input; +Cc: LKML
From: Márton Németh <nm127@freemail.hu>
Use strlcat() to append a string to the previously created first part.
Signed-off-by: Márton Németh <nm127@freemail.hu>
---
diff -upr linux-2.6.32-rc7.orig/drivers/hid/usbhid/usbkbd.c linux-2.6.32-rc7/drivers/hid/usbhid/usbkbd.c
--- linux-2.6.32-rc7.orig/drivers/hid/usbhid/usbkbd.c 2009-09-10 00:13:59.000000000 +0200
+++ linux-2.6.32-rc7/drivers/hid/usbhid/usbkbd.c 2009-11-21 08:48:32.000000000 +0100
@@ -266,7 +266,7 @@ static int usb_kbd_probe(struct usb_inte
le16_to_cpu(dev->descriptor.idProduct));
usb_make_path(dev, kbd->phys, sizeof(kbd->phys));
- strlcpy(kbd->phys, "/input0", sizeof(kbd->phys));
+ strlcat(kbd->phys, "/input0", sizeof(kbd->phys));
input_dev->name = kbd->name;
input_dev->phys = kbd->phys;
diff -upr linux-2.6.32-rc7.orig/drivers/input/misc/ati_remote.c linux-2.6.32-rc7/drivers/input/misc/ati_remote.c
--- linux-2.6.32-rc7.orig/drivers/input/misc/ati_remote.c 2009-09-10 00:13:59.000000000 +0200
+++ linux-2.6.32-rc7/drivers/input/misc/ati_remote.c 2009-11-21 08:48:50.000000000 +0100
@@ -766,7 +766,7 @@ static int ati_remote_probe(struct usb_i
ati_remote->interface = interface;
usb_make_path(udev, ati_remote->phys, sizeof(ati_remote->phys));
- strlcpy(ati_remote->phys, "/input0", sizeof(ati_remote->phys));
+ strlcat(ati_remote->phys, "/input0", sizeof(ati_remote->phys));
if (udev->manufacturer)
strlcpy(ati_remote->name, udev->manufacturer, sizeof(ati_remote->name));
diff -upr linux-2.6.32-rc7.orig/drivers/input/misc/powermate.c linux-2.6.32-rc7/drivers/input/misc/powermate.c
--- linux-2.6.32-rc7.orig/drivers/input/misc/powermate.c 2009-09-10 00:13:59.000000000 +0200
+++ linux-2.6.32-rc7/drivers/input/misc/powermate.c 2009-11-21 08:48:44.000000000 +0100
@@ -338,7 +338,7 @@ static int powermate_probe(struct usb_in
pm->input = input_dev;
usb_make_path(udev, pm->phys, sizeof(pm->phys));
- strlcpy(pm->phys, "/input0", sizeof(pm->phys));
+ strlcat(pm->phys, "/input0", sizeof(pm->phys));
spin_lock_init(&pm->lock);
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] do not overwrite the first part of phys string
2009-11-21 7:55 [PATCH] do not overwrite the first part of phys string Németh Márton
@ 2009-11-23 16:08 ` Dmitry Torokhov
2009-11-23 16:11 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2009-11-23 16:08 UTC (permalink / raw)
To: Németh Márton, Jiri Kosina; +Cc: linux-input, LKML
Jiri,
Do you want to split out usbkbd section or do you want me to pick up
everything?
Thanks.
On Sat, Nov 21, 2009 at 08:55:12AM +0100, Németh Márton wrote:
> From: Márton Németh <nm127@freemail.hu>
>
> Use strlcat() to append a string to the previously created first part.
>
> Signed-off-by: Márton Németh <nm127@freemail.hu>
> ---
> diff -upr linux-2.6.32-rc7.orig/drivers/hid/usbhid/usbkbd.c linux-2.6.32-rc7/drivers/hid/usbhid/usbkbd.c
> --- linux-2.6.32-rc7.orig/drivers/hid/usbhid/usbkbd.c 2009-09-10 00:13:59.000000000 +0200
> +++ linux-2.6.32-rc7/drivers/hid/usbhid/usbkbd.c 2009-11-21 08:48:32.000000000 +0100
> @@ -266,7 +266,7 @@ static int usb_kbd_probe(struct usb_inte
> le16_to_cpu(dev->descriptor.idProduct));
>
> usb_make_path(dev, kbd->phys, sizeof(kbd->phys));
> - strlcpy(kbd->phys, "/input0", sizeof(kbd->phys));
> + strlcat(kbd->phys, "/input0", sizeof(kbd->phys));
>
> input_dev->name = kbd->name;
> input_dev->phys = kbd->phys;
> diff -upr linux-2.6.32-rc7.orig/drivers/input/misc/ati_remote.c linux-2.6.32-rc7/drivers/input/misc/ati_remote.c
> --- linux-2.6.32-rc7.orig/drivers/input/misc/ati_remote.c 2009-09-10 00:13:59.000000000 +0200
> +++ linux-2.6.32-rc7/drivers/input/misc/ati_remote.c 2009-11-21 08:48:50.000000000 +0100
> @@ -766,7 +766,7 @@ static int ati_remote_probe(struct usb_i
> ati_remote->interface = interface;
>
> usb_make_path(udev, ati_remote->phys, sizeof(ati_remote->phys));
> - strlcpy(ati_remote->phys, "/input0", sizeof(ati_remote->phys));
> + strlcat(ati_remote->phys, "/input0", sizeof(ati_remote->phys));
>
> if (udev->manufacturer)
> strlcpy(ati_remote->name, udev->manufacturer, sizeof(ati_remote->name));
> diff -upr linux-2.6.32-rc7.orig/drivers/input/misc/powermate.c linux-2.6.32-rc7/drivers/input/misc/powermate.c
> --- linux-2.6.32-rc7.orig/drivers/input/misc/powermate.c 2009-09-10 00:13:59.000000000 +0200
> +++ linux-2.6.32-rc7/drivers/input/misc/powermate.c 2009-11-21 08:48:44.000000000 +0100
> @@ -338,7 +338,7 @@ static int powermate_probe(struct usb_in
> pm->input = input_dev;
>
> usb_make_path(udev, pm->phys, sizeof(pm->phys));
> - strlcpy(pm->phys, "/input0", sizeof(pm->phys));
> + strlcat(pm->phys, "/input0", sizeof(pm->phys));
>
> spin_lock_init(&pm->lock);
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-23 16:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-21 7:55 [PATCH] do not overwrite the first part of phys string Németh Márton
2009-11-23 16:08 ` Dmitry Torokhov
2009-11-23 16:11 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).