mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
Update.
1999-04-18 Thorsten Kukuk <kukuk@suse.de> * sunrpc/Makefile: Remove special handling of bootparam.x, add rpcsvc/bootparam.h to headers. * sunrpc/rpcsvc/bootparam.h: New, for backward compatibility. * sunrpc/rpcsvc/bootparam.x: Renamed to... * sunrpc/rpcsvc/bootparam_prot.x: ...this.
This commit is contained in:
parent
62acd37630
commit
b02f501306
@ -1,3 +1,11 @@
|
||||
1999-04-18 Thorsten Kukuk <kukuk@suse.de>
|
||||
|
||||
* sunrpc/Makefile: Remove special handling of bootparam.x,
|
||||
add rpcsvc/bootparam.h to headers.
|
||||
* sunrpc/rpcsvc/bootparam.h: New, for backward compatibility.
|
||||
* sunrpc/rpcsvc/bootparam.x: Renamed to...
|
||||
* sunrpc/rpcsvc/bootparam_prot.x: ...this.
|
||||
|
||||
1999-04-18 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* sysdeps/unix/bsd/poll.c (__poll): Add more compatiblity code to
|
||||
|
@ -43,16 +43,15 @@ subdir := sunrpc
|
||||
# rpc_dtablesize.c -> rpc_dtable.c
|
||||
# svc_auth_unix.c -> svc_authux.c
|
||||
# xdr_reference.c -> xdr_ref.c
|
||||
# rpcsvc/bootparam_prot.x -> rpcsvc/bootparam.x
|
||||
|
||||
rpcsvc = bootparam.x nlm_prot.x rstat.x \
|
||||
rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \
|
||||
yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
|
||||
rusers.x spray.x nfs_prot.x rquota.x key_prot.x
|
||||
headers = $(addprefix rpc/,auth.h auth_unix.h clnt.h netdb.h pmap_clnt.h \
|
||||
pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h \
|
||||
svc_auth.h types.h xdr.h auth_des.h \
|
||||
des_crypt.h key_prot.h rpc_des.h) \
|
||||
$(rpcsvc:%=rpcsvc/%)
|
||||
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
|
||||
install-others = $(inst_sysconfdir)/rpc
|
||||
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
|
||||
$(rpcsvc:%.x=rpcsvc/%.stmp) rpc-proto.c rpc-proto.d rpcgen
|
||||
@ -92,7 +91,6 @@ endif
|
||||
ifeq (no,$(cross-compiling))
|
||||
# We can only build this library if we can run the rpcgen we build.
|
||||
headers += $(rpcsvc:%.x=rpcsvc/%.h)
|
||||
install-others += $(inst_includedir)/rpcsvc/bootparam_prot.h
|
||||
extra-libs := librpcsvc
|
||||
extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass.
|
||||
librpcsvc-routines = $(rpcsvc:%.x=x%)
|
||||
@ -100,7 +98,7 @@ librpcsvc-inhibit-o = .os # Build no shared rpcsvc library.
|
||||
omit-deps = $(librpcsvc-routines)
|
||||
endif
|
||||
|
||||
CFLAGS-xbootparam.c = -Wno-unused
|
||||
CFLAGS-xbootparam_prot.c = -Wno-unused
|
||||
CFLAGS-xnlm_prot.c = -Wno-unused
|
||||
CFLAGS-xrstat.c = -Wno-unused
|
||||
CFLAGS-xyppasswd.c = -Wno-unused
|
||||
@ -129,14 +127,6 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
|
||||
# preprocessor.
|
||||
rpcgen-cmd = $(built-program-cmd)
|
||||
|
||||
# The proper file name is longer than 14 chars, so we install it under
|
||||
# a shorter name. But if the filesystem can handle it, we want to
|
||||
# install under the proper name as well.
|
||||
$(inst_includedir)/rpcsvc/bootparam_prot.h: \
|
||||
$(inst_includedir)/rpcsvc/bootparam.h $(+force)
|
||||
@echo It is safe to ignore an error here if this file name is too long.
|
||||
-$(do-install)
|
||||
|
||||
# Install the rpc data base file.
|
||||
$(inst_sysconfdir)/rpc: etc.rpc $(+force)
|
||||
$(do-install)
|
||||
|
25
sunrpc/rpcsvc/bootparam.h
Normal file
25
sunrpc/rpcsvc/bootparam.h
Normal file
@ -0,0 +1,25 @@
|
||||
/* Copyright (C) 1999 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 Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#ifndef _RPCSVC_BOOTPARAM_H
|
||||
#define _RPCSVC_BOOTPARAM_H
|
||||
|
||||
#include <rpcsvc/bootparam_prot.h>
|
||||
|
||||
#endif /* _RPCSVC_BOOTPARAM_H */
|
||||
|
@ -104,7 +104,7 @@ __poll (fds, nfds, timeout)
|
||||
tv.tv_sec = timeout / 1000;
|
||||
tv.tv_usec = (timeout % 1000) * 1000;
|
||||
|
||||
do
|
||||
while (1)
|
||||
{
|
||||
ready = __select (maxfd + 1, rset, wset, xset,
|
||||
timeout == -1 ? NULL : &tv);
|
||||
@ -169,9 +169,12 @@ __poll (fds, nfds, timeout)
|
||||
else if (errno == EBADF)
|
||||
f->revents |= POLLNVAL;
|
||||
}
|
||||
/* Try again. */
|
||||
continue;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
while (ready == 0);
|
||||
|
||||
if (ready > 0)
|
||||
for (f = fds; f < &fds[nfds]; ++f)
|
||||
|
Loading…
Reference in New Issue
Block a user