From 6ab12830921c1de4eb90a0d471bf5f4677af734c Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Tue, 3 Jul 2018 19:36:43 -0500 Subject: net: Consolidate the parsing of bootfile The same basic parsing was implemented in tftp and nfs, so add a helper function to do the work once. Signed-off-by: Joe Hershberger --- net/nfs.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'net/nfs.c') diff --git a/net/nfs.c b/net/nfs.c index 86dfe9a494..d6a7f8e827 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -859,7 +859,8 @@ void nfs_start(void) return; } - if (net_boot_file_name[0] == '\0') { + if (!net_parse_bootfile(&nfs_server_ip, nfs_path, + sizeof(nfs_path_buff))) { sprintf(nfs_path, "/nfsroot/%02X%02X%02X%02X.img", net_ip.s_addr & 0xFF, (net_ip.s_addr >> 8) & 0xFF, @@ -868,18 +869,6 @@ void nfs_start(void) printf("*** Warning: no boot file name; using '%s'\n", nfs_path); - } else { - char *p = net_boot_file_name; - - p = strchr(p, ':'); - - if (p != NULL) { - nfs_server_ip = string_to_ip(net_boot_file_name); - ++p; - strcpy(nfs_path, p); - } else { - strcpy(nfs_path, net_boot_file_name); - } } nfs_filename = basename(nfs_path); -- cgit