glibc/misc/fstab.c
Roland McGrath c877418f2e * include/libc-symbols.h (__libc_freeres_fn_section, libc_freeres_fn):
New macros.
	* elf/dl-close.c (free_mem): Use libc_freeres_fn macro, remove
	text_set_element.
	* elf/dl-libc.c (free_mem): Likewise.
	* iconv/gconv_conf.c (free_mem): Likewise.
	* iconv/gconv_db.c (free_mem): Likewise.
	* iconv/gconv_dl.c (free_mem): Likewise.
	* iconv/gconv_cache.c (free_mem): Likewise.
	* intl/finddomain.c (free_mem): Likewise.
	* intl/dcigettext.c (free_mem): Likewise.
	* locale/setlocale.c (free_mem): Likewise.
	* misc/fstab.c (fstab_free): Likewise.
	* nss/nsswitch.c (free_mem): Likewise.
	* posix/regcomp.c (free_mem): Likewise.
	* resolv/gai_misc.c (free_res): Likewise.
	* stdlib/fmtmsg.c (free_mem): Likewise.
	* sunrpc/clnt_perr.c (free_mem): Likewise.
	* sysdeps/generic/setenv.c (free_mem): Likewise.
	* sysdeps/unix/sysv/linux/shm_open.c (freeit): Likewise.
	* sysdeps/pthread/aio_misc.c (free_res): Likewise.
	* time/tzset.c (free_mem): Likewise.
	* malloc/mtrace.c (release_libc_mem): Add __libc_freeres_fn_section.
	* locale/loadarchive.c (_nl_archive_subfreeres): Likewise.
	* malloc/set-freeres.c (__libc_freeres): Likewise.

	* login/getutent.c: Include stdlib.h instead of stddef.h.
	(buffer): Change into pointer to utmp, add libc_freeres_ptr.
	(__getutent): Allocate buffer the first time it is run.
	* login/getutid.c: Include stdlib.h instead of stddef.h.
	(buffer): Change into pointer to utmp, add libc_freeres_ptr.
	(__getutid): Allocate buffer the first time it is run.
	* login/getutline.c: Include stdlib.h instead of stddef.h.
	(buffer): Change into pointer to utmp, add libc_freeres_ptr.
	(__getutline): Allocate buffer the first time it is run.
	* malloc/mtrace.c (malloc_trace_buffer): Change into char *.
	(mtrace): Allocate malloc_trace_buffer.
	* resolv/nsap_addr.c (inet_nsap_ntoa): Decrease size of tmpbuf.
	* resolv/ns_print.c (ns_sprintrrf): Decrease size of t.
	* string/strerror.c: Include libintl.h and errno.h.
	(buf): New variable.
	(strerror): Only allocate buffer if actually needed (unknown error).
	* time/tzfile.c (transitions): Add libc_freeres_ptr.
	(freeres): Remove.

2002-10-25  Jakub Jelinek  <jakub@redhat.com>

	* include/libc-symbols.h (libc_freeres_ptr): New macro.
	* malloc/set-freeres.c (__libc_freeres_ptrs): Define using
	symbol_set_define.
	(__libc_freeres): Free all pointers in that section.
	* Makerules (build-shlib): Add $(LDSEDCMD-$(@F:lib%.so=%).so) to sed
	commands when creating .lds script.
	(LDSEDCMD-c.so): New variable.
	* inet/rcmd.c (ahostbuf): Change into char *.  Add libc_freeres_ptr.
	(rcmd_af): Use strdup to allocate ahostbuf.
	* inet/rexec.c (ahostbuf): Change into char *.  Add libc_freeres_ptr.
	(rexec_af): Use strdup to allocate ahostbuf.
	* stdio-common/reg-printf.c (printf_funcs): Remove.
	(__printf_arginfo_table): Change into printf_arginfo_function **.
	Add libc_freeres_ptr.
	(__register_printf_function): Allocate __printf_arginfo_table
	and __printf_function_table the first time it is called.
	* stdio-common/printf-parse.h (__printf_arginfo_table): Change into
	printf_arginfo_function **.
	(parse_one_spec): Add __builtin_expect.
	* grp/fgetgrent.c (buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* inet/getnetgrent.c (buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* intl/localealias.c (libc_freeres_ptr): Define if !_LIBC.
	(string_space, map): Add libc_freeres_ptr.
	(free_mem): Remove.
	* misc/efgcvt.c (FCVT_BUFPTR): Add libc_freeres_ptr.
	(free_mem): Remove.
	* misc/mntent.c (getmntent_buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* crypt/md5-crypt.c (libc_freeres_ptr): Define if !_LIBC.
	(buffer): Add libc_freeres_ptr.
	(free_mem): Remove for _LIBC.
	* nss/getXXbyYY.c (buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* nss/getXXent.c (buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* pwd/fgetpwent.c (buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* resolv/res_hconf.c (ifaddrs): Add libc_freeres_ptr.
	(free_mem): Remove.
	* shadow/fgetspent.c (buffer): Add libc_freeres_ptr.
	(free_mem): Remove.
	* sysdeps/posix/ttyname.c (getttyname_name): Add libc_freeres_ptr.
	(free_mem): Remove.
	* sysdeps/unix/sysv/linux/getsysstats.c (mount_proc): Add
	libc_freeres_ptr.
	(free_mem): Remove.
	* sysdeps/unix/sysv/linux/ttyname.c (getttyname_name, ttyname_buf): Add
	libc_freeres_ptr.
	(free_mem): Remove.

2002-10-30  Jakub Jelinek  <jakub@redhat.com>

	* malloc/obstack.c [_LIBC] (obstack_free): Change into strong_alias
	instead of duplicating the whole function in libc.
2002-11-01 20:44:15 +00:00

191 lines
3.9 KiB
C

/* Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <fstab.h>
#include <mntent.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <bits/libc-lock.h>
#define BUFFER_SIZE 0x1fc0
struct fstab_state
{
FILE *fs_fp;
char *fs_buffer;
struct mntent fs_mntres;
struct fstab fs_ret;
};
static struct fstab_state *fstab_init (int opt_rewind);
static struct mntent *fstab_fetch (struct fstab_state *state);
static struct fstab *fstab_convert (struct fstab_state *state);
static struct fstab_state fstab_state;
int
setfsent (void)
{
return fstab_init (1) != NULL;
}
struct fstab *
getfsent (void)
{
struct fstab_state *state;
state = fstab_init (0);
if (state == NULL)
return NULL;
if (fstab_fetch (state) == NULL)
return NULL;
return fstab_convert (state);
}
struct fstab *
getfsspec (name)
const char *name;
{
struct fstab_state *state;
struct mntent *m;
state = fstab_init (1);
if (state == NULL)
return NULL;
while ((m = fstab_fetch (state)) != NULL)
if (strcmp (m->mnt_fsname, name) == 0)
return fstab_convert (state);
return NULL;
}
struct fstab *
getfsfile (name)
const char *name;
{
struct fstab_state *state;
struct mntent *m;
state = fstab_init (1);
if (state == NULL)
return NULL;
while ((m = fstab_fetch (state)) != NULL)
if (strcmp (m->mnt_dir, name) == 0)
return fstab_convert (state);
return NULL;
}
void
endfsent ()
{
struct fstab_state *state;
state = &fstab_state;
if (state->fs_fp != NULL)
{
(void) __endmntent (state->fs_fp);
state->fs_fp = NULL;
}
}
static struct fstab_state *
fstab_init (int opt_rewind)
{
struct fstab_state *state;
char *buffer;
FILE *fp;
state = &fstab_state;
buffer = state->fs_buffer;
if (buffer == NULL)
{
buffer = (char *) malloc (BUFFER_SIZE);
if (buffer == NULL)
return NULL;
state->fs_buffer = buffer;
}
fp = state->fs_fp;
if (fp != NULL)
{
if (opt_rewind)
rewind (fp);
}
else
{
fp = __setmntent (_PATH_FSTAB, "r");
if (fp == NULL)
return NULL;
state->fs_fp = fp;
}
return state;
}
static struct mntent *
fstab_fetch (struct fstab_state *state)
{
return __getmntent_r (state->fs_fp, &state->fs_mntres,
state->fs_buffer, BUFFER_SIZE);
}
static struct fstab *
fstab_convert (struct fstab_state *state)
{
struct mntent *m;
struct fstab *f;
m = &state->fs_mntres;
f = &state->fs_ret;
f->fs_spec = m->mnt_fsname;
f->fs_file = m->mnt_dir;
f->fs_vfstype = m->mnt_type;
f->fs_mntops = m->mnt_opts;
f->fs_type = (__hasmntopt (m, FSTAB_RW) ? FSTAB_RW :
__hasmntopt (m, FSTAB_RQ) ? FSTAB_RQ :
__hasmntopt (m, FSTAB_RO) ? FSTAB_RO :
__hasmntopt (m, FSTAB_SW) ? FSTAB_SW :
__hasmntopt (m, FSTAB_XX) ? FSTAB_XX :
"??");
f->fs_freq = m->mnt_freq;
f->fs_passno = m->mnt_passno;
return f;
}
/* Make sure the memory is freed if the programs ends while in
memory-debugging mode and something actually was allocated. */
libc_freeres_fn (fstab_free)
{
char *buffer;
buffer = fstab_state.fs_buffer;
if (buffer != NULL)
free ((void *) buffer);
}