From nobody Tue Dec 07 00:27:35 2021 X-Original-To: dev-commits-src-branches@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 EFE0518D37FF; Tue, 7 Dec 2021 00:27:36 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7LjM6jblz4SGF; Tue, 7 Dec 2021 00:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B8EE215C61; Tue, 7 Dec 2021 00:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B70RZEi021384; Tue, 7 Dec 2021 00:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B70RZD4021383; Tue, 7 Dec 2021 00:27:35 GMT (envelope-from git) Date: Tue, 7 Dec 2021 00:27:35 GMT Message-Id: <202112070027.1B70RZD4021383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c7b624979a60 - stable/13 - posix_spawn: add chdir-related non-portable actions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c7b624979a60816251f848f0c460aa2c11712c23 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638836856; 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=l6IlIs9Q5u10glGR94Yo30bN+8Dy+4SaDsDiWMZHPm0=; b=uDZTmIdR7OkMPsOLv3x2mgQkd3EnGEV+EvtqHyd3OmHS8lIk+tWnthsS2zE6Khq/PuNKPQ C4Jgqpqv7SCP1eyutB2GmAmuvzBrXVzRpjv0Hb7nGzP4YbKqEDSVqzEi0UoiCXPD6LhgXv iBVn0An02GhezjHvUtOX39/bSc/eyhJPDbWPPYJwCBA31F+h5oAlhHoXspdBmeDUtbseiz uZ7WmOPIAP5/XFSJPyRPUFcFYaPXxpjXFeVzI3kzB8j2HXnd4iYbnJjpqpjKnf2T7Dsz4x T+raMx9SafBx8UDxsgOluJ4RqqYVj3o2RyViBpmsRkX+abcjZ1bUsjSK0MVoPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638836856; a=rsa-sha256; cv=none; b=H7kSPvMGSGTFtIPKyI1EZXCNEDTNN44LrgP69RqqXI8rRG6o+7bOd4y/MgBUr9ZtiuZgDP EDtyio9Z3pFytgOTMYO4snNywXnwoCzQSpRFqAtShiCk29lb+h3BU+LcmnHr7ZZ4EQewOL 5eXpPT76VG4TqrzHzVggvTtQHWj5kN4Rju3HzQkJdzchmYNFD6H7b+7oL+/KtL1U2cjlY0 wfXMCadvW82jvRV+ICMAn3AWXqaOwWfj+4RHnaCDG9Yi5jzo5ogpZBdE3boAjZvou3PyA4 qxsCZGB/kECv1J51RLSD4fuI3eyQFS60tD3MjD/8lYQzjXbI4nSXSuY9FNM5Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c7b624979a60816251f848f0c460aa2c11712c23 commit c7b624979a60816251f848f0c460aa2c11712c23 Author: Konstantin Belousov AuthorDate: 2021-11-27 22:49:03 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-07 00:25:53 +0000 posix_spawn: add chdir-related non-portable actions (cherry picked from commit 25cda42a498101612687b32005856cd8b14f2f7a) --- include/spawn.h | 7 ++++++ lib/libc/gen/Symbol.map | 5 ++++ lib/libc/gen/posix_spawn.c | 57 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/include/spawn.h b/include/spawn.h index 79753bba0510..4ba3998a3e90 100644 --- a/include/spawn.h +++ b/include/spawn.h @@ -87,6 +87,13 @@ int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t * __restrict, int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *, int, int); int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *, int); +#if __BSD_VISIBLE +int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t * + __restrict, const char * __restrict); +int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *, + int); +#endif + /* * Spawn attributes */ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index c89eb63caada..5cf14d569cdb 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -435,6 +435,11 @@ FBSD_1.6 { tcsetwinsize; }; +FBSD_1.7 { + posix_spawn_file_actions_addchdir_np; + posix_spawn_file_actions_addfchdir_np; +}; + FBSDprivate_1.0 { /* needed by thread libraries */ __thr_jtable; diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 03283cfcfb04..00d1724a6515 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -66,6 +66,8 @@ typedef struct __posix_spawn_file_actions_entry { FAE_OPEN, FAE_DUP2, FAE_CLOSE, + FAE_CHDIR, + FAE_FCHDIR, } fae_action; int fae_fildes; @@ -180,6 +182,14 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae) /* Perform a close(), do not fail if already closed */ (void)_close(fae->fae_fildes); break; + case FAE_CHDIR: + if (chdir(fae->fae_path) != 0) + return (errno); + break; + case FAE_FCHDIR: + if (fchdir(fae->fae_fildes) != 0) + return (errno); + break; } return (0); } @@ -393,7 +403,8 @@ posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa) STAILQ_REMOVE_HEAD(&(*fa)->fa_list, fae_list); /* Deallocate file action entry */ - if (fae->fae_action == FAE_OPEN) + if (fae->fae_action == FAE_OPEN || + fae->fae_action == FAE_CHDIR) free(fae->fae_path); free(fae); } @@ -478,6 +489,50 @@ posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *fa, return (0); } +int +posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t * + __restrict fa, const char *__restrict path) +{ + posix_spawn_file_actions_entry_t *fae; + int error; + + fae = malloc(sizeof(posix_spawn_file_actions_entry_t)); + if (fae == NULL) + return (errno); + + fae->fae_action = FAE_CHDIR; + fae->fae_path = strdup(path); + if (fae->fae_path == NULL) { + error = errno; + free(fae); + return (error); + } + + STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list); + return (0); +} + +int +posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t *__restrict fa, + int fildes) +{ + posix_spawn_file_actions_entry_t *fae; + + if (fildes < 0) + return (EBADF); + + /* Allocate object */ + fae = malloc(sizeof(posix_spawn_file_actions_entry_t)); + if (fae == NULL) + return (errno); + + fae->fae_action = FAE_FCHDIR; + fae->fae_fildes = fildes; + + STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list); + return (0); +} + /* * Spawn attributes */