feat:replace boost library with C++11 std library
This commit is contained in:
+87
@@ -0,0 +1,87 @@
|
||||
/* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "apr_strings.h"
|
||||
#include "apr_portable.h"
|
||||
#include "apr_user.h"
|
||||
#include "apr_private.h"
|
||||
#ifdef HAVE_GRP_H
|
||||
#include <grp.h>
|
||||
#endif
|
||||
#if APR_HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#if APR_HAVE_UNISTD_H
|
||||
#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
|
||||
#endif
|
||||
|
||||
#define GRBUF_SIZE 8192
|
||||
|
||||
APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid,
|
||||
apr_pool_t *p)
|
||||
{
|
||||
struct group *gr;
|
||||
|
||||
#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
|
||||
struct group grp;
|
||||
char grbuf[GRBUF_SIZE];
|
||||
apr_status_t rv;
|
||||
|
||||
/* See comment in getpwnam_safe on error handling. */
|
||||
rv = getgrgid_r(groupid, &grp, grbuf, sizeof(grbuf), &gr);
|
||||
if (rv) {
|
||||
return rv;
|
||||
}
|
||||
if (gr == NULL) {
|
||||
return APR_ENOENT;
|
||||
}
|
||||
#else
|
||||
errno = 0;
|
||||
if ((gr = getgrgid(groupid)) == NULL) {
|
||||
return errno ? errno : APR_ENOENT;
|
||||
}
|
||||
#endif
|
||||
*groupname = apr_pstrdup(p, gr->gr_name);
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid,
|
||||
const char *groupname, apr_pool_t *p)
|
||||
{
|
||||
struct group *gr;
|
||||
|
||||
#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRNAM_R)
|
||||
struct group grp;
|
||||
char grbuf[GRBUF_SIZE];
|
||||
apr_status_t rv;
|
||||
|
||||
/* See comment in getpwnam_safe on error handling. */
|
||||
rv = getgrnam_r(groupname, &grp, grbuf, sizeof(grbuf), &gr);
|
||||
if (rv) {
|
||||
return rv;
|
||||
}
|
||||
if (gr == NULL) {
|
||||
return APR_ENOENT;
|
||||
}
|
||||
#else
|
||||
errno = 0;
|
||||
if ((gr = getgrnam(groupname)) == NULL) {
|
||||
return errno ? errno : APR_ENOENT;
|
||||
}
|
||||
#endif
|
||||
*groupid = gr->gr_gid;
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
/* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "apr_strings.h"
|
||||
#include "apr_portable.h"
|
||||
#include "apr_user.h"
|
||||
#include "apr_private.h"
|
||||
#ifdef HAVE_PWD_H
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
#if APR_HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#if APR_HAVE_UNISTD_H
|
||||
#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
|
||||
#endif
|
||||
#define APR_WANT_MEMFUNC
|
||||
#include "apr_want.h"
|
||||
|
||||
#define PWBUF_SIZE 2048
|
||||
|
||||
static apr_status_t getpwnam_safe(const char *username,
|
||||
struct passwd *pw,
|
||||
char pwbuf[PWBUF_SIZE])
|
||||
{
|
||||
struct passwd *pwptr;
|
||||
#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
|
||||
apr_status_t rv;
|
||||
|
||||
/* POSIX defines getpwnam_r() et al to return the error number
|
||||
* rather than set errno, and requires pwptr to be set to NULL if
|
||||
* the entry is not found, imply that "not found" is not an error
|
||||
* condition; some implementations do return 0 with pwptr set to
|
||||
* NULL. */
|
||||
rv = getpwnam_r(username, pw, pwbuf, PWBUF_SIZE, &pwptr);
|
||||
if (rv) {
|
||||
return rv;
|
||||
}
|
||||
if (pwptr == NULL) {
|
||||
return APR_ENOENT;
|
||||
}
|
||||
#else
|
||||
/* Some platforms (e.g. FreeBSD 4.x) do not set errno on NULL "not
|
||||
* found" return values for the non-threadsafe function either. */
|
||||
errno = 0;
|
||||
if ((pwptr = getpwnam(username)) != NULL) {
|
||||
memcpy(pw, pwptr, sizeof *pw);
|
||||
}
|
||||
else {
|
||||
return errno ? errno : APR_ENOENT;
|
||||
}
|
||||
#endif
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
|
||||
const char *username,
|
||||
apr_pool_t *p)
|
||||
{
|
||||
struct passwd pw;
|
||||
char pwbuf[PWBUF_SIZE];
|
||||
apr_status_t rv;
|
||||
|
||||
if ((rv = getpwnam_safe(username, &pw, pwbuf)) != APR_SUCCESS)
|
||||
return rv;
|
||||
|
||||
#ifdef OS2
|
||||
/* Need to manually add user name for OS/2 */
|
||||
*dirname = apr_pstrcat(p, pw.pw_dir, pw.pw_name, NULL);
|
||||
#else
|
||||
*dirname = apr_pstrdup(p, pw.pw_dir);
|
||||
#endif
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
||||
APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
|
||||
apr_gid_t *gid,
|
||||
apr_pool_t *p)
|
||||
{
|
||||
*uid = getuid();
|
||||
*gid = getgid();
|
||||
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
|
||||
const char *username, apr_pool_t *p)
|
||||
{
|
||||
struct passwd pw;
|
||||
char pwbuf[PWBUF_SIZE];
|
||||
apr_status_t rv;
|
||||
|
||||
if ((rv = getpwnam_safe(username, &pw, pwbuf)) != APR_SUCCESS)
|
||||
return rv;
|
||||
|
||||
*uid = pw.pw_uid;
|
||||
*gid = pw.pw_gid;
|
||||
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
|
||||
APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
|
||||
apr_pool_t *p)
|
||||
{
|
||||
struct passwd *pw;
|
||||
#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWUID_R)
|
||||
struct passwd pwd;
|
||||
char pwbuf[PWBUF_SIZE];
|
||||
apr_status_t rv;
|
||||
|
||||
rv = getpwuid_r(userid, &pwd, pwbuf, sizeof(pwbuf), &pw);
|
||||
if (rv) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
if (pw == NULL) {
|
||||
return APR_ENOENT;
|
||||
}
|
||||
|
||||
#else
|
||||
errno = 0;
|
||||
if ((pw = getpwuid(userid)) == NULL) {
|
||||
return errno ? errno : APR_ENOENT;
|
||||
}
|
||||
#endif
|
||||
*username = apr_pstrdup(p, pw->pw_name);
|
||||
return APR_SUCCESS;
|
||||
}
|
||||
Reference in New Issue
Block a user