diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makeconfig | 15 | ||||
| -rw-r--r-- | inet/rcmd.c | 6 |
3 files changed, 24 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 6c2093f078..e117190421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-05-29 Jakub Jelinek <jakub@redhat.com> + + * inet/rcmd.c (rresvport_af): Use correct port number. + +2000-05-26 Andreas Schwab <schwab@suse.de> + + * Makeconfig ($(common-objpfx)soversions.mk): Prepend `$lib=' to + entries in all-sonames. + ($(common-objpfx)gnu/lib-names.h): Use it for the CPP symbol, + preserving the old name if different for compatibility. + 2000-05-29 Ulrich Drepper <drepper@redhat.com> * posix/Makefile (tests): Add tst-spawn. diff --git a/Makeconfig b/Makeconfig index c4f682968c..441ee06273 100644 --- a/Makeconfig +++ b/Makeconfig @@ -709,9 +709,9 @@ $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i while read lib number setname; do \ case $$number in \ [0-9]*) echo "$$lib.so-version=.$$number"; \ - echo "all-sonames+=$$lib.so\$$($$lib.so-version)";;\ + echo "all-sonames+=$$lib=$$lib.so\$$($$lib.so-version)";;\ *) echo "$$lib.so-version=$$number"; \ - echo "all-sonames+=\$$($$lib.so-version)";;\ + echo "all-sonames+=$$lib=\$$($$lib.so-version)";;\ esac; \ done < $< > $@T; exit 0 mv -f $@T $@ @@ -735,10 +735,17 @@ $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk echo; \ (libs='$(all-sonames)';\ for l in $$libs; do \ - upname=`echo $$l | sed 's/[.]so.*//' | \ + name=`echo $$l | sed 's/.*=//'`; \ + upname=`echo $$l | sed 's/=.*//' | \ tr 'abcdefghijklmnopqrstuvwxyz-' \ 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`; \ - echo "#define $${upname}_SO \"$$l\""; \ + upname2=`echo $$name | sed 's/[.]so.*//' | \ + tr 'abcdefghijklmnopqrstuvwxyz-' \ + 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`; \ + echo "#define $${upname}_SO \"$$name\""; \ + if test $$upname != $$upname2; then \ + echo "#define $${upname2}_SO \"$$name\""; \ + fi; \ done;) | sort; \ echo; \ echo '#endif /* gnu/lib-names.h */';) > ${@:stmp=T} diff --git a/inet/rcmd.c b/inet/rcmd.c index dd0fd35123..12081e8963 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -340,11 +340,9 @@ rresvport_af(alport, family) ss.__ss_family = family; for (;;) { - *sport = htons(i); - if (bind(s, (struct sockaddr *)&ss, len) >= 0){ - *alport = i; + *sport = htons((uint16_t) *alport); + if (bind(s, (struct sockaddr *)&ss, len) >= 0) return s; - } if (errno != EADDRINUSE) { (void)__close(s); return -1; |