update files to correct FSF address

[openocd] / src / helper / ioutil.c

diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 4e9d6878eae396b72b3c533ac80b630aaffbcc20..ba7e2155ac971986ee7210dd8f3501bbb70ed6c3 100644 (file)
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /* this file contains various functionality useful to standalone systems */
@@ -48,10 +48,8 @@
 #include <ifaddrs.h>
 #endif
 #ifdef HAVE_MALLOC_H
-#if !BUILD_ECOSBOARD
 #include <malloc.h>
 #endif
-#endif
 
 /* loads a file and returns a pointer to it in memory. The file contains
  * a 0 byte(sentinel) after len bytes - the length of the file. */
@@ -139,6 +137,7 @@ COMMAND_HANDLER(handle_trunc_command)
        return ERROR_OK;
 }
 
+#ifdef HAVE_MALLOC_H
 COMMAND_HANDLER(handle_meminfo_command)
 {
        static int prev;
@@ -157,7 +156,7 @@ COMMAND_HANDLER(handle_meminfo_command)
 
        return ERROR_OK;
 }
-
+#endif
 
 COMMAND_HANDLER(handle_append_command)
 {
@@ -489,6 +488,8 @@ static int ioutil_Jim_Command_ip(Jim_Interp *interp, int argc,
        return JIM_OK;
 }
 
+#ifdef HAVE_SYS_IOCTL_H
+#ifdef SIOCGIFHWADDR
 /* not so pretty code to fish out eth0 mac address */
 static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc,
        Jim_Obj *const *argv)
@@ -547,6 +548,8 @@ static int ioutil_Jim_Command_mac(Jim_Interp *interp, int argc,
        return JIM_ERR;
 
 }
+#endif
+#endif
 
 static const struct command_registration ioutil_command_handlers[] = {
        {
@@ -577,12 +580,14 @@ static const struct command_registration ioutil_command_handlers[] = {
                .help = "append a variable number of strings to a file",
                .usage = "file_name [<string1>, [<string2>, ...]]",
        },
+#ifdef HAVE_MALLOC_H
        {
                .name = "meminfo",
                .handler = handle_meminfo_command,
                .mode = COMMAND_ANY,
                .help = "display free heap space",
        },
+#endif
        {
                .name = "rm",
                .mode = COMMAND_ANY,
@@ -618,12 +623,16 @@ static const struct command_registration ioutil_command_handlers[] = {
                .help = "show a listing of files",
                .usage = "dirname",
        },
+#ifdef HAVE_SYS_IOCTL_H
+#ifdef SIOCGIFHWADDR
        {
                .name = "mac",
                .mode = COMMAND_ANY,
                .jim_handler = ioutil_Jim_Command_mac,
                .help = "show MAC address",
        },
+#endif
+#endif
        {
                .name = "ip",
                .jim_handler = ioutil_Jim_Command_ip,