From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 26 Apr 2011 23:10:04 +0000 (+0200)
Subject: hid2hci: prepare move to bluez package
X-Git-Tag: 174~158
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f2f3b8807297cd2dc8737758cfa083aaa861404e

hid2hci: prepare move to bluez package
---

diff --git a/Makefile.am b/Makefile.am
index 2aff45e2a..5beec9434 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -524,9 +524,9 @@ libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
 # mtd_probe - autoloads FTL module for mtd devices
 # ------------------------------------------------------------------------------
 extras_mtd_probe_mtd_probe_SOURCES =  \
-							extras/mtd_probe/mtd_probe.c \
-							extras/mtd_probe/mtd_probe.h \
-							extras/mtd_probe/probe_smartmedia.c
+	extras/mtd_probe/mtd_probe.c \
+	extras/mtd_probe/mtd_probe.h \
+	extras/mtd_probe/probe_smartmedia.c
 
 extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
 
diff --git a/extras/hid2hci/hid2hci.c b/extras/hid2hci/hid2hci.c
index 98e60d9ac..559c6f77b 100644
--- a/extras/hid2hci/hid2hci.c
+++ b/extras/hid2hci/hid2hci.c
@@ -2,9 +2,9 @@
  * hid2hci : switch the radio on devices that support
  *           it from HID to HCI and back
  *
- * Copyright (C) 2003-2009  Marcel Holtmann <marcel@holtmann.org>
+ * Copyright (C) 2003-2010  Marcel Holtmann <marcel@holtmann.org>
  * Copyright (C) 2008-2009  Mario Limonciello <mario_limonciello@dell.com>
- * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2009-2011 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 #include <usb.h>
 
 #include "libudev.h"
-#include "libudev-private.h"
 
 enum mode {
 	HCI = 0,
@@ -152,9 +151,8 @@ static int usb_switch_dell(struct usb_dev_handle *dev, enum mode mode)
 }
 
 /*
- * The braindead libusb needs to scan and open all devices, just to
- * to find the device we already have. This needs to be fixed in libusb
- * or it will be ripped out and we carry our own code.
+ * libusb needs to scan and open all devices, just to to find the
+ * device we already have. This should be fixed in libusb.
  */
 static struct usb_device *usb_device_open_from_udev(struct udev_device *usb_dev)
 {
@@ -233,7 +231,7 @@ int main(int argc, char *argv[])
 	} method = METHOD_UNDEF;
 	struct udev *udev;
 	struct udev_device *udev_dev = NULL;
-	char syspath[UTIL_PATH_SIZE];
+	char syspath[PATH_MAX];
 	int (*usb_switch)(struct usb_dev_handle *dev, enum mode mode) = NULL;
 	enum mode mode = HCI;
 	const char *devpath = NULL;
@@ -289,7 +287,7 @@ int main(int argc, char *argv[])
 	if (udev == NULL)
 		goto exit;
 
-	util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
+	snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath);
 	udev_dev = udev_device_new_from_syspath(udev, syspath);
 	if (udev_dev == NULL) {
 		fprintf(stderr, "error: could not find '%s'\n", devpath);