mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	fix device probing for UEMIS computer on linux
When the device probing was ported from the Gtk version we skipped the UEMIS code. It's still based on the contents of /proc/mounts, although without the use of glib's helpers. Signed-off-by: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
This commit is contained in:
		
							parent
							
								
									695f64a23a
								
							
						
					
					
						commit
						6259b0301b
					
				
					 1 changed files with 35 additions and 2 deletions
				
			
		
							
								
								
									
										37
									
								
								linux.c
									
										
									
									
									
								
							
							
						
						
									
										37
									
								
								linux.c
									
										
									
									
									
								
							|  | @ -37,6 +37,10 @@ int enumerate_devices (device_callback_t callback, void *userdata) | |||
| 		"rfcomm*", | ||||
| 		NULL | ||||
| 	}; | ||||
| 	FILE *file; | ||||
| 	char *line = NULL; | ||||
| 	char *fname; | ||||
| 	size_t len; | ||||
| 
 | ||||
| 	dp = opendir (dirname); | ||||
| 	if (dp == NULL) { | ||||
|  | @ -59,8 +63,37 @@ int enumerate_devices (device_callback_t callback, void *userdata) | |||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	// TODO: list UEMIS mount point from /proc/mounts
 | ||||
| 
 | ||||
| 	closedir (dp); | ||||
| 
 | ||||
| 	file = fopen("/proc/mounts", "r"); | ||||
| 	if (file == NULL) | ||||
| 		return index; | ||||
| 
 | ||||
| 	while ((getline(&line, &len, file)) != -1) { | ||||
| 		char *ptr = strstr(line, "UEMISSDA"); | ||||
| 		if (ptr) { | ||||
| 			char *end = ptr, *start = ptr; | ||||
| 			while (start > line && *start != ' ') | ||||
| 				start--; | ||||
| 			if (*start == ' ') | ||||
| 				start++; | ||||
| 			while (*end != ' ' && *end != '\0') | ||||
| 				end++; | ||||
| 
 | ||||
| 			*end = '\0'; | ||||
| 			fname = strdup(start); | ||||
| 
 | ||||
| 			callback(fname, userdata); | ||||
| 
 | ||||
| 			if (is_default_dive_computer_device(fname)) | ||||
| 				index = i; | ||||
| 			i++; | ||||
| 			free((void *)fname); | ||||
| 	   } | ||||
| 	} | ||||
| 
 | ||||
| 	free(line); | ||||
| 	fclose(file); | ||||
| 
 | ||||
| 	return index; | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue