Skip to content

qdl: Add support for multiple include folders using a list #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WilliamBright-IMD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

qdl: Add support for multiple include folders using a list #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd47e4a
qdl: Add support for having up to 32 include folder when searching fo…
WilliamBright-IMD Mar 12, 2026
d43e4d8
qdl: replace fixed-size include directory array with linked list
WilliamBright-IMD Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions program.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,15 @@ 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, struct list_head *incdirs)
{
struct incdir_entry *incdir;
struct program *program;
char tmp[PATH_MAX];
int errors = 0;
int ret;
int fd = -1;
bool found = false;

program = calloc(1, sizeof(struct program));

Expand Down Expand Up @@ -184,11 +186,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);
list_for_each_entry(incdir, incdirs, node) {
snprintf(tmp, PATH_MAX, "%s/%s", incdir->path, 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;
}
}

Expand Down Expand Up @@ -227,7 +232,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, struct list_head *incdirs)
{
xmlNode *node;
xmlNode *root;
Expand All @@ -248,7 +253,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, incdirs);
else {
ux_err("unrecognized tag \"%s\" in program-type file \"%s\"\n", node->name, program_file);
errors = -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion program.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, struct list_head *incdirs);
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);
Expand Down
20 changes: 16 additions & 4 deletions qdl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,11 +557,20 @@ static int qdl_ramdump(int argc, char **argv)
return ret;
}

static void free_incdirs(struct list_head *incdirs)
{
struct incdir_entry *incdir, *tmp;

list_for_each_entry_safe(incdir, tmp, incdirs, node)
free(incdir);
}

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;
struct list_head incdirs = LIST_INIT(incdirs);
struct incdir_entry *incdir;
char *serial = NULL;
const char *vip_generate_dir = NULL;
const char *vip_table_path = NULL;
Expand Down Expand Up @@ -614,7 +623,9 @@ static int qdl_flash(int argc, char **argv)
allow_missing = true;
break;
case 'i':
incdir = optarg;
incdir = calloc(1, sizeof(*incdir));
incdir->path = optarg;
list_add(&incdirs, &incdir->node);
break;
case 'l':
qdl_finalize_provisioning = true;
Expand Down Expand Up @@ -698,7 +709,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, &incdirs);
if (ret < 0)
errx(1, "program_load %s failed", argv[optind]);

Expand All @@ -707,7 +718,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], &incdirs);
if (ret < 0)
errx(1, "read_op_load %s failed", argv[optind]);
break;
Expand Down Expand Up @@ -770,6 +781,7 @@ static int qdl_flash(int argc, char **argv)

free_programs();
free_patches();
free_incdirs(&incdirs);

if (qdl) {
if (qdl->vip_data.state != VIP_DISABLED)
Expand Down
5 changes: 5 additions & 0 deletions qdl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
(__typeof__(p))(((uintptr_t)(p) + _mask) & ~_mask); \
})

struct incdir_entry {
const char *path;
struct list_head node;
};

#define MAPPING_SZ 64

#define SAHARA_ID_EHOSTDL_IMG 13
Expand Down
20 changes: 15 additions & 5 deletions read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,16 @@

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, struct list_head *incdirs)
{
struct incdir_entry *incdir;
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) {
Expand Down Expand Up @@ -61,10 +63,18 @@ 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) {
list_for_each_entry(incdir, incdirs, node) {
snprintf(tmp, PATH_MAX, "%s/%s", incdir->path, 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);
Expand Down
2 changes: 1 addition & 1 deletion read.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, struct list_head *incdirs);
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);
Expand Down