Listing serial ports in unix working

CubeControl/cubeWorker.java

@@ -377,7 +377,7 @@ public class cubeWorker {
 
 	/**
 	 * Get the names of all available serial ports.
-	 * @return Array of port names. First entry is always "Select serial port..."
+	 * @return Array of port names. First entry is "Select serial port..." if no others
 	 */
     public String[] getSerialPorts() {
 		String[] ports = {"Select serial port..."};
@@ -386,10 +386,9 @@ public class cubeWorker {
 			return ports;
 		}
 		StringTokenizer sT = new StringTokenizer(portLines, "\n");
-		int size = sT.countTokens() + 1;
+		int size = sT.countTokens();
 		ports = new String[size];
-		ports[0] = "Select serial port...";
-		for (int i = 1; i < size; i++) {
+		for (int i = 0; i < size; i++) {
 			ports[i] = sT.nextToken();
 		}
 		return ports;

CubeControl/helper/unixSerial.c

@@ -143,24 +143,45 @@ char** namesInDev(int *siz) {
 char** getSerialPorts(void) {
 	int size;
 	char** files = namesInDev(&size);
-	char** fin = NULL;
+	char **fin = NULL, **finish = NULL;
 	int i = 0, j = 0, f, g;
 
-	printf("JNI: Got files in /dev/\n");
+	// printf("JNI: Got files in /dev (%d)\n", size);
 
 	fin = (char **)malloc(size * sizeof(char *));
-	fin[size - 1] = NULL;
+	// Has space for all files in dev!
+
 	while (files[i] != NULL) {
+		// Filter for SEARCH and if it is a serial port
 		if (strstr(files[i], SEARCH) != NULL) {
+			// We have a match
+			// printf("JNI: %s matched %s", files[i], SEARCH);
 			f = serialOpen(files[i]);
-			if (fd != -1) {
+			if (f != -1) {
+				// printf(" and is a serial port\n");
 				fin[j++] = files[i];
 				serialClose();
+			} else {
+				// printf(" and is not a serial port\n");
+				free(files[i]);
 			}
+		} else {
+			free(files[i]);
 		}
 		i++;
 	}
 	free(files);
 
-	return fin;
+	// printf("JNI: Found %d serial ports\n", j);
+
+	// Copy in memory with matching size, NULL at end
+	finish = (char **)malloc((j + 1) * sizeof(char *));
+	finish[j] = NULL; 
+	for (i = 0; i < j; i++) {
+		finish[i] = fin[i];
+	}
+
+	free(fin);
+
+	return finish;
 }

CubeControl/serialHelper.c

@@ -36,26 +36,27 @@ JNIEXPORT jstring JNICALL Java_HelperUtility_getPorts(JNIEnv *env, jclass class)
 	char *string = NULL;
 	int length = 0, leng2 = 0, lengthabs = 0;
 
-	printf("JNI: Got serial ports...\n");
+	// printf("JNI: Got serial ports...\n");
 
 	// Count how much memory we need for string of all ports, with \n in between
 	while (ports[length] != NULL) {
-		printf("JNI: Startin count...\n");
+		// printf("JNI: Starting count... (%d at %p)\n", length, (void *)ports[length]);
+
 		while (ports[length][leng2] != '\0') {
 			leng2++;
 		}
-		printf("JNI: Counted %s\n", ports[length]);
+		// printf("JNI: Counted %s\n", ports[length]);
 		lengthabs += leng2;
 		leng2 = 0;
 		length++;
 	}
 	length += lengthabs;
 
-	printf("JNI: Counted serial ports...\n");
+	// printf("JNI: Counted serial ports...\n");
 
 	string = (char *)malloc((length + 1) * sizeof(char));
 	if (string == NULL) {
-		printf("JNI: Not enough memory!\n");
+		// printf("JNI: Not enough memory!\n");
 		return (*env)->NewStringUTF(env, NULL);
 	}