From nobody Sun Mar 1 16:36:29 2026 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 4fP74F6CjJz6TFxb for ; Sun, 01 Mar 2026 16:36:29 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP74F4nMnz3XZ9 for ; Sun, 01 Mar 2026 16:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772382989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aQIz2+qpxo2YYCLpag+jInYKLdH2eLa2gC9QhJjLKsA=; b=pnW6g3bqOym5/3dew8qBn2zBYPH7XKEx341e8V7TLS68e6Y8d0MRhwOm1USaPHv4xVxYeg xRkQeMAUSRDzSTtMyMnwAZFNV1mlXvR7sbMzDAMA1foA1N1Z+Lz9vbUZEpAxJTtcTH3o40 mFYoznsXTkyEKphjIGsVOCMgMDzUEcNH2XxzWZcN4ojNSCd1xWGsI30AhzyqorvAIL6cmN I2l78TNQ421UjAtvtbdwnJOMvAnB7O0iHWKhoCC7k4hPRHQo6bwkwZSyMpp2RdYmbZUrHy wHkbWQy7t9251asjZTbDvPU49Z2/PGXZxQthwsQNGmCiVhB8p3XT9kK5jQYG2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772382989; a=rsa-sha256; cv=none; b=Znmshm8xI54Jk/fMgJvL5hwXFlJuZ+LNY3q2FrAm6W06cqWfCNoRUjbaeQ1vGkfkbvbjpO W7DqLyjtFSR/7zeY8ExQVYrfzL1uVqHb5ZrfvJpocqnziJI4mEoNj4nnOprkvzDw9rKwb4 nnHwy1HCXt/TlBh3/COgFPqIhHdtfvNzBYwFPHTg1KDi+vd0Imgab0NpcuIHSW/HMrGSmr yGjcCi7LKQ+wHHDIcnzOB4HdsFB/bpQ4Y2r4qFoMXyvZV9tlNq9SilxNYiqakAnmlRVtxy tCxLK/yAIUZHMKYTRZyd9QAE8IcZVCpxCzaGllKBXXXu1l4RdJkSWpngQ25X8g== 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=1772382989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aQIz2+qpxo2YYCLpag+jInYKLdH2eLa2gC9QhJjLKsA=; b=nieKKeRWoNSTuIY2ascYcYxBQQNrTt3aHVYHeUlCSW1tf7Tf5wYTp6+BasZb/RyolyrJY2 jJAvMjauTPZJDLGOolUF7MdlH5tcururDrVyts+k8LDLzMDreOMVowoRwW5wtI9+M275wq CvrTlP8S/qHuXs52ygg6s23ZBVTJgX3PNdfyeVVq8df8yar8Xw6XKzL6338meqo/u56aTH DGeAktwX5hldrkRUiSL1zKA2pBAo77hi1Y2/Al85z3yjsMH5Bw7SIaUfcni8sE+Sp0JOQZ FmG4qlq4kWvCYpEHtTvRTXvelkeen8oG2ntKNpwY+aEIrJX8umwWkABIqYphJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP74F3XkWzxQc for ; Sun, 01 Mar 2026 16:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a5ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 16:36:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Faraz Vahedi From: Warner Losh Subject: git: 4ba5c9d015f0 - main - paste(1): Utilise STAILQ from in lieu of the home-rolled linked-list 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ba5c9d015f02eb1fda30de26c23690dd41731fc Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 16:36:29 +0000 Message-Id: <69a46b0d.3a5ab.5275dbf3@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4ba5c9d015f02eb1fda30de26c23690dd41731fc commit 4ba5c9d015f02eb1fda30de26c23690dd41731fc Author: Faraz Vahedi AuthorDate: 2024-10-08 09:41:42 +0000 Commit: Warner Losh CommitDate: 2026-03-01 16:36:15 +0000 paste(1): Utilise STAILQ from in lieu of the home-rolled linked-list Signed-off-by: Faraz Vahedi Reviewed by: imp, oshogbo Pull Request: https://github.com/freebsd/freebsd-src/pull/1443 --- usr.bin/paste/paste.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 8114a85a869a..fa8be54ebe53 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -33,6 +33,7 @@ */ #include +#include #include #include @@ -106,43 +107,43 @@ main(int argc, char *argv[]) } typedef struct _list { - struct _list *next; + STAILQ_ENTRY(_list) entries; FILE *fp; int cnt; char *name; } LIST; +static STAILQ_HEAD(head, _list) lh; + static int parallel(char **argv) { + struct head lh; LIST *lp; int cnt; wint_t ich; wchar_t ch; char *p; - LIST *head, *tmp; int opencnt, output; - for (cnt = 0, head = tmp = NULL; (p = *argv); ++argv, ++cnt) { + STAILQ_INIT(&lh); + + for (cnt = 0; (p = *argv); ++argv, ++cnt) { if ((lp = malloc(sizeof(LIST))) == NULL) err(1, NULL); if (p[0] == '-' && !p[1]) lp->fp = stdin; else if (!(lp->fp = fopen(p, "r"))) err(1, "%s", p); - lp->next = NULL; lp->cnt = cnt; lp->name = p; - if (!head) - head = tmp = lp; - else { - tmp->next = lp; - tmp = lp; - } + + STAILQ_INSERT_TAIL(&lh, lp, entries); } for (opencnt = cnt; opencnt;) { - for (output = 0, lp = head; lp; lp = lp->next) { + output = 0; + STAILQ_FOREACH(lp, &lh, entries) { if (!lp->fp) { if (output && lp->cnt && (ch = delim[(lp->cnt - 1) % delimcnt]))