diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2023-10-17 16:51:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-10-23 10:07:05 +0200 |
| commit | eaecc8966ca3e5174a90686973c6d9b7c413fdec (patch) | |
| tree | 13cb7e742215b32b381c421c4195ad426d1f982d /scripts | |
| parent | 72e6fd798b52ba396d029482196836bbb7e14533 (diff) | |
| download | barebox-eaecc8966ca3e5174a90686973c6d9b7c413fdec.tar.gz barebox-eaecc8966ca3e5174a90686973c6d9b7c413fdec.tar.xz | |
scripts: imx: replace static string allocation
Make the CSF command string allocation more dynamic by introducing
strcata(lloc)(). To make it more straight forward.
Suggested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20231017145131.3069283-22-m.felsch@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/imx/imx.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c index b0206c6c12..8485411ece 100644 --- a/scripts/imx/imx.c +++ b/scripts/imx/imx.c @@ -20,6 +20,23 @@ */ #define ENCRYPT_OFFSET (HEADER_LEN + 0x10) +static char *strcata(char *str, const char *add) +{ + size_t size = (str ? strlen(str) : 0) + strlen(add) + 1; + bool need_init = str ? false : true; + + str = realloc(str, size); + if (!str) + return NULL; + + if (need_init) + memset(str, 0, size); + + strcat(str, add); + + return str; +} + static int parse_line(char *line, char *argv[]) { int nargs = 0; @@ -284,15 +301,10 @@ static int do_max_load_size(struct config_data *data, int argc, char *argv[]) static int hab_add_str(struct config_data *data, const char *str) { - int len = strlen(str); - - if (data->csf_space < len) + data->csf = strcata(data->csf, str); + if (!data->csf) return -ENOMEM; - strcat(data->csf, str); - - data->csf_space -= len; - return 0; } @@ -300,14 +312,6 @@ static int do_hab(struct config_data *data, int argc, char *argv[]) { int i, ret; - if (!data->csf) { - data->csf_space = 0x10000; - - data->csf = calloc(data->csf_space + 1, 1); - if (!data->csf) - return -ENOMEM; - } - for (i = 1; i < argc; i++) { ret = hab_add_str(data, argv[i]); if (ret) |