From: Keith Packard <keithp@keithp.com>
Date: Fri, 11 Jan 2013 05:26:20 +0000 (-0800)
Subject: libaltos: Need to check for tty/ttyACMx before ttyACMx
X-Git-Tag: 1.1.9.3~8^2~8
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=12a9bd0479db25cbe45c0385913315cc1e0bc892

libaltos: Need to check for tty/ttyACMx before ttyACMx

Otherwise, we'll find 'tty' when looking for 'ttyACMx' and no good
will come from that

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/libaltos/libaltos.c b/libaltos/libaltos.c
index 505b3147..ca56746a 100644
--- a/libaltos/libaltos.c
+++ b/libaltos/libaltos.c
@@ -478,26 +478,26 @@ usb_tty(char *sys)
 				return tty;
 			}
 
-			/* Check for ttyACMx style names
+			/* Check for tty/ttyACMx style names
 			 */
-			ntty = scandir(endpoint_full, &namelist,
+			tty_dir = cc_fullname(endpoint_full, "tty");
+			ntty = scandir(tty_dir, &namelist,
 				       dir_filter_tty,
 				       alphasort);
+			free (tty_dir);
 			if (ntty > 0) {
-				free(endpoint_full);
 				tty = cc_fullname("/dev", namelist[0]->d_name);
+				free(endpoint_full);
 				free(namelist);
 				return tty;
 			}
 
-			/* Check for tty/ttyACMx style names
+			/* Check for ttyACMx style names
 			 */
-			tty_dir = cc_fullname(endpoint_full, "tty");
-			free(endpoint_full);
-			ntty = scandir(tty_dir, &namelist,
+			ntty = scandir(endpoint_full, &namelist,
 				       dir_filter_tty,
 				       alphasort);
-			free (tty_dir);
+			free(endpoint_full);
 			if (ntty > 0) {
 				tty = cc_fullname("/dev", namelist[0]->d_name);
 				free(namelist);