Re: [U-Boot-Users] [PATCH 0/1] TFTP: add host ip addr support

11 Jan 2008


      On 12:33 Fri 11 Jan     , Andre Renaud wrote:
...
Jean-Christophe PLAGNIOL-VILLARD wrote:
...
Doesn't this mean that TftpServerIP will be undefined if no server is
specified. Should it not be:
@@ -464,19 +464,27 @@ TftpStart (void)
   	printf ("*** Warning: no boot file name; using '%s'\n",
   		tftp_filename);
   } else {

tftp_filename = BootFile;




char *p=BootFile;


p = strchr (p, ':');


if (p != NULL) {


	TftpServerIP = string_to_ip (BootFile);


	++p;


	strcpy (tftp_filename, p);


} else {


	TftpServerIP = NetServerIP;


	strcpy (tftp_filename, BootFile);


}




I will prefer
+       TftpServerIP = NetServerIP;
        if (BootFile[0] == '\0') {
                sprintf(default_filename, "%02lX%02lX%02lX%02lX.img",
                        NetOurIP & 0xFF,
@@ -464,19 +465,26 @@ TftpStart (void)
                printf ("*** Warning: no boot file name; using '%s'\n",
                        tftp_filename);
        } else {
-               tftp_filename = BootFile;
+               char *p=BootFile;
+               p = strchr (p, ':');
+               if (p != NULL) {
+                       TftpServerIP = string_to_ip (BootFile);
+                       ++p;
+                       strcpy (tftp_filename, p);
+               } else 
+                       strcpy (tftp_filename, BootFile);
...
Andre
-- 
Bluewater Systems Ltd - ARM Technology Solutions Centre
   Andre Renaud                             Bluewater Systems Ltd

Phone: +64 3 3779127 (Aus 1 800 148 751)        Level 17, 119 Armagh St
Fax:   +64 3 3779135                            PO Box 13889
Email: arenaud@bluewatersys.com                 Christchurch
Web:   http://www.bluewatersys.com              New Zealand

    