qdl: Add support for having up to 32 include folder when searching for files. This is particularly useful for yocto builds since binaries are generated into three folders whereas currently QDL only supports searching for files in two folders.

Author: WilliamBright-IMD

program.c

@@ -148,13 +148,14 @@ static int program_load_sparse(struct program *program, int fd)
 	return 0;
 }
 
-static int load_program_tag(xmlNode *node, bool is_nand, bool allow_missing, const char *incdir)
+static int load_program_tag(xmlNode *node, bool is_nand, bool allow_missing, const char *incdir[], int incdir_count)
 {
 	struct program *program;
 	char tmp[PATH_MAX];
 	int errors = 0;
 	int ret;
 	int fd = -1;
+	bool found = false;
 
 	program = calloc(1, sizeof(struct program));
 
@@ -184,11 +185,14 @@ static int load_program_tag(xmlNode *node, bool is_nand, bool allow_missing, con
 	}
 
 	if (program->filename) {
-		if (incdir) {
-			snprintf(tmp, PATH_MAX, "%s/%s", incdir, program->filename);
+		for (int i = 0; i < incdir_count && incdir[i]; ++i) {
+			snprintf(tmp, PATH_MAX, "%s/%s", incdir[i], program->filename);
 			if (access(tmp, F_OK) != -1) {
 				free((void *)program->filename);
 				program->filename = strdup(tmp);
+				if(found)
+					ux_info("multiple files found for %s, using %s\n", program->filename, tmp);
+				found = true;
 			}
 		}
 
@@ -227,7 +231,7 @@ static int load_program_tag(xmlNode *node, bool is_nand, bool allow_missing, con
 	return 0;
 }
 
-int program_load(const char *program_file, bool is_nand, bool allow_missing, const char *incdir)
+int program_load(const char *program_file, bool is_nand, bool allow_missing, const char *incdir[], int incdir_count)
 {
 	xmlNode *node;
 	xmlNode *root;
@@ -248,7 +252,7 @@ int program_load(const char *program_file, bool is_nand, bool allow_missing, con
 		if (!xmlStrcmp(node->name, (xmlChar *)"erase"))
 			errors = load_erase_tag(node, is_nand);
 		else if (!xmlStrcmp(node->name, (xmlChar *)"program"))
-			errors = load_program_tag(node, is_nand, allow_missing, incdir);
+			errors = load_program_tag(node, is_nand, allow_missing, incdir, incdir_count);
 		else {
 			ux_err("unrecognized tag \"%s\" in program-type file \"%s\"\n", node->name, program_file);
 			errors = -EINVAL;

program.h

@@ -33,7 +33,7 @@ struct program {
 
 struct qdl_device;
 
-int program_load(const char *program_file, bool is_nand, bool allow_missing, const char *incdir);
+int program_load(const char *program_file, bool is_nand, bool allow_missing, const char *incdir[], int incdir_count);
 int program_execute(struct qdl_device *qdl, int (*apply)(struct qdl_device *qdl, struct program *program, int fd));
 int erase_execute(struct qdl_device *qdl, int (*apply)(struct qdl_device *qdl, struct program *program));
 int program_find_bootable_partition(bool *multiple_found);

qdl.c

@@ -557,7 +557,7 @@ static int qdl_flash(int argc, char **argv)
 {
 	enum qdl_storage_type storage_type = QDL_STORAGE_UFS;
 	struct sahara_image sahara_images[MAPPING_SZ] = {};
-	char *incdir = NULL;
+	const char *incdir[32] = {0};
 	char *serial = NULL;
 	const char *vip_generate_dir = NULL;
 	const char *vip_table_path = NULL;
@@ -571,6 +571,7 @@ static int qdl_flash(int argc, char **argv)
 	unsigned int slot = UINT_MAX;
 	struct qdl_device *qdl = NULL;
 	enum QDL_DEVICE_TYPE qdl_dev_type = QDL_DEVICE_USB;
+	int incdir_count = 0;
 
 	static struct option options[] = {
 		{"debug", no_argument, 0, 'd'},
@@ -610,7 +611,12 @@ static int qdl_flash(int argc, char **argv)
 			allow_missing = true;
 			break;
 		case 'i':
-			incdir = optarg;
+			if (incdir_count < sizeof(incdir) / sizeof(incdir[0])) {
+				incdir[incdir_count] = optarg;
+				incdir_count++;
+			} else {
+				errx(1, "maximum number of include directories exceeded");
+			}
 			break;
 		case 'l':
 			qdl_finalize_provisioning = true;
@@ -694,7 +700,7 @@ static int qdl_flash(int argc, char **argv)
 				errx(1, "patch_load %s failed", argv[optind]);
 			break;
 		case QDL_FILE_PROGRAM:
-			ret = program_load(argv[optind], storage_type == QDL_STORAGE_NAND, allow_missing, incdir);
+			ret = program_load(argv[optind], storage_type == QDL_STORAGE_NAND, allow_missing, incdir, incdir_count);
 			if (ret < 0)
 				errx(1, "program_load %s failed", argv[optind]);
 
@@ -703,7 +709,7 @@ static int qdl_flash(int argc, char **argv)
 					" changes. Allow explicitly with --allow-fusing parameter");
 			break;
 		case QDL_FILE_READ:
-			ret = read_op_load(argv[optind], incdir);
+			ret = read_op_load(argv[optind], incdir, incdir_count);
 			if (ret < 0)
 				errx(1, "read_op_load %s failed", argv[optind]);
 			break;

read.c

@@ -19,14 +19,15 @@
 
 static struct list_head read_ops = LIST_INIT(read_ops);
 
-int read_op_load(const char *read_op_file, const char *incdir)
+int read_op_load(const char *read_op_file, const char *incdir[], int incdir_count)
 {
 	struct read_op *read_op;
 	xmlNode *node;
 	xmlNode *root;
 	xmlDoc *doc;
 	int errors;
 	char tmp[PATH_MAX];
+	bool found = false;
 
 	doc = xmlReadFile(read_op_file, NULL, 0);
 	if (!doc) {
@@ -61,10 +62,17 @@ int read_op_load(const char *read_op_file, const char *incdir)
 			continue;
 		}
 
-		if (incdir) {
-			snprintf(tmp, PATH_MAX, "%s/%s", incdir, read_op->filename);
-			if (access(tmp, F_OK) != -1)
-				read_op->filename = strdup(tmp);
+		if (read_op->filename) {
+			for (int i = 0; i < incdir_count && incdir[i]; ++i) {
+				snprintf(tmp, PATH_MAX, "%s/%s", incdir[i], read_op->filename);
+				if (access(tmp, F_OK) != -1) {
+					free((void *)read_op->filename);
+					read_op->filename = strdup(tmp);
+					if(found)
+						ux_info("multiple files found for %s, using %s\n", read_op->filename, tmp);
+					found = true;
+				}
+			}
 		}
 
 		list_add(&read_ops, &read_op->node);

read.h

@@ -19,7 +19,7 @@ struct read_op {
 	struct list_head node;
 };
 
-int read_op_load(const char *read_op_file, const char *incdir);
+int read_op_load(const char *read_op_file, const char *incdir[], int incdir_count);
 int read_op_execute(struct qdl_device *qdl,
 		    int (*apply)(struct qdl_device *qdl, struct read_op *read_op, int fd));
 int read_cmd_add(const char *source, const char *filename);