CVS commit: [netbsd-5] src/usr.bin/btkey

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Fri Dec 18 06:00:31 UTC 2009

Modified Files:
        src/usr.bin/btkey [netbsd-5]: device.c

Log Message:
Pull up following revision(s) (requested by plunky in ticket #1192):
        usr.bin/btkey/device.c: revision 1.3
if HCI commands fail (CommandComplete status != 0) then indicate
ENODEV "Operation Not Supported by Device" rather than random errno.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.12.1 src/usr.bin/btkey/device.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/btkey/device.c
diff -u src/usr.bin/btkey/device.c:1.2 src/usr.bin/btkey/device.c:1.2.12.1
--- src/usr.bin/btkey/device.c:1.2	Sat Dec 15 16:03:30 2007
+++ src/usr.bin/btkey/device.c	Fri Dec 18 06:00:31 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.c,v 1.2 2007/12/15 16:03:30 perry Exp $	*/
+/*	$NetBSD: device.c,v 1.2.12.1 2009/12/18 06:00:31 snj Exp $	*/
 
 /*-
  * Copyright (c) 2007 Iain Hibbert
@@ -28,9 +28,10 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: device.c,v 1.2 2007/12/15 16:03:30 perry Exp $");
+__RCSID("$NetBSD: device.c,v 1.2.12.1 2009/12/18 06:00:31 snj Exp $");
 
 #include <bluetooth.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <string.h>
 #include <unistd.h>
@@ -134,8 +135,10 @@
 {
 	hci_read_stored_link_key_rp *rp = arg;
 
-	if (rp->status)
+	if (rp->status) {
+		errno = ENODEV;
 		return -1;
+	}
 
 	printf("\n");
 	printf("read %d keys (max %d)\n", rp->num_keys_read, rp->max_num_keys);
@@ -217,8 +220,10 @@
 {
 	hci_write_stored_link_key_rp *rp = arg;
 
-	if (rp->status || rp->num_keys_written != 1)
+	if (rp->status || rp->num_keys_written != 1) {
+		errno = ENODEV;
 		return -1;
+	}
 
 	return 1;
 }
@@ -245,8 +250,10 @@
 {
 	hci_delete_stored_link_key_rp *rp = arg;
 
-	if (rp->status || rp->num_keys_deleted != 1)
+	if (rp->status || rp->num_keys_deleted != 1) {
+		errno = ENODEV;
 		return -1;
+	}
 
 	return 1;
 }