From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 29 May 2000 17:17:31 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc_2-1-91~347
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8322b4fa929e14f7a14e52645232acdaa1d5623;p=thirdparty%2Fglibc.git

Update.

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.
---

diff --git a/ChangeLog b/ChangeLog
index 6c2093f078e..e117190421f 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 c4f682968cf..441ee06273d 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 dd0fd351230..12081e89631 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;