hotplug patches: fixes and sysfs support 1/5

["Marco d'Itri" <md@Linux.IT>]

[-- Attachment #1: Type: text/plain, Size: 82 bytes --]

000_small_fixes: fixed some small bugs.

-- 
ciao, |
Marco | [4956 adXbsurXEy5zg]

[-- Attachment #2: 000_small_fixes --]
[-- Type: text/plain, Size: 3433 bytes --]

diff -ruN hotplug-2004_01_05.orig/etc/hotplug/ieee1394.agent hotplug-2004_01_05/etc/hotplug/ieee1394.agent
--- hotplug-2004_01_05.orig/etc/hotplug/ieee1394.agent	2003-09-16 21:42:17.000000000 +0200
+++ hotplug-2004_01_05/etc/hotplug/ieee1394.agent	2004-02-04 20:53:28.000000000 +0100
@@ -98,7 +98,7 @@
     	load_drivers ieee1394 $MAP_CURRENT "$LABEL"
     fi
 
-    if [ "$DRIVERS" == "" ]; then
+    if [ "$DRIVERS" = "" ]; then
 	mesg "... no drivers for $LABEL"
 	exit 2
     fi
diff -ruN hotplug-2004_01_05.orig/etc/hotplug/input.agent hotplug-2004_01_05/etc/hotplug/input.agent
--- hotplug-2004_01_05.orig/etc/hotplug/input.agent	2003-10-14 01:46:58.000000000 +0200
+++ hotplug-2004_01_05/etc/hotplug/input.agent	2004-02-04 20:58:05.000000000 +0100
@@ -154,7 +154,7 @@
     declare -i matchBits
     declare -i bustype vendor product version
     declare -i evBits driverInfo 
-    declare relBits mscBits ledBits sndBitskeyBits absBits ffBits
+    declare relBits mscBits ledBits sndBits keyBits absBits ffBits
 
     while read line
     do
@@ -172,7 +172,7 @@
 	bustype="$3"
 	vendor="$4"
 	product="$5"
-	product="$6"
+	version="$6"
 
 	evBits="$7"
 	keyBits="$8"
diff -ruN hotplug-2004_01_05.orig/etc/hotplug/pci.agent hotplug-2004_01_05/etc/hotplug/pci.agent
--- hotplug-2004_01_05.orig/etc/hotplug/pci.agent	2003-09-16 21:42:17.000000000 +0200
+++ hotplug-2004_01_05/etc/hotplug/pci.agent	2004-02-04 20:53:28.000000000 +0100
@@ -154,7 +154,7 @@
     	load_drivers pci $MAP_CURRENT "$LABEL"
     fi
 
-    if [ "$DRIVERS" == "" ]; then
+    if [ "$DRIVERS" = "" ]; then
 	mesg "... no modules for $LABEL"
 	exit 2
     fi
diff -ruN hotplug-2004_01_05.orig/etc/hotplug/usb.agent hotplug-2004_01_05/etc/hotplug/usb.agent
--- hotplug-2004_01_05.orig/etc/hotplug/usb.agent	2003-10-14 01:52:54.000000000 +0200
+++ hotplug-2004_01_05/etc/hotplug/usb.agent	2004-02-04 20:53:28.000000000 +0100
@@ -195,9 +195,9 @@
         usb_bDeviceProtocol=$3
 	IFS="$DEFAULT_IFS"
     elif [ -r $SYSFS/$DEVPATH/bDeviceClass ]; then
-	usb_bDeviceClass=0x$(cat $SYSFS/$DEVPATH/bDeviceClass)
-	usb_bDeviceSubClass=0x$(cat $SYSFS/$DEVPATH/bDeviceSubClass)
-	usb_bDeviceProtocol=0x$(cat $SYSFS/$DEVPATH/bDeviceProtocol)
+	usb_bDeviceClass=$(cat $SYSFS/$DEVPATH/bDeviceClass)
+	usb_bDeviceSubClass=$(cat $SYSFS/$DEVPATH/bDeviceSubClass)
+	usb_bDeviceProtocol=$(cat $SYSFS/$DEVPATH/bDeviceProtocol)
     else
 	# out-of-range values
 	usb_bDeviceClass=1000
@@ -213,9 +213,9 @@
     	usb_bInterfaceProtocol=$3
 	IFS="$DEFAULT_IFS"
     elif [ -r $SYSFS/$DEVPATH/bInterfaceClass ]; then
-	usb_bInterfaceClass=0x$(cat $SYSFS/$DEVPATH/bInterfaceClass)
-	usb_bInterfaceSubClass=0x$(cat $SYSFS/$DEVPATH/bInterfaceSubClass)
-	usb_bInterfaceProtocol=0x$(cat $SYSFS/$DEVPATH/bInterfaceProtocol)
+	usb_bInterfaceClass=$(cat $SYSFS/$DEVPATH/bInterfaceClass)
+	usb_bInterfaceSubClass=$(cat $SYSFS/$DEVPATH/bInterfaceSubClass)
+	usb_bInterfaceProtocol=$(cat $SYSFS/$DEVPATH/bInterfaceProtocol)
     else
 	# out-of-range values
 	usb_bInterfaceClass=1000
diff -ruN hotplug-2004_01_05.orig/etc/hotplug/usb.rc hotplug-2004_01_05/etc/hotplug/usb.rc
--- hotplug-2004_01_05.orig/etc/hotplug/usb.rc	2003-09-25 02:09:08.000000000 +0200
+++ hotplug-2004_01_05/etc/hotplug/usb.rc	2004-02-04 20:53:28.000000000 +0100
@@ -21,6 +21,9 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
+unset I_WANT_A_BROKEN_PS
+PS_PERSONALITY=linux
+
 STATIC_MODULE_LIST=
 X11_USBMICE_HACK=false