- don't die when missing /proc/bus/pci/devices (resp. /proc/bus/usb/devices),

  since on some boxes, this is *normal*!
- free error messages obtained via asprintf
- remove debugging message "TOTO"

1 files changed, 6 insertions, 3 deletions

diff --git a/usb.c b/usb.c
index c41ca00..a92b871 100644
--- a/usb.c
+++ b/usb.c
@@ -19,8 +19,8 @@ extern struct pciusb_entries usb_probe(void) {
 	struct pciusb_entry *e = NULL;
 
 	if (access(proc_pci_path, R_OK) != 0) {
-		printf( "TOTO\n");
-		exit(1);
+		r.nb = 0; r.entries = NULL;
+		return r;
 	}
 
 	if (!(f = fopen(proc_usb_path, "r"))) {
@@ -30,13 +30,16 @@ extern struct pciusb_entries usb_probe(void) {
 				    "You may have passed a wrong argument to the \"-u\" option.\n"
 				    "fopen() sets errno to", proc_usb_path);
 			perror(err_msg);
+			free(err_msg);
 		} /*else {
 			asprintf(&err_msg, "unable to open \"%s\"\n"
 				    "You should enable the usb service (as root, type 'service usb start'.\n"
 				    "fopen() sets errno to", proc_usb_path);
 			perror(err_msg);
+			free(err_msg);
 		} */
-		exit(1);
+		r.nb = 0; r.entries = NULL;
+		return r;
 	}
   
 	for(r.nb = line = 0; fgets(buf, sizeof(buf) - 1, f) && r.nb < psizeof(t); line++) {