svn commit: r339165 - stable/11/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Wed Oct  3 17:27:20 2018
New Revision: 339165
URL: https://svnweb.freebsd.org/changeset/base/339165

Log:
  MFC r324950 (by trasz):
  Reword the conditional.

Modified:
  stable/11/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/11/libexec/rtld-elf/rtld.c	Wed Oct  3 17:21:45 2018	(r339164)
+++ stable/11/libexec/rtld-elf/rtld.c	Wed Oct  3 17:27:20 2018	(r339165)
@@ -1619,27 +1619,54 @@ find_library(const char *xname, const Obj_Entry *refob
      * nodeflib.
      */
     if (objgiven && refobj->rpath != NULL && ld_library_path_rpath) {
-	if ((pathname = search_library_path(name, ld_library_path)) != NULL ||
-	  (refobj != NULL &&
-	  (pathname = search_library_path(name, refobj->rpath)) != NULL) ||
-	  (pathname = search_library_pathfds(name, ld_library_dirs, fdp)) != NULL ||
-          (pathname = search_library_path(name, gethints(false))) != NULL ||
-	  (pathname = search_library_path(name, ld_standard_library_path)) != NULL)
+	pathname = search_library_path(name, ld_library_path);
+	if (pathname != NULL)
 	    return (pathname);
+	if (refobj != NULL) {
+	    pathname = search_library_path(name, refobj->rpath);
+	    if (pathname != NULL)
+	      return (pathname);
+	}
+	pathname = search_library_pathfds(name, ld_library_dirs, fdp);
+	if (pathname != NULL)
+	    return (pathname);
+	pathname = search_library_path(name, gethints(false));
+	if (pathname != NULL)
+	    return (pathname);
+	pathname = search_library_path(name, ld_standard_library_path);
+	if (pathname != NULL)
+	    return (pathname);
     } else {
 	nodeflib = objgiven ? refobj->z_nodeflib : false;
-	if ((objgiven &&
-	  (pathname = search_library_path(name, refobj->rpath)) != NULL) ||
-	  (objgiven && refobj->runpath == NULL && refobj != obj_main &&
-	  (pathname = search_library_path(name, obj_main->rpath)) != NULL) ||
-	  (pathname = search_library_path(name, ld_library_path)) != NULL ||
-	  (objgiven &&
-	  (pathname = search_library_path(name, refobj->runpath)) != NULL) ||
-	  (pathname = search_library_pathfds(name, ld_library_dirs, fdp)) != NULL ||
-	  (pathname = search_library_path(name, gethints(nodeflib))) != NULL ||
-	  (objgiven && !nodeflib &&
-	  (pathname = search_library_path(name, ld_standard_library_path)) != NULL))
+	if (objgiven) {
+	    pathname = search_library_path(name, refobj->rpath);
+	    if (pathname != NULL)
+		return (pathname);
+	}
+	if (objgiven && refobj->runpath == NULL && refobj != obj_main) {
+	    pathname = search_library_path(name, obj_main->rpath);
+	    if (pathname != NULL)
+		return (pathname);
+	}
+	pathname = search_library_path(name, ld_library_path);
+	if (pathname != NULL)
 	    return (pathname);
+	if (objgiven) {
+	    pathname = search_library_path(name, refobj->runpath);
+	    if (pathname != NULL)
+		return (pathname);
+	}
+	pathname = search_library_pathfds(name, ld_library_dirs, fdp);
+	if (pathname != NULL)
+	    return (pathname);
+	pathname = search_library_path(name, gethints(nodeflib));
+	if (pathname != NULL)
+	    return (pathname);
+	if (objgiven && !nodeflib) {
+	    pathname = search_library_path(name, ld_standard_library_path);
+	    if (pathname != NULL)
+		return (pathname);
+	}
     }
 
     if (objgiven && refobj->path != NULL) {