diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
| commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
| tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/sbin/dhclient | |
| parent | Move files to match FreeBSD layout (diff) | |
| download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 | |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'freebsd/sbin/dhclient')
| -rw-r--r-- | freebsd/sbin/dhclient/bpf.c | 5 | ||||
| -rw-r--r-- | freebsd/sbin/dhclient/dhclient.c | 8 | ||||
| -rw-r--r-- | freebsd/sbin/dhclient/dhcpd.h | 4 | ||||
| -rw-r--r-- | freebsd/sbin/dhclient/dispatch.c | 4 | ||||
| -rw-r--r-- | freebsd/sbin/dhclient/privsep.h | 2 |
5 files changed, 7 insertions, 16 deletions
diff --git a/freebsd/sbin/dhclient/bpf.c b/freebsd/sbin/dhclient/bpf.c index 7f87ddf5..9f8e45fb 100644 --- a/freebsd/sbin/dhclient/bpf.c +++ b/freebsd/sbin/dhclient/bpf.c @@ -47,13 +47,8 @@ __FBSDID("$FreeBSD$"); #include <sys/ioctl.h> #include <sys/uio.h> -#ifdef __rtems__ -#include <freebsd/net/bpf.h> -#include <freebsd/netinet/in_systm.h> -#else #include <net/bpf.h> #include <netinet/in_systm.h> -#endif #include <netinet/ip.h> #include <netinet/udp.h> #include <netinet/if_ether.h> diff --git a/freebsd/sbin/dhclient/dhclient.c b/freebsd/sbin/dhclient/dhclient.c index f3c1259d..b72d5bff 100644 --- a/freebsd/sbin/dhclient/dhclient.c +++ b/freebsd/sbin/dhclient/dhclient.c @@ -59,11 +59,7 @@ __FBSDID("$FreeBSD$"); #include "dhcpd.h" #include "privsep.h" -#ifdef __rtems__ -#include <freebsd/net80211/ieee80211_freebsd.h> -#else #include <net80211/ieee80211_freebsd.h> -#endif #ifndef _PATH_VAREMPTY #define _PATH_VAREMPTY "/var/empty" @@ -422,6 +418,10 @@ main(int argc, char *argv[]) close(pipe_fd[0]); privfd = pipe_fd[1]; +#ifdef __rtems__ +/* FIXME: Add O_EXLOCK capabilities to RTEMS file system */ +#define O_EXLOCK 0 +#endif /* __rtems__ */ if ((fd = open(path_dhclient_db, O_RDONLY|O_EXLOCK|O_CREAT, 0)) == -1) error("can't open and lock %s: %m", path_dhclient_db); read_client_leases(); diff --git a/freebsd/sbin/dhclient/dhcpd.h b/freebsd/sbin/dhclient/dhcpd.h index bd4c9c0b..0c47a9f8 100644 --- a/freebsd/sbin/dhclient/dhcpd.h +++ b/freebsd/sbin/dhclient/dhcpd.h @@ -41,12 +41,12 @@ * $FreeBSD$ */ -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/stat.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <sys/un.h> #include <sys/wait.h> diff --git a/freebsd/sbin/dhclient/dispatch.c b/freebsd/sbin/dhclient/dispatch.c index b04d488f..3ee0cf6c 100644 --- a/freebsd/sbin/dhclient/dispatch.c +++ b/freebsd/sbin/dhclient/dispatch.c @@ -46,11 +46,7 @@ __FBSDID("$FreeBSD$"); #include <sys/ioctl.h> -#ifdef __rtems__ -#include <freebsd/net/if_media.h> -#else #include <net/if_media.h> -#endif #include <ifaddrs.h> #include <poll.h> diff --git a/freebsd/sbin/dhclient/privsep.h b/freebsd/sbin/dhclient/privsep.h index f30284ee..1f778bba 100644 --- a/freebsd/sbin/dhclient/privsep.h +++ b/freebsd/sbin/dhclient/privsep.h @@ -16,7 +16,7 @@ * OF OR IN CONNECTION WITH THE USE, ABUSE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <poll.h> #include <pwd.h> |