Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pxe: Tidy up the is_pxe global

Browse source 
Move this into the context to avoid a global variable. Also rename it
since the current name does not explain what it actually affects.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Artem Lapkin <email2tema@gmail.com>
Tested-by: Artem Lapkin <email2tema@gmail.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Simon Glass 2021-10-14 12:47:59 -06:00 • committed by Tom Rini
parent 4ad5d51edb
commit 8018b9af57
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/pxe.c
View file

@ -121,7 +121,7 @@ do_pxe_get(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
struct pxe_context ctx; struct pxe_context ctx;
int err, i = 0; int err, i = 0;
pxe_setup_ctx(&ctx, cmdtp, do_get_tftp, NULL); pxe_setup_ctx(&ctx, cmdtp, do_get_tftp, NULL, false);
if (argc != 1) if (argc != 1)
return CMD_RET_USAGE; return CMD_RET_USAGE;
@ -175,7 +175,7 @@ do_pxe_boot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
char *pxefile_addr_str; char *pxefile_addr_str;
struct pxe_context ctx; struct pxe_context ctx;
pxe_setup_ctx(&ctx, cmdtp, do_get_tftp, NULL); pxe_setup_ctx(&ctx, cmdtp, do_get_tftp, NULL, false);
if (argc == 1) { if (argc == 1) {
pxefile_addr_str = from_env("pxefile_addr_r"); pxefile_addr_str = from_env("pxefile_addr_r");
@ -235,8 +235,6 @@ static int do_pxe(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (argc < 2) if (argc < 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
is_pxe = true;
/* drop initial "pxe" arg */ /* drop initial "pxe" arg */
argc--; argc--;
argv++; argv++;

13
cmd/pxe_utils.c
View file

@ -30,8 +30,6 @@
#define MAX_TFTP_PATH_LEN 512 #define MAX_TFTP_PATH_LEN 512
bool is_pxe;
int format_mac_pxe(char *outbuf, size_t outbuf_len) int format_mac_pxe(char *outbuf, size_t outbuf_len)
{ {
uchar ethaddr[6]; uchar ethaddr[6];
@ -58,13 +56,13 @@ int format_mac_pxe(char *outbuf, size_t outbuf_len)
* be interpreted as "don't prepend anything to paths". * be interpreted as "don't prepend anything to paths".
*/ */
static int get_bootfile_path(const char *file_path, char *bootfile_path, static int get_bootfile_path(const char *file_path, char *bootfile_path,
size_t bootfile_path_size) size_t bootfile_path_size, bool allow_abs_path)
{ {
char *bootfile, *last_slash; char *bootfile, *last_slash;
size_t path_len = 0; size_t path_len = 0;
/* Only syslinux allows absolute paths */ /* Only syslinux allows absolute paths */
if (file_path[0] == '/' && !is_pxe) if (file_path[0] == '/' && allow_abs_path)
goto ret; goto ret;
bootfile = from_env("bootfile"); bootfile = from_env("bootfile");
@ -110,7 +108,8 @@ static int get_relfile(struct pxe_context *ctx, const char *file_path,
char addr_buf[18]; char addr_buf[18];
int err; int err;
err = get_bootfile_path(file_path, relfile, sizeof(relfile)); err = get_bootfile_path(file_path, relfile, sizeof(relfile),
ctx->allow_abs_path);
if (err < 0) if (err < 0)
return err; return err;
@ -1451,9 +1450,11 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg)
} }
void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp, void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp,
pxe_getfile_func getfile, void *userdata) pxe_getfile_func getfile, void *userdata,
bool allow_abs_path)
{ {
ctx->cmdtp = cmdtp; ctx->cmdtp = cmdtp;
ctx->getfile = getfile; ctx->getfile = getfile;
ctx->userdata = userdata; ctx->userdata = userdata;
ctx->allow_abs_path = allow_abs_path;
} }

8
cmd/pxe_utils.h
View file

@ -75,8 +75,6 @@ struct pxe_menu {
struct list_head labels; struct list_head labels;
}; };
extern bool is_pxe;
struct pxe_context; struct pxe_context;
typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path, typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path,
char *file_addr); char *file_addr);
@ -87,6 +85,7 @@ typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path,
* @cmdtp: Pointer to command table to use when calling other commands * @cmdtp: Pointer to command table to use when calling other commands
* @getfile: Function called by PXE to read a file * @getfile: Function called by PXE to read a file
* @userdata: Data the caller requires for @getfile * @userdata: Data the caller requires for @getfile
* @allow_abs_path: true to allow absolute paths
*/ */
struct pxe_context { struct pxe_context {
struct cmd_tbl *cmdtp; struct cmd_tbl *cmdtp;
@ -102,6 +101,7 @@ struct pxe_context {
pxe_getfile_func getfile; pxe_getfile_func getfile;
void *userdata; void *userdata;
bool allow_abs_path;
}; };
/** /**
@ -196,8 +196,10 @@ int format_mac_pxe(char *outbuf, size_t outbuf_len);
* @cmdtp: Command table entry which started this action * @cmdtp: Command table entry which started this action
* @getfile: Function to call to read a file * @getfile: Function to call to read a file
* @userdata: Data the caller requires for @getfile - stored in ctx->userdata * @userdata: Data the caller requires for @getfile - stored in ctx->userdata
* @allow_abs_path: true to allow absolute paths
*/ */
void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp, void pxe_setup_ctx(struct pxe_context *ctx, struct cmd_tbl *cmdtp,
pxe_getfile_func getfile, void *userdata); pxe_getfile_func getfile, void *userdata,
bool allow_abs_path);
#endif /* __PXE_UTILS_H */ #endif /* __PXE_UTILS_H */

4
cmd/sysboot.c
View file

@ -65,8 +65,6 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
char *filename; char *filename;
int prompt = 0; int prompt = 0;
is_pxe = false;
if (argc > 1 && strstr(argv[1], "-p")) { if (argc > 1 && strstr(argv[1], "-p")) {
prompt = 1; prompt = 1;
argc--; argc--;
@ -91,7 +89,7 @@ static int do_sysboot(struct cmd_tbl *cmdtp, int flag, int argc,
env_set("bootfile", filename); env_set("bootfile", filename);
} }
pxe_setup_ctx(&ctx, cmdtp, NULL, NULL); pxe_setup_ctx(&ctx, cmdtp, NULL, NULL, true);
if (strstr(argv[3], "ext2")) { if (strstr(argv[3], "ext2")) {
ctx.getfile = do_get_ext2; ctx.getfile = do_get_ext2;
} else if (strstr(argv[3], "fat")) { } else if (strstr(argv[3], "fat")) {