mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-17 00:15:50 +08:00
Update to FreeBSD head 2018-09-17
Git mirror commit 6c2192b1ef8c50788c751f878552526800b1e319. Update #3472.
This commit is contained in:
@@ -31,10 +31,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#include <sys/cdefs.h>
|
||||
__SCCSID("@(#)err.c 8.1 (Berkeley) 6/4/93");
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include "namespace.h"
|
||||
|
@@ -31,10 +31,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#include <sys/cdefs.h>
|
||||
__SCCSID("@(#)gethostname.c 8.1 (Berkeley) 6/4/93");
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@@ -31,10 +31,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#include <sys/cdefs.h>
|
||||
__SCCSID("@(#)gethostname.c 8.1 (Berkeley) 6/4/93");
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@@ -31,10 +31,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#include <sys/cdefs.h>
|
||||
__SCCSID("@(#)sethostname.c 8.1 (Berkeley) 6/4/93");
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@@ -409,8 +409,6 @@ int __sys_futimens(int fd, const struct timespec *times) __hidden;
|
||||
int __sys_utimensat(int fd, const char *path,
|
||||
const struct timespec *times, int flag) __hidden;
|
||||
|
||||
__size_t __arc4_sysctl(unsigned char *, __size_t);
|
||||
|
||||
/* execve() with PATH processing to implement posix_spawnp() */
|
||||
int _execvpe(const char *, char * const *, char * const *);
|
||||
|
||||
|
@@ -126,6 +126,7 @@
|
||||
#define pthread_detach _pthread_detach
|
||||
#define pthread_equal _pthread_equal
|
||||
#define pthread_exit _pthread_exit
|
||||
#define pthread_get_name_np _pthread_get_name_np
|
||||
#define pthread_getaffinity_np _pthread_getaffinity_np
|
||||
#define pthread_getconcurrency _pthread_getconcurrency
|
||||
#define pthread_getcpuclockid _pthread_getcpuclockid
|
||||
|
@@ -116,6 +116,7 @@
|
||||
#undef pthread_detach
|
||||
#undef pthread_equal
|
||||
#undef pthread_exit
|
||||
#undef pthread_get_name_np
|
||||
#undef pthread_getaffinity_np
|
||||
#undef pthread_getconcurrency
|
||||
#undef pthread_getcpuclockid
|
||||
|
@@ -186,19 +186,20 @@ inet_aton(const char *cp, struct in_addr *addr) {
|
||||
case 2: /*%< a.b -- 8.24 bits */
|
||||
if (val > 0xffffffU)
|
||||
return (0);
|
||||
val |= parts[0] << 24;
|
||||
val |= (uint32_t)parts[0] << 24;
|
||||
break;
|
||||
|
||||
case 3: /*%< a.b.c -- 8.8.16 bits */
|
||||
if (val > 0xffffU)
|
||||
return (0);
|
||||
val |= (parts[0] << 24) | (parts[1] << 16);
|
||||
val |= ((uint32_t)parts[0] << 24) | (parts[1] << 16);
|
||||
break;
|
||||
|
||||
case 4: /*%< a.b.c.d -- 8.8.8.8 bits */
|
||||
if (val > 0xffU)
|
||||
return (0);
|
||||
val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
|
||||
val |= ((uint32_t)parts[0] << 24) | (parts[1] << 16) |
|
||||
(parts[2] << 8);
|
||||
break;
|
||||
}
|
||||
if (addr != NULL)
|
||||
|
@@ -681,6 +681,8 @@ res_setoptions(res_state statp, const char *options, const char *source)
|
||||
statp->options |= RES_INSECURE2;
|
||||
} else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
|
||||
statp->options |= RES_ROTATE;
|
||||
} else if (!strncmp(cp, "usevc", sizeof("usevc") - 1)) {
|
||||
statp->options |= RES_USEVC;
|
||||
} else if (!strncmp(cp, "no-check-names",
|
||||
sizeof("no-check-names") - 1)) {
|
||||
statp->options |= RES_NOCHECKNAME;
|
||||
|
Reference in New Issue
Block a user