From daddbc6edd327f44cc7093696f487c4a9e689132 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Mon, 24 Mar 2008 18:06:37 +0000
Subject: merge from gcc

---
 libiberty/make-relative-prefix.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'libiberty/make-relative-prefix.c')

diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
index 80e7f92..c98d287 100644
--- a/libiberty/make-relative-prefix.c
+++ b/libiberty/make-relative-prefix.c
@@ -292,14 +292,12 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
 	}
     }
 
-  if ( resolve_links )
-    {
-      full_progname = lrealpath (progname);
-      if (full_progname == NULL)
-	return NULL;
-    }
+  if (resolve_links)
+    full_progname = lrealpath (progname);
   else
-    full_progname = strdup(progname);
+    full_progname = strdup (progname);
+  if (full_progname == NULL)
+    return NULL;
 
   prog_dirs = split_directories (full_progname, &prog_num);
   free (full_progname);
-- 
cgit v1.1