From 09ea257c585fd3f828052e25c4f05680914d345b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jul 1999 15:52:35 +0000 Subject: Patch from Eric Norum : I get the following warning when compiling the latest snapshot. I had a quick look at the source -- it certainly looks to me like this is a real bug. ../../../../src/rtems-19990709/c/src/lib/libc/mount.c:97: warning: `options' might be used uninitialized in this function Also, I changed the TFTP test program and TFTP driver to reflect the changes in the way paths are passed to the TFTP driver. The TFTP driver now needs a proper `dotted-decimal' hostname as the second component of the path name. --- cpukit/libnetworking/lib/tftpDriver.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c index d9995019f8..f91b89927f 100644 --- a/cpukit/libnetworking/lib/tftpDriver.c +++ b/cpukit/libnetworking/lib/tftpDriver.c @@ -430,35 +430,30 @@ int rtems_tftp_open( char *remoteFilename; rtems_interval now; rtems_status_code sc; + char *hostname; /* * This came from the evaluate path. */ cp2 = iop->file_info; - if (*cp2 == '/') { - farAddress = rtems_bsdnet_bootp_server_address.s_addr; + + cp1 = cp2; + while (*cp2 != '/') { + if (*cp2 == '\0') + return ENOENT; + cp2++; } - else { - char *hostname; - - cp1 = cp2; - while (*cp2 != '/') { - if (*cp2 == '\0') - return ENOENT; - cp2++; - } - len = cp2 - cp1; - hostname = malloc (len + 1); - if (hostname == NULL) - return ENOMEM; + len = cp2 - cp1; + hostname = malloc (len + 1); + if (hostname == NULL) + return ENOMEM; - strncpy (hostname, cp1, len); - hostname[len] = '\0'; - farAddress = inet_addr (hostname); - free (hostname); - } + strncpy (hostname, cp1, len); + hostname[len] = '\0'; + farAddress = inet_addr (hostname); + free (hostname); if ((farAddress == 0) || (farAddress == ~0)) return ENOENT; -- cgit v1.2.3