[Midnightbsd-cvs] src [10630] trunk/lib/libc/compat-43: tag and sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 12:24:15 EDT 2018
Revision: 10630
http://svnweb.midnightbsd.org/src/?rev=10630
Author: laffer1
Date: 2018-06-09 12:24:15 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
tag and sync
Modified Paths:
--------------
trunk/lib/libc/compat-43/creat.c
trunk/lib/libc/compat-43/gethostid.c
trunk/lib/libc/compat-43/getwd.c
trunk/lib/libc/compat-43/killpg.c
trunk/lib/libc/compat-43/sethostid.c
trunk/lib/libc/compat-43/setpgrp.c
trunk/lib/libc/compat-43/setrgid.c
trunk/lib/libc/compat-43/setruid.c
trunk/lib/libc/compat-43/sigcompat.c
Modified: trunk/lib/libc/compat-43/creat.c
===================================================================
--- trunk/lib/libc/compat-43/creat.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/creat.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,16 +32,23 @@
static char sccsid[] = "@(#)creat.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/creat.c 277317 2015-01-18 11:54:20Z kib $");
#include "namespace.h"
#include <fcntl.h>
#include "un-namespace.h"
+#include "libc_private.h"
+__weak_reference(__creat, creat);
+__weak_reference(__creat, _creat);
+
+#pragma weak creat
int
__creat(const char *path, mode_t mode)
{
- return(_open(path, O_WRONLY|O_CREAT|O_TRUNC, mode));
+
+ return (((int (*)(int, const char *, int, ...))
+ __libc_interposing[INTERPOS_openat])(AT_FDCWD, path, O_WRONLY |
+ O_CREAT | O_TRUNC, mode));
}
-__weak_reference(__creat, creat);
-__weak_reference(__creat, _creat);
+
Modified: trunk/lib/libc/compat-43/gethostid.c
===================================================================
--- trunk/lib/libc/compat-43/gethostid.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/gethostid.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)gethostid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/gethostid.c 165903 2007-01-09 00:28:16Z imp $");
#include <sys/param.h>
#include <sys/sysctl.h>
Modified: trunk/lib/libc/compat-43/getwd.c
===================================================================
--- trunk/lib/libc/compat-43/getwd.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/getwd.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)getwd.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/getwd.c 165903 2007-01-09 00:28:16Z imp $");
#include <sys/param.h>
#include <unistd.h>
Modified: trunk/lib/libc/compat-43/killpg.c
===================================================================
--- trunk/lib/libc/compat-43/killpg.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/killpg.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)killpg.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/killpg.c 165903 2007-01-09 00:28:16Z imp $");
#include <sys/types.h>
#include <signal.h>
Modified: trunk/lib/libc/compat-43/sethostid.c
===================================================================
--- trunk/lib/libc/compat-43/sethostid.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/sethostid.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)sethostid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/sethostid.c 165903 2007-01-09 00:28:16Z imp $");
#include <sys/param.h>
#include <sys/sysctl.h>
Modified: trunk/lib/libc/compat-43/setpgrp.c
===================================================================
--- trunk/lib/libc/compat-43/setpgrp.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/setpgrp.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)setpgrp.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/setpgrp.c 165903 2007-01-09 00:28:16Z imp $");
#include <sys/types.h>
#include <unistd.h>
Modified: trunk/lib/libc/compat-43/setrgid.c
===================================================================
--- trunk/lib/libc/compat-43/setrgid.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/setrgid.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)setrgid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/setrgid.c 165903 2007-01-09 00:28:16Z imp $");
#include <unistd.h>
Modified: trunk/lib/libc/compat-43/setruid.c
===================================================================
--- trunk/lib/libc/compat-43/setruid.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/setruid.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)setruid.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/setruid.c 165903 2007-01-09 00:28:16Z imp $");
#include <unistd.h>
Modified: trunk/lib/libc/compat-43/sigcompat.c
===================================================================
--- trunk/lib/libc/compat-43/sigcompat.c 2018-06-09 16:22:58 UTC (rev 10629)
+++ trunk/lib/libc/compat-43/sigcompat.c 2018-06-09 16:24:15 UTC (rev 10630)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,7 +32,7 @@
static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/compat-43/sigcompat.c 287480 2015-09-05 08:55:51Z kib $");
#include "namespace.h"
#include <sys/param.h>
@@ -59,7 +60,7 @@
} else
sap = NULL;
osap = osv != NULL ? &osa : NULL;
- ret = _sigaction(signo, sap, osap);
+ ret = __libc_sigaction(signo, sap, osap);
if (ret == 0 && osv != NULL) {
osv->sv_handler = osa.sa_handler;
osv->sv_flags = osa.sa_flags ^ SV_INTERRUPT;
@@ -77,7 +78,7 @@
sigemptyset(&set);
set.__bits[0] = mask;
- n = _sigprocmask(SIG_SETMASK, &set, &oset);
+ n = __libc_sigprocmask(SIG_SETMASK, &set, &oset);
if (n)
return (n);
return (oset.__bits[0]);
@@ -92,7 +93,7 @@
sigemptyset(&set);
set.__bits[0] = mask;
- n = _sigprocmask(SIG_BLOCK, &set, &oset);
+ n = __libc_sigprocmask(SIG_BLOCK, &set, &oset);
if (n)
return (n);
return (oset.__bits[0]);
@@ -105,7 +106,7 @@
sigemptyset(&set);
set.__bits[0] = mask;
- return (_sigsuspend(&set));
+ return (__libc_sigsuspend(&set));
}
int
@@ -113,11 +114,11 @@
{
sigset_t set;
- if (_sigprocmask(SIG_BLOCK, NULL, &set) == -1)
+ if (__libc_sigprocmask(SIG_BLOCK, NULL, &set) == -1)
return (-1);
if (sigdelset(&set, sig) == -1)
return (-1);
- return (_sigsuspend(&set));
+ return (__libc_sigsuspend(&set));
}
int
@@ -128,7 +129,7 @@
sigemptyset(&set);
if (sigaddset(&set, sig) == -1)
return (-1);
- return (_sigprocmask(SIG_BLOCK, &set, NULL));
+ return (__libc_sigprocmask(SIG_BLOCK, &set, NULL));
}
int
@@ -138,7 +139,7 @@
bzero(&sa, sizeof(sa));
sa.sa_handler = SIG_IGN;
- return (_sigaction(sig, &sa, NULL));
+ return (__libc_sigaction(sig, &sa, NULL));
}
int
@@ -149,7 +150,7 @@
sigemptyset(&set);
if (sigaddset(&set, sig) == -1)
return (-1);
- return (_sigprocmask(SIG_UNBLOCK, &set, NULL));
+ return (__libc_sigprocmask(SIG_UNBLOCK, &set, NULL));
}
void
@@ -161,26 +162,26 @@
sigemptyset(&set);
if (sigaddset(&set, sig) == -1)
return (SIG_ERR);
- if (_sigprocmask(SIG_BLOCK, NULL, &pset) == -1)
+ if (__libc_sigprocmask(SIG_BLOCK, NULL, &pset) == -1)
return (SIG_ERR);
if ((__sighandler_t *)disp == SIG_HOLD) {
- if (_sigprocmask(SIG_BLOCK, &set, &pset) == -1)
+ if (__libc_sigprocmask(SIG_BLOCK, &set, &pset) == -1)
return (SIG_ERR);
if (sigismember(&pset, sig))
return (SIG_HOLD);
else {
- if (_sigaction(sig, NULL, &psa) == -1)
+ if (__libc_sigaction(sig, NULL, &psa) == -1)
return (SIG_ERR);
return (psa.sa_handler);
}
} else {
- if (_sigprocmask(SIG_UNBLOCK, &set, &pset) == -1)
+ if (__libc_sigprocmask(SIG_UNBLOCK, &set, &pset) == -1)
return (SIG_ERR);
}
bzero(&sa, sizeof(sa));
sa.sa_handler = disp;
- if (_sigaction(sig, &sa, &psa) == -1)
+ if (__libc_sigaction(sig, &sa, &psa) == -1)
return (SIG_ERR);
if (sigismember(&pset, sig))
return (SIG_HOLD);
More information about the Midnightbsd-cvs
mailing list