From ee4331bf16dcab82c48c9d4fbbd5f670654067d2 Mon Sep 17 00:00:00 2001 From: Raspbian kernel package updater Date: Sun, 8 Oct 2017 02:52:56 +0000 Subject: [PATCH] apply manual raspbian patches --- tools/usb/usbip/libsrc/usbip_common.c | 5 +++-- tools/usb/usbip/libsrc/usbip_host_common.c | 2 ++ tools/usb/usbip/src/usbip.c | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c index ac73710473de..8d66adfca4c0 100644 --- a/tools/usb/usbip/libsrc/usbip_common.c +++ b/tools/usb/usbip/libsrc/usbip_common.c @@ -214,10 +214,11 @@ int read_usb_device(struct udev_device *sdev, struct usbip_usb_device *udev) int read_usb_interface(struct usbip_usb_device *udev, int i, struct usbip_usb_interface *uinf) { - char busid[SYSFS_BUS_ID_SIZE]; + char busid[SYSFS_BUS_ID_SIZE*2]; struct udev_device *sif; - sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i); + snprintf(busid,SYSFS_BUS_ID_SIZE*2, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i); + busid[SYSFS_BUS_ID_SIZE-1] = 0; sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid); if (!sif) { diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c index 9d415228883d..47aba5ad179f 100644 --- a/tools/usb/usbip/libsrc/usbip_host_common.c +++ b/tools/usb/usbip/libsrc/usbip_host_common.c @@ -21,6 +21,8 @@ * along with this program. If not, see . */ +#pragma GCC diagnostic warning "-Wformat-truncation" + #include #include #include diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c index d7599d943529..8227bcdd01ac 100644 --- a/tools/usb/usbip/src/usbip.c +++ b/tools/usb/usbip/src/usbip.c @@ -176,6 +176,9 @@ int main(int argc, char *argv[]) break; case '?': printf("usbip: invalid option\n"); + usbip_usage(); + goto out; + break; default: usbip_usage(); goto out; -- 2.30.2