From patchwork Thu Nov 9 15:20:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 1862126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=X7QTgezA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SR5JC5V43z1yQl for ; Fri, 10 Nov 2023 02:20:59 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9E0653857721 for ; Thu, 9 Nov 2023 15:20:56 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by sourceware.org (Postfix) with ESMTPS id 61F223858425 for ; Thu, 9 Nov 2023 15:20:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 61F223858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 61F223858425 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=145.40.68.75 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699543246; cv=none; b=V+JnufTmNRfF0oy2Bia36k8yhWK38MKqAY8p9HFp53Z6fzVj3K6HhB1Cd0BoBdP8uBKeB6J85VXQujApv+ybFGKXunIM73a6lb14tNqSEZI5JPMHy4FIxjLunvFxF9vkr9zobaHjpwY72+JyYVco3tDC6Ea1/40MlukwCywpL4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699543246; c=relaxed/simple; bh=YzFuP0/H5/07clwoKJrhupQ0PCXz/xmxy+i2aHumR+Q=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=d8SjUCXdopdNAS59p3b0ZueFtl6pAdQA9bBm6JRP67Zjgmce/5PqyT9ps+Sdgy6v52xQe4BjasbvFTFDZNj1lVZMQ2Xn6IpwS0fkdd9Ay0guia4ZlBXKIl/VFytabgqz3xEoeM0ekCgZWmv72XILDti7jy1GrB+vWMxNUSe2hVI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 6605FB82128; Thu, 9 Nov 2023 15:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 172E2C433C7; Thu, 9 Nov 2023 15:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699543243; bh=YzFuP0/H5/07clwoKJrhupQ0PCXz/xmxy+i2aHumR+Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=X7QTgezANdVC16Yb/gE1RmdmmPCidqeYeV19rxZgn9Qk0y7L1Hc/S2eD3VbMKXhm+ CqNacaOR7OHnPAspACZVTxZzmHM5bWdQZV6Q16dO0tZPmZr0zjM6UdlSSsgIw6EMtJ +B6UDbf/+WMxsdTw+Fe7kodckTPYW7dl4etOEtmUO99coTD7xrezAtBVSVKZ+1Ba4h 8f3lRanhKcNx3B+E7q+OEWCbAAsvFKI+i/JX486lSoLEi8hnBvaRd76lF0xqHHD1J3 ndaJLOZAMg/K5pWRApjakh3oOOl++W9J4LtfjX4mSE7UhhaWmGw0TJe2HQFnKgVbfL LrI8k6w+XW1HA== Date: Thu, 9 Nov 2023 16:20:39 +0100 From: Alejandro Colomar To: linux-man@vger.kernel.org Cc: Alejandro Colomar , libc-alpha@sourceware.org, Jonny Grant , DJ Delorie , Matthew House , Oskari Pirhonen , Thorsten Kukuk , Adhemerval Zanella Netto , Zack Weinberg , "G. Branden Robinson" , Carlos O'Donell , Paul Eggert , Xi Ruoyao Subject: [PATCH v2 2/2] stpncpy.3, string.3, string_copying.7: Clarify that st[rp]ncpy() pad with null bytes Message-ID: <20231109151947.11174-3-alx@kernel.org> References: <20231108221638.37101-2-alx@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231108221638.37101-2-alx@kernel.org> X-Mailer: git-send-email 2.42.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org The previous wording could be interpreted as if the nulls were already in place. Clarify that it's this function which pads with null bytes. Also, it copies "characters" from the src string. That's a bit more specific than copying "bytes", and makes it clearer that the terminating null byte in src is not part of the copy. Suggested-by: Jonny Grant Cc: DJ Delorie Cc: Jonny Grant Cc: Matthew House Cc: Oskari Pirhonen Cc: Thorsten Kukuk Cc: Adhemerval Zanella Netto Cc: Zack Weinberg Cc: "G. Branden Robinson" Cc: Carlos O'Donell Cc: Paul Eggert Cc: Xi Ruoyao Signed-off-by: Alejandro Colomar --- man3/stpncpy.3 | 10 ++++++---- man3/string.3 | 11 ++--------- man7/string_copying.7 | 3 ++- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/man3/stpncpy.3 b/man3/stpncpy.3 index f86ff8c29..3cf4eb371 100644 --- a/man3/stpncpy.3 +++ b/man3/stpncpy.3 @@ -7,7 +7,8 @@ .SH NAME stpncpy, strncpy \- -fill a fixed-width null-padded buffer with bytes from a string +fill a fixed-width buffer with characters from a string +and pad with null bytes .SH LIBRARY Standard C library .RI ( libc ", " \-lc ) @@ -36,10 +37,11 @@ .SH SYNOPSIS _GNU_SOURCE .fi .SH DESCRIPTION -These functions copy bytes from the string pointed to by +These functions copy characters from the string pointed to by .I src -into a null-padded character sequence at the fixed-width buffer pointed to by -.IR dst . +into a character sequence at the fixed-width buffer pointed to by +.IR dst , +and pad with null bytes. If the destination buffer, limited by its size, isn't large enough to hold the copy, diff --git a/man3/string.3 b/man3/string.3 index aba5efd2b..bd8b342a6 100644 --- a/man3/string.3 +++ b/man3/string.3 @@ -179,21 +179,14 @@ .SH SYNOPSIS .I n bytes to .IR dest . -.SS Obsolete functions .TP .nf .BI "char *strncpy(char " dest "[restrict ." n "], \ const char " src "[restrict ." n ], .BI " size_t " n ); .fi -Copy at most -.I n -bytes from string -.I src -to -.IR dest , -returning a pointer to the start of -.IR dest . +Fill a fixed‐width buffer with characters from a string +and pad with null bytes. .SH DESCRIPTION The string functions perform operations on null-terminated strings. diff --git a/man7/string_copying.7 b/man7/string_copying.7 index 0e179ba34..865271c6f 100644 --- a/man7/string_copying.7 +++ b/man7/string_copying.7 @@ -41,7 +41,8 @@ .SS Strings .\" ----- SYNOPSIS :: Null-padded character sequences --------/ .SS Null-padded character sequences .nf -// Fill a fixed-width null-padded buffer with bytes from a string. +// Fill a fixed-width buffer with characters from a string +// and pad with null bytes. .BI "char *strncpy(char " dst "[restrict ." sz "], \ const char *restrict " src , .BI " size_t " sz );