Update.

2001-09-04  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-object.c (_dl_new_object): Remove unnecessary if.

diff --git a/ChangeLog b/ChangeLog
index 271cf52..9f4379d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-04  Ulrich Drepper  <drepper@redhat.com>
+
+       * elf/dl-object.c (_dl_new_object): Remove unnecessary if.
+
 2001-09-02  Ulrich Drepper  <drepper@redhat.com>
 
        * elf/rtld.c (dl_main): Increment l_opencount for main binary.

diff --git a/elf/dl-object.c b/elf/dl-object.c
index c7b67e9..07e428e 100644 (file)
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -91,7 +91,7 @@ _dl_new_object (char *realname, const char *libname, int type,
          /* It an absolute path.  Use it.  But we have to make a copy since
             we strip out the trailing slash.  */
          size_t len = strlen (realname) + 1;
-         origin = malloc (len);
+         origin = (char *) malloc (len);
          if (origin == NULL)
            origin = (char *) -1;
          else
@@ -104,7 +104,7 @@ _dl_new_object (char *realname, const char *libname, int type,
          char *result = NULL;
 
          /* Get the current directory name.  */
-         origin = malloc (len);
+         origin = (char *) malloc (len);
 
          while (origin != NULL
                 && (result = __getcwd (origin, len - realname_len)) == NULL
@@ -117,8 +117,7 @@ _dl_new_object (char *realname, const char *libname, int type,
          if (result == NULL)
            {
              /* We were not able to determine the current directory.  */
-             if (origin != NULL)
-               free (origin);
+             free (origin);
              origin = (char *) -1;
            }
          else

diff --git a/sysdeps/unix/sysv/linux/alpha/gethostname.c b/sysdeps/unix/sysv/linux/alpha/gethostname.c
new file mode 100644 (file)
index 0000000..28846ef
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/gethostname.c
@@ -0,0 +1,47 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001
+
+   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 <string.h>
+#include <unistd.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+#include <bp-checks.h>
+
+
+int
+__gethostname (char *name, size_t len)
+{
+  int result;
+
+  result = INLINE_SYSCALL (gethostname, 2, CHECK_N (name, len), len);
+
+  if (result == 0
+      /* See whether the string is terminated.  If not we will return
+        an error.  */
+      && memchr (name, '\0', len) == NULL)
+    {
+      __set_errno (EOVERFLOW);
+      result = -1;
+    }
+
+  return result;
+}
+
+weak_alias (__gethostname, gethostname)