rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-13 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move content to <machine/rtems-bsd-user-space.h>

Browse Source
This commit is contained in:
Sebastian Huber 2013-11-06 09:11:47 +01:00
parent d48955b9e3
commit b84c04ecfa
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freebsd/lib/libc/db/db/db.c
View File

@ -51,13 +51,6 @@ dbopen(const char *fname, int flags, int mode, DBTYPE type, const void *openinfo
{ {
#define DB_FLAGS (DB_LOCK | DB_SHMEM | DB_TXN) #define DB_FLAGS (DB_LOCK | DB_SHMEM | DB_TXN)
#ifdef __rtems__
/* FIXME: Add lock capabilities to RTEMS file system */
#define O_EXLOCK 0
#define O_SHLOCK 0
/* FIXME: Add no symlink follow capabilities to RTEMS file system */
#define O_NOFOLLOW 0
#endif /* __rtems__ */
#define USE_OPEN_FLAGS \ #define USE_OPEN_FLAGS \
(O_CREAT | O_EXCL | O_EXLOCK | O_NOFOLLOW | O_NONBLOCK | \ (O_CREAT | O_EXCL | O_EXLOCK | O_NOFOLLOW | O_NONBLOCK | \
O_RDONLY | O_RDWR | O_SHLOCK | O_SYNC | O_TRUNC) O_RDONLY | O_RDWR | O_SHLOCK | O_SYNC | O_TRUNC)

7
freebsd/sbin/dhclient/dhclient.c
View File

@ -384,9 +384,6 @@ main(int argc, char *argv[])
usage(); usage();
if (path_dhclient_pidfile == NULL) { if (path_dhclient_pidfile == NULL) {
#ifdef __rtems__
#define _PATH_VARRUN "/var/run"
#endif /* __rtems__ */
asprintf(&path_dhclient_pidfile, asprintf(&path_dhclient_pidfile,
"%sdhclient.%s.pid", _PATH_VARRUN, *argv); "%sdhclient.%s.pid", _PATH_VARRUN, *argv);
if (path_dhclient_pidfile == NULL) if (path_dhclient_pidfile == NULL)
@ -464,10 +461,6 @@ main(int argc, char *argv[])
close(pipe_fd[0]); close(pipe_fd[0]);
privfd = pipe_fd[1]; 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) 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); error("can't open and lock %s: %m", path_dhclient_db);
read_client_leases(); read_client_leases();

24
rtemsbsd/include/machine/rtems-bsd-user-space.h
View File

@ -40,4 +40,28 @@
#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_USER_SPACE_H_ #ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_USER_SPACE_H_
#define _RTEMS_BSD_MACHINE_RTEMS_BSD_USER_SPACE_H_ #define _RTEMS_BSD_MACHINE_RTEMS_BSD_USER_SPACE_H_
#include <sys/cdefs.h>
#include <stdio.h>
/* FIXME: Add lock capabilities to RTEMS file system */
#define O_EXLOCK 0
#define O_SHLOCK 0
/* FIXME: Add no symlink follow capabilities to RTEMS file system */
#define O_NOFOLLOW 0
#define _PATH_VARRUN "/var/run"
__BEGIN_DECLS
/* FIXME: Add to Newlib */
long long strtonum(const char *numstr, long long minval, long long maxval,
const char **errstrp);
/* FIXME: Add to Newlib */
char *fgetln(FILE *fp, size_t *lenp);
__END_DECLS
#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_USER_SPACE_H_ */ #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_USER_SPACE_H_ */