AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* nss/Makefile: Remove rules to build and distribute nss_db.

	* sysdeps/generic/alphasort64.c: Remove unnecessary versioning.
	* sysdeps/generic/scandir64.c: Likewise.
	* sysdeps/generic/versionsort64.c: Likewise.

2000-08-13  Ulrich Drepper  <drepper@redhat.com>
This commit is contained in:
Ulrich Drepper 2000-08-14 00:57:30 +00:00
parent 319d719d86
commit 7e3399b393
6 changed files with 189 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2000-08-13 Ulrich Drepper <drepper@redhat.com>
* nss/Makefile: Remove rules to build and distribute nss_db.
* sysdeps/generic/alphasort64.c: Remove unnecessary versioning.
* sysdeps/generic/scandir64.c: Likewise.
* sysdeps/generic/versionsort64.c: Likewise.
2000-08-13 Ulrich Drepper <drepper@redhat.com> 2000-08-13 Ulrich Drepper <drepper@redhat.com>
Benjamin Koznik <bkoz@redhat.com> Benjamin Koznik <bkoz@redhat.com>

28
nss/Makefile
View File

@ -24,8 +24,7 @@ subdir := nss
headers := nss.h headers := nss.h
distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \ distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \
getXXent.c getXXent_r.c databases.def \ getXXent.c getXXent_r.c databases.def \
nsswitch.conf db-Makefile digits_dots.c \ nsswitch.conf digits_dots.c function.def
function.def
# This is the trivial part which goes into libc itself. # This is the trivial part which goes into libc itself.
routines = nsswitch $(addsuffix -lookup,$(databases)) routines = nsswitch $(addsuffix -lookup,$(databases))
@ -36,8 +35,8 @@ routines = nsswitch $(addsuffix -lookup,$(databases))
databases = proto service hosts network grp pwd rpc ethers \ databases = proto service hosts network grp pwd rpc ethers \
spwd netgrp key alias spwd netgrp key alias
others := getent makedb others := getent
install-bin := getent makedb install-bin := getent
tests = test-netdb tests = test-netdb
@ -49,7 +48,7 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
endif endif
# Specify rules for the nss_* modules. We have some services. # Specify rules for the nss_* modules. We have some services.
services := files db services := files
extra-libs = $(services:%=libnss_%) extra-libs = $(services:%=libnss_%)
# These libraries will be built in the `others' pass rather than # These libraries will be built in the `others' pass rather than
@ -64,34 +63,15 @@ vpath %.c $(subdir-dirs)
libnss_files-routines := $(addprefix files-,$(databases)) libnss_files-routines := $(addprefix files-,$(databases))
distribute += files-XXX.c files-parse.c distribute += files-XXX.c files-parse.c
libnss_db-dbs := $(addprefix db-,$(filter-out hosts network key,\
$(databases)))
libnss_db-routines := $(libnss_db-dbs) db-open
generated += $(filter-out db-alias.c db-netgrp.c, \
$(addsuffix .c,$(libnss_db-dbs)))
distribute += $(addprefix nss_db/, db-XXX.c nss_db.h dummy-db.h)
$(objpfx)makedb: $(objpfx)db-open.o $(libdl)
# Build static module if requested # Build static module if requested
ifneq ($(build-static-nss),yes) ifneq ($(build-static-nss),yes)
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
endif endif
libnss_db-inhibit-o = $(filter-out .os,$(object-suffixes))
include ../Rules include ../Rules
$(objpfx)libnss_db.so: $(objpfx)libnss_files.so $(libdl)
$(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
@rm -f $@.new
(echo '#define EXTERN_PARSER';\
echo '#define GENERIC "../nss_db/db-XXX.c"';\
echo '#include <$<>') > $@.new
mv -f $@.new $@
ifeq (yes,$(build-static-nss)) ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a $(objpfx)getent: $(objpfx)libnss_files.a
endif endif

347
po/libc.pot
View File

File diff suppressed because it is too large Load Diff

11
sysdeps/generic/alphasort64.c
View File

@ -20,17 +20,8 @@
#include <string.h> #include <string.h>
int int
__alphasort64 (const void *a, const void *b) alphasort64 (const void *a, const void *b)
{ {
return strcoll ((*(const struct dirent64 **) a)->d_name, return strcoll ((*(const struct dirent64 **) a)->d_name,
(*(const struct dirent64 **) b)->d_name); (*(const struct dirent64 **) b)->d_name);
} }
#include <shlib-compat.h>
versioned_symbol (libc, __alphasort64, alphasort64, GLIBC_2_2);
#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
strong_alias (__alphasort64, __old_alphasort64)
compat_symbol (libc, __old_alphasort64, alphasort64, GLIBC_2_1);
#endif

22
sysdeps/generic/scandir64.c
View File

@ -18,25 +18,13 @@
#include <dirent.h> #include <dirent.h>
#define SCANDIR __scandir64 #define SCANDIR scandir64
#define READDIR __readdir64 #define READDIR __readdir64
#define DIRENT_TYPE struct dirent64 #define DIRENT_TYPE struct dirent64
int __scandir64 (__const char *__restrict __dir, int scandir64 (__const char *__restrict __dir,
struct dirent64 ***__restrict __namelist, struct dirent64 ***__restrict __namelist,
int (*__selector) (__const struct dirent64 *), int (*__selector) (__const struct dirent64 *),
int (*__cmp) (__const void *, __const void *)); int (*__cmp) (__const void *, __const void *));
#include <dirent/scandir.c> #include <dirent/scandir.c>
#undef SCANDIR
#undef READDIR
#include <shlib-compat.h>
versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2);
#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
strong_alias (__scandir64, __old_scandir64)
compat_symbol (libc, __old_scandir64, scandir64, GLIBC_2_1);
#endif

11
sysdeps/generic/versionsort64.c
View File

@ -20,17 +20,8 @@
#include <string.h> #include <string.h>
int int
__versionsort64 (const void *a, const void *b) versionsort64 (const void *a, const void *b)
{ {
return __strverscmp ((*(const struct dirent64 **) a)->d_name, return __strverscmp ((*(const struct dirent64 **) a)->d_name,
(*(const struct dirent64 **) b)->d_name); (*(const struct dirent64 **) b)->d_name);
} }
#include <shlib-compat.h>
versioned_symbol (libc, __versionsort64, versionsort64, GLIBC_2_2);
#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
strong_alias (__versionsort64, __old_versionsort64)
compat_symbol (libc, __old_versionsort64, versionsort64, GLIBC_2_1);
#endif