RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libcsupport: Use POSIX key for getgrent()

Browse Source
This commit is contained in:
Sebastian Huber
2014-11-14 15:33:57 +01:00
parent acf9a8dd54
commit 395e5d4d7a
5 changed files with 117 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpukit/libcsupport/Makefile.am
View File

@@ -110,6 +110,7 @@ MALLOC_C_FILES = src/malloc_initialize.c src/calloc.c src/malloc.c \
PASSWORD_GROUP_C_FILES = src/pwdgrp.c
PASSWORD_GROUP_C_FILES += src/getgrent.c
PASSWORD_GROUP_C_FILES += src/getgrnam.c
PASSWORD_GROUP_C_FILES += src/getpwent.c
TERMINAL_IDENTIFICATION_C_FILES = src/ctermid.c

88
cpukit/libcsupport/src/getgrent.c
View File

@@ -24,55 +24,85 @@
#include "pwdgrp.h"
/*
* Static, thread-unsafe, buffers
*/
static FILE *group_fp;
static char grbuf[200];
static struct group grent;
#include <stdlib.h>
#include <pthread.h>
struct group *getgrnam(
const char *name
)
typedef struct {
FILE *fp;
char buf[256];
struct group grp;
} grp_context;
static pthread_once_t grp_once = PTHREAD_ONCE_INIT;
static pthread_key_t grp_key;
static void grp_init(void)
{
struct group *p;
if(getgrnam_r(name, &grent, grbuf, sizeof grbuf, &p))
return NULL;
return p;
pthread_key_create(&grp_key, free);
}
struct group *getgrgid(
gid_t gid
)
static grp_context *grp_get_context(void)
{
struct group *p;
pthread_once(&grp_once, grp_init);
if(getgrgid_r(gid, &grent, grbuf, sizeof grbuf, &p))
return NULL;
return p;
return pthread_getspecific(grp_key);
}
struct group *getgrent(void)
{
if (group_fp == NULL)
grp_context *ctx = grp_get_context();
if (ctx == NULL)
return NULL;
if (!_libcsupport_scangr(group_fp, &grent, grbuf, sizeof grbuf))
if (ctx->fp == NULL)
return NULL;
return &grent;
if (!_libcsupport_scangr(ctx->fp, &ctx->grp, ctx->buf, sizeof(ctx->buf)))
return NULL;
return &ctx->grp;
}
void setgrent(void)
{
grp_context *ctx = grp_get_context();
if (ctx == NULL) {
int eno;
ctx = calloc(1, sizeof(*ctx));
if (ctx == NULL)
return;
eno = pthread_setspecific(grp_key, ctx);
if (eno != 0) {
free(ctx);
return;
}
}
_libcsupport_pwdgrp_init();
if (group_fp != NULL)
fclose(group_fp);
group_fp = fopen("/etc/group", "r");
if (ctx->fp != NULL)
fclose(ctx->fp);
ctx->fp = fopen("/etc/group", "r");
}
void endgrent(void)
{
if (group_fp != NULL)
fclose(group_fp);
grp_context *ctx = grp_get_context();
if (ctx == NULL)
return;
if (ctx->fp != NULL) {
fclose(ctx->fp);
}
free(ctx);
pthread_setspecific(grp_key, NULL);
}

53
cpukit/libcsupport/src/getgrnam.c Normal file
View File

@@ -0,0 +1,53 @@
/**
* @file
*
* @brief User Database Access Routines
* @ingroup libcsupport
*/
/*
* Copyright (c) 1999-2009 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Copyright (c) 1999-2013 Joel Sherrill <joel.sherrill@OARcorp.com>
* Copyright (c) 2000-2001 Fernando Ruiz Casas <fernando.ruiz@ctv.es>
* Copyright (c) 2002 Eric Norum <eric.norum@usask.ca>
* Copyright (c) 2003 Till Straumann <strauman@slac.stanford.edu>
* Copyright (c) 2012 Alex Ivanov <alexivanov97@gmail.com>
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include "pwdgrp.h"
/*
* Static, thread-unsafe, buffers
*/
static char grbuf[200];
static struct group grent;
struct group *getgrnam(
const char *name
)
{
struct group *p;
if(getgrnam_r(name, &grent, grbuf, sizeof grbuf, &p))
return NULL;
return p;
}
struct group *getgrgid(
gid_t gid
)
{
struct group *p;
if(getgrgid_r(gid, &grent, grbuf, sizeof grbuf, &p))
return NULL;
return p;
}