summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner>2001-06-15 16:36:51 +0000
committerdrochner <drochner>2001-06-15 16:36:51 +0000
commit858c6a34e7166bf7967050a43075c1ef5cd9da92 (patch)
tree598c8170227c0076bce5938d3907b449258bd22a
parent860e8af4f59883e8f5a3772a998497746ac869f0 (diff)
downloadpkgsrc-858c6a34e7166bf7967050a43075c1ef5cd9da92.tar.gz
patch from Havard Eidnes: correct handling of "mode" argument to
ensure_ep_open()
-rw-r--r--devel/libusb/distinfo4
-rw-r--r--devel/libusb/patches/patch-ab15
2 files changed, 12 insertions, 7 deletions
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 972bd43ae37..218298332a1 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/15 16:36:51 drochner Exp $
SHA1 (libusb-0.1.3b.tar.gz) = ff64bf2c093f37c3f3b4ebbb40601f49e1d5fb64
Size (libusb-0.1.3b.tar.gz) = 121141 bytes
SHA1 (patch-aa) = 38de6f762249a6a2fa5d36bebcca3ce2b17bdb15
-SHA1 (patch-ab) = bd62cf4c4357e086f5e46f394134f3b111ec4e3f
+SHA1 (patch-ab) = 0e602386aa7892f07a22ce7ed3ce8d844a8c57a5
SHA1 (patch-ac) = 4e68ca416a75d54845bb0c19e17bd1c3d42ed252
diff --git a/devel/libusb/patches/patch-ab b/devel/libusb/patches/patch-ab
index 650d0b7edda..7cb2c9b5c22 100644
--- a/devel/libusb/patches/patch-ab
+++ b/devel/libusb/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2001/03/28 16:43:57 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2001/06/15 16:36:51 drochner Exp $
--- freebsd.c.orig Tue Oct 10 00:08:22 2000
-+++ freebsd.c Wed Mar 28 18:38:33 2001
++++ freebsd.c Fri Jun 15 18:07:19 2001
@@ -41,16 +41,18 @@
{
int i;
@@ -23,15 +23,20 @@ $NetBSD: patch-ab,v 1.2 2001/03/28 16:43:57 drochner Exp $
if (dev->fd < 0)
{
free(info);
-@@ -152,7 +154,7 @@
+@@ -152,10 +154,10 @@
if(info->ep_fd[ep] < 0)
{
- sprintf(buf, "%s.%d", dev->device->filename, ep);
+- fd = open(buf, O_RDONLY);
+ sprintf(buf, "%s.%02d", dev->device->filename, ep);
- fd = open(buf, O_RDONLY);
++ fd = open(buf, mode);
if(fd < 0)
- USB_ERROR_STR(fd, "can't open %s for bulk read: %s\n",
+- USB_ERROR_STR(fd, "can't open %s for bulk read: %s\n",
++ USB_ERROR_STR(fd, "can't open %s for bulk operations: %s\n",
+ buf, strerror(errno));
+ info->ep_fd[ep] = fd;
+ }
@@ -234,10 +236,12 @@
req.data = bytes;
req.flags = 0;