aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-03-28 05:51:36 +0000
committerJohn Rigby <john.rigby@linaro.org>2012-07-20 20:33:27 -0600
commitae97aaf7d0837c69cc37f5fc3e3ff0ea0cf6d663 (patch)
tree7fc2c49dd50c03ad5acc9b83463323aa414832b1
parenta0854adedf77a3214616d7a2b21a8eff117ae8a0 (diff)
downloadu-boot-linaro-stable-ae97aaf7d0837c69cc37f5fc3e3ff0ea0cf6d663.tar.gz
pxe: support absolute paths
If the file path starts with a '/', then don't pre-pend the bootfile path. This fixes a problem with running 'pxe boot' multiple times where the bootfile path gets pre-pended to itself each time. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
-rw-r--r--common/cmd_pxe.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 946466e9d..b03fc5688 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -99,24 +99,24 @@ static int format_mac_pxe(char *outbuf, size_t outbuf_len)
* in. If bootfile isn't defined in the environment, return NULL, which should
* be interpreted as "don't prepend anything to paths".
*/
-static int get_bootfile_path(char *bootfile_path, size_t bootfile_path_size)
+static int get_bootfile_path(const char *file_path, char *bootfile_path,
+ size_t bootfile_path_size)
{
char *bootfile, *last_slash;
- size_t path_len;
+ size_t path_len = 0;
+
+ if (file_path[0] == '/')
+ goto ret;
bootfile = from_env("bootfile");
- if (!bootfile) {
- bootfile_path[0] = '\0';
- return 1;
- }
+ if (!bootfile)
+ goto ret;
last_slash = strrchr(bootfile, '/');
- if (last_slash == NULL) {
- bootfile_path[0] = '\0';
- return 1;
- }
+ if (last_slash == NULL)
+ goto ret;
path_len = (last_slash - bootfile) + 1;
@@ -129,6 +129,7 @@ static int get_bootfile_path(char *bootfile_path, size_t bootfile_path_size)
strncpy(bootfile_path, bootfile, path_len);
+ ret:
bootfile_path[path_len] = '\0';
return 1;
@@ -150,7 +151,7 @@ static int get_relfile(char *file_path, void *file_addr)
char *tftp_argv[] = {"tftp", NULL, NULL, NULL};
int err;
- err = get_bootfile_path(relfile, sizeof(relfile));
+ err = get_bootfile_path(file_path, relfile, sizeof(relfile));
if (err < 0)
return err;