ca130fe465
* catgets/open_catalog.c: Rewrite code to assume that the function is called at catopen time and not delayed in catgets. * catgets/catgets.c (catopen): Call __open_catalog and fail if that function failed. (catgets): Remove code for delayed opening of catalog. * catgets/catgetsinfo.h: Remove now unnecessary information from struct catalog_info. Change __open_catalog prototype. * catgets/gencat.c: Adjust __open_catalog call. * catgets/test-gencat.c: Stop program if catopen failed.
57 lines
1.7 KiB
C
57 lines
1.7 KiB
C
/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
|
|
|
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 <sys/types.h>
|
|
|
|
|
|
struct catalog_obj
|
|
{
|
|
u_int32_t magic;
|
|
u_int32_t plane_size;
|
|
u_int32_t plane_depth;
|
|
/* This is in fact two arrays in one: always a pair of name and
|
|
pointer into the data area. */
|
|
u_int32_t name_ptr[0];
|
|
};
|
|
|
|
|
|
/* This structure will be filled after loading the catalog. */
|
|
typedef struct catalog_info
|
|
{
|
|
enum { mmapped, malloced } status;
|
|
|
|
size_t plane_size;
|
|
size_t plane_depth;
|
|
u_int32_t *name_ptr;
|
|
const char *strings;
|
|
|
|
struct catalog_obj *file_ptr;
|
|
size_t file_size;
|
|
} *__nl_catd;
|
|
|
|
|
|
|
|
/* The magic number to signal we really have a catalog file. */
|
|
#define CATGETS_MAGIC 0x960408de
|
|
|
|
|
|
/* Prototypes for helper functions. */
|
|
extern int __open_catalog (const char *cat_name, const char *nlspath,
|
|
const char *env_var, __nl_catd __catalog);
|