apply manual raspbian patches

diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c
index ac73710473deaecd079d9846f3a9f5239b8055df..8d66adfca4c0510a71350032571bdbf10f59209c 100644 (file)
--- 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 9d415228883deb286ec684d22a311940aae943a3..47aba5ad179f02b63141c851c406632c253b02f5 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
+#pragma GCC diagnostic warning "-Wformat-truncation"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/tools/usb/usbip/src/usbip.c b/tools/usb/usbip/src/usbip.c
index d7599d9435298286d63642067144c280c6110002..8227bcdd01acd3b9f6c2db6efefafe6917ad94b7 100644 (file)
--- 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;