summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-11-05 14:27:18 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-11-05 14:28:11 +0100
commit50e82a6d152a8ada5a4ad3b41a43641afb739aa1 (patch)
treefae0b2fc7b6d2f43f8c8f2c7ca5ee4ca0825c725
parentc622a5e22a58ce50007bd65c76b9a0e79c7ba352 (diff)
downloadrtems-libbsd-50e82a6d152a8ada5a4ad3b41a43641afb739aa1.tar.bz2
HOSTNAME(1): Import from FreeBSD
-rw-r--r--Makefile3
-rwxr-xr-xfreebsd-to-rtems.py1
-rw-r--r--freebsd/bin/hostname/hostname.c143
-rw-r--r--rtemsbsd/include/rtems/netcmds-config.h3
-rw-r--r--testsuite/include/rtems/bsd/test/default-network-init.h1
-rw-r--r--testsuite/netshell01/shellconfig.c1
6 files changed, 151 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 739fef43..9b955a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -674,6 +674,9 @@ freebsd/lib/libc/db/recno/rec_seq.o: freebsd/lib/libc/db/recno/rec_seq.c
LIB_C_FILES += freebsd/lib/libc/db/recno/rec_utils.c
freebsd/lib/libc/db/recno/rec_utils.o: freebsd/lib/libc/db/recno/rec_utils.c
$(CC) $(CPPFLAGS) $(CFLAGS) -D__DBINTERFACE_PRIVATE -DINET6 -c $< -o $@
+LIB_C_FILES += freebsd/bin/hostname/hostname.c
+freebsd/bin/hostname/hostname.o: freebsd/bin/hostname/hostname.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DINET6 -c $< -o $@
LIB_C_FILES += freebsd/lib/libc/gen/err.c
freebsd/lib/libc/gen/err.o: freebsd/lib/libc/gen/err.c
$(CC) $(CPPFLAGS) $(CFLAGS) -DINET6 -c $< -o $@
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index bdb0ddaa..1e385fc8 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -2270,6 +2270,7 @@ userSpace.addUserSpaceSourceFiles(
)
userSpace.addUserSpaceSourceFiles(
[
+ 'bin/hostname/hostname.c',
'lib/libc/gen/err.c',
'lib/libc/gen/feature_present.c',
'lib/libc/gen/gethostname.c',
diff --git a/freebsd/bin/hostname/hostname.c b/freebsd/bin/hostname/hostname.c
new file mode 100644
index 00000000..c3342b85
--- /dev/null
+++ b/freebsd/bin/hostname/hostname.c
@@ -0,0 +1,143 @@
+#include <machine/rtems-bsd-user-space.h>
+
+/*-
+ * Copyright (c) 1988, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if 0
+#ifndef lint
+static char const copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+ The Regents of the University of California. All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93";
+#endif /* not lint */
+#endif
+#ifdef __rtems__
+#define __need_getopt_newlib
+#include <getopt.h>
+#include <rtems/netcmds-config.h>
+#include <machine/rtems-bsd-program.h>
+#include <machine/rtems-bsd-commands.h>
+#endif /* __rtems__ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <rtems/bsd/sys/param.h>
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void usage(void);
+
+#ifdef __rtems__
+static int main(int argc, char *argv[]);
+
+static int hostname_command(int argc, char *argv[])
+{
+ int exit_code;
+
+ rtems_bsd_program_lock();
+
+ exit_code = rtems_bsd_program_call_main("hostname", main, argc, argv);
+
+ rtems_bsd_program_unlock();
+
+ return exit_code;
+}
+
+rtems_shell_cmd_t rtems_shell_HOSTNAME_Command = {
+ .name = "hostname",
+ .usage = "hostname [-fs] [name-of-host]",
+ .topic = "net",
+ .command = hostname_command
+};
+#endif /* __rtems__ */
+int
+main(int argc, char *argv[])
+{
+ int ch, sflag;
+ char *p, hostname[MAXHOSTNAMELEN];
+#ifdef __rtems__
+ struct getopt_data getopt_data;
+ memset(&getopt_data, 0, sizeof(getopt_data));
+#define optind getopt_data.optind
+#define getopt(argc, argv, opt) getopt_r(argc, argv, "+" opt, &getopt_data)
+#endif /* __rtems__ */
+
+ sflag = 0;
+ while ((ch = getopt(argc, argv, "fs")) != -1)
+ switch (ch) {
+ case 'f':
+ /*
+ * On Linux, "hostname -f" prints FQDN.
+ * BSD "hostname" always prints FQDN by
+ * default, so we accept but ignore -f.
+ */
+ break;
+ case 's':
+ sflag = 1;
+ break;
+ case '?':
+ default:
+ usage();
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (argc > 1)
+ usage();
+
+ if (*argv) {
+ if (sethostname(*argv, (int)strlen(*argv)))
+ err(1, "sethostname");
+ } else {
+ if (gethostname(hostname, (int)sizeof(hostname)))
+ err(1, "gethostname");
+ if (sflag) {
+ p = strchr(hostname, '.');
+ if (p != NULL)
+ *p = '\0';
+ }
+ (void)printf("%s\n", hostname);
+ }
+ exit(0);
+}
+
+static void
+usage(void)
+{
+
+ (void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n");
+ exit(1);
+}
diff --git a/rtemsbsd/include/rtems/netcmds-config.h b/rtemsbsd/include/rtems/netcmds-config.h
index d9ccd69c..0c5b7589 100644
--- a/rtemsbsd/include/rtems/netcmds-config.h
+++ b/rtemsbsd/include/rtems/netcmds-config.h
@@ -30,10 +30,11 @@ extern rtems_shell_cmd_t rtems_shell_PING6_Command;
extern rtems_shell_cmd_t rtems_shell_IFCONFIG_Command;
extern rtems_shell_cmd_t rtems_shell_ROUTE_Command;
extern rtems_shell_cmd_t rtems_shell_NETSTAT_Command;
-extern rtems_shell_cmd_t rtems_shell_DHCPCD_Command;
extern rtems_shell_cmd_t rtems_shell_DHCPCD_Command;
+extern rtems_shell_cmd_t rtems_shell_HOSTNAME_Command;
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h
index 962635df..de0128d7 100644
--- a/testsuite/include/rtems/bsd/test/default-network-init.h
+++ b/testsuite/include/rtems/bsd/test/default-network-init.h
@@ -321,6 +321,7 @@ SYSINIT_NEED_NET_PF_UNIX;
#define CONFIGURE_SHELL_USER_COMMANDS \
&bsp_interrupt_shell_command, \
&rtems_shell_BSD_Command, \
+ &rtems_shell_HOSTNAME_Command, \
&rtems_shell_PING_Command, \
&rtems_shell_ROUTE_Command, \
&rtems_shell_NETSTAT_Command, \
diff --git a/testsuite/netshell01/shellconfig.c b/testsuite/netshell01/shellconfig.c
index 9b5e4c18..310f1379 100644
--- a/testsuite/netshell01/shellconfig.c
+++ b/testsuite/netshell01/shellconfig.c
@@ -10,6 +10,7 @@
#define CONFIGURE_SHELL_COMMANDS_ALL
#define CONFIGURE_SHELL_USER_COMMANDS \
+ &rtems_shell_HOSTNAME_Command, \
&rtems_shell_PING_Command, \
&rtems_shell_ROUTE_Command, \
&rtems_shell_NETSTAT_Command, \