From nobody Tue Mar 18 01:35:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGvXw589xz5r30Q; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGvXw1WTFz3tX4; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFsBhdFhv11IDL/fhy5qSc3fqPYO3WiAMHc2O/d3Yyk=; b=eRa5FaJpM7aSBotHmDEo4N1mDgGZkPo5QFuSy2FRiufHEQMGM02OqOJ0FMO5NU4ZXkR5iv d4LFsN4R/vBJSBtb+qOcOXkGD/QGTPhF2giMG+dWcl/69yCc0irdboePOQMo1tAKd45yTB QcmfuMmeFb8dyNoUC1r7AHEgZx2tcqcnTRTuz6ZMMICWrhCAZOuDgweKFsEnGOBqpVXHjN 7llipY9Qnj/hTWa83cuwAdX7plIbzRb+A6osecM1gbSC6sx72hzYHwjx/lil1SdXCQN0mY NJ0ywdV1kE9NwZ1hCoJkiN/b8HdMPb4dXp738lhK951i68lVEFurX41V3dnabA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742261712; a=rsa-sha256; cv=none; b=TewCwHMUGSf/FViKW3V3ySav5maS09JSFZ2bpruyWJ42mIfn5XNZ2did9WaCLwiTvufgVa gvKlT5gaEAaUgbuE1NutXQfFStCh5LSLpdbnc4hnSFZgtf4KqHzeviH2oqs6xOy5q4x5jx xjzz9jis4G0M1Q/ZKHOrRUxsl2H5jGBSKgNDh3w5SQSeParm0sPvpanLo7+Rj9zhxMUBCR c5zV8KfSO9JgBD69gExtbnERw+cEJNa4q25tbXXtr5w5Hpp85wqE/+a566d4MoqMllIPjy 3E6wrp/M1gmUWhTlkTRIdASt9Sy6xOz87U70UH/XKg/SDY8oCvOPDrAmwOqJHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFsBhdFhv11IDL/fhy5qSc3fqPYO3WiAMHc2O/d3Yyk=; b=mek+JEG//uFuCgxn7l/HKV62p81dk4khuvVZ1gxJw4OEPcTJFPXb+F9L4obTtsNmjHUlUk 9JG1df79MmwDhwGUgftdJh20LiDWWFdONaheNT+BNT50+V9pYeuKBmoNQOe0TW/TDBPz/U TwCws1aawM9G4Oti1W9u+4OfxZphGEK0Y7YYZcc90gajqHUta6JPU3By/Yt0JtJcojD0rt XoDuHz3G4RWDC0qaQNCK09elE38EmiH21lLayuG6T1I8m07aZUF7+nCTEXDRDNzU2nIl5v EcBf0DlKfhvYQmcMA6KIzqt6N2CrSQqwNwb60GHqcvuabo5V6CsIML35bsd9nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGvXw0qHlz19wH; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I1ZCuA097624; Tue, 18 Mar 2025 01:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I1ZCfo097621; Tue, 18 Mar 2025 01:35:12 GMT (envelope-from git) Date: Tue, 18 Mar 2025 01:35:12 GMT Message-Id: <202503180135.52I1ZCfo097621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1c8cdd807a94 - main - rtld: fix several style(9) bugs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 commit 1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 Author: Konstantin Belousov AuthorDate: 2025-03-18 01:05:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-18 01:34:03 +0000 rtld: fix several style(9) bugs Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index aab20407b00d..2346c6eae9f6 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -665,15 +665,19 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux = auxp = (Elf_Auxinfo *)envp; auxpf = (Elf_Auxinfo *)(envp + rtld_argc); dbg("move aux from %p to %p", auxpf, aux); - /* XXXKIB insert place for AT_EXECPATH if not - * present */ + /* + * XXXKIB insert place for AT_EXECPATH if not + * present + */ for (;; auxp++, auxpf++) { *auxp = *auxpf; if (auxp->a_type == AT_NULL) break; } - /* Since the auxiliary vector has moved, - * redigest it. */ + /* + * Since the auxiliary vector has moved, + * redigest it. + */ for (i = 0; i < AT_COUNT; i++) aux_info[i] = NULL; for (auxp = aux; auxp->a_type != AT_NULL; @@ -682,8 +686,10 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux_info[auxp->a_type] = auxp; } - /* Point AT_EXECPATH auxv and aux_info to the - * binary path. */ + /* + * Point AT_EXECPATH auxv and aux_info to the + * binary path. + */ if (binpath == NULL) { aux_info[AT_EXECPATH] = NULL; } else { @@ -1677,7 +1683,7 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry, const char *path) obj->mapbase = obj->vaddrbase + obj->relocbase; } else { /* Last load segment */ obj->mapsize = rtld_round_page( - ph->p_vaddr + ph->p_memsz) - + ph->p_vaddr + ph->p_memsz) - obj->vaddrbase; } nsegs++; @@ -1877,8 +1883,8 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp) if (strchr(name, '/') != NULL) { /* Hard coded pathname */ if (name[0] != '/' && !trust) { - _rtld_error("Absolute pathname required " - "for shared object \"%s\"", + _rtld_error( + "Absolute pathname required for shared object \"%s\"", name); return (NULL); } @@ -1957,8 +1963,8 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp) } if (objgiven && refobj->path != NULL) { - _rtld_error("Shared object \"%s\" not found, " - "required by \"%s\"", + _rtld_error( + "Shared object \"%s\" not found, required by \"%s\"", name, basename(refobj->path)); } else { _rtld_error("Shared object \"%s\" not found", name); @@ -2040,8 +2046,10 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj, if (def != NULL) { *defobj_out = defobj; - /* Record the information in the cache to avoid subsequent - * lookups. */ + /* + * Record the information in the cache to avoid subsequent + * lookups. + */ if (cache != NULL) { cache[symnum].sym = def; cache[symnum].obj = defobj; @@ -2110,7 +2118,7 @@ gethints(bool nostdlib) if (read(fd, &hdr, sizeof hdr) != sizeof hdr) { dbg("failed to read %lu bytes from hints file \"%s\"", (u_long)sizeof hdr, ld_elf_hints_path); - cleanup1: +cleanup1: close(fd); hdr.dirlistlen = 0; return (NULL); @@ -2164,10 +2172,10 @@ gethints(bool nostdlib) } p = xmalloc(dirlistlen + 1); if (pread(fd, p, dirlistlen + 1, strtab + dirlist) != - (ssize_t)dirlistlen + 1 || - p[dirlistlen] != '\0') { + (ssize_t)dirlistlen + 1 || p[dirlistlen] != '\0') { free(p); - dbg("failed to read %d bytes starting at %d from hints file \"%s\"", + dbg( + "failed to read %d bytes starting at %d from hints file \"%s\"", dirlistlen + 1, strtab + dirlist, ld_elf_hints_path); goto cleanup1; @@ -2616,10 +2624,8 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, { for (; needed != NULL; needed = needed->next) { needed->obj = dlopen_object(obj->strtab + needed->name, -1, obj, - flags, - ((ld_loadfltr || obj->z_loadfltr) ? RTLD_NOW : RTLD_LAZY) | - RTLD_LOCAL, - lockstate); + flags, ((ld_loadfltr || obj->z_loadfltr) ? RTLD_NOW : + RTLD_LAZY) | RTLD_LOCAL, lockstate); } }