tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From ba9e372f3165e0cfd73fcc8a1352fbb790ea2439 Mon Sep 17 00:00:00 2001
2From: Moraxyc <i@qaq.li>
3Date: Sat, 27 Dec 2025 23:22:47 +0800
4Subject: [PATCH] fix build with c23
5
6---
7 dd/dd.c | 4 ++--
8 troff/n5.c | 24 ++++++++++++------------
9 2 files changed, 14 insertions(+), 14 deletions(-)
10
11diff --git a/dd/dd.c b/dd/dd.c
12index 9e69b6b..1e7d4c5 100644
13--- a/dd/dd.c
14+++ b/dd/dd.c
15@@ -312,11 +312,11 @@ match(char *s)
16 cs = string;
17 while(*cs++ == *s)
18 if(*s++ == '\0')
19- goto true;
20+ goto match_true;
21 if(*s != '\0')
22 return 0;
23
24-true:
25+match_true:
26 cs--;
27 string = cs;
28 return 1;
29diff --git a/troff/n5.c b/troff/n5.c
30index 7266432..7566068 100644
31--- a/troff/n5.c
32+++ b/troff/n5.c
33@@ -642,15 +642,15 @@ void caseif(void)
34 void caseif1(int x)
35 {
36 extern int falsef;
37- int notflag, true;
38+ int notflag, truev;
39 Tchar i;
40
41 if (x == 2) {
42 notflag = 0;
43- true = iflist[ifx];
44+ truev = iflist[ifx];
45 goto i1;
46 }
47- true = 0;
48+ truev = 0;
49 skip();
50 if ((cbits(i = getch())) == '!') {
51 notflag = 1;
52@@ -663,37 +663,37 @@ void caseif1(int x)
53 ifnum = 0;
54 if (!nonumb) {
55 if (i > 0)
56- true++;
57+ truev++;
58 goto i1;
59 }
60 i = getch();
61 switch (cbits(i)) {
62 case 'e':
63 if (!(numtabp[PN].val & 01))
64- true++;
65+ truev++;
66 break;
67 case 'o':
68 if (numtabp[PN].val & 01)
69- true++;
70+ truev++;
71 break;
72 case 'n':
73 if (NROFF)
74- true++;
75+ truev++;
76 break;
77 case 't':
78 if (TROFF)
79- true++;
80+ truev++;
81 break;
82 case ' ':
83 break;
84 default:
85- true = cmpstr(i);
86+ truev = cmpstr(i);
87 }
88 i1:
89- true ^= notflag;
90+ truev ^= notflag;
91 if (x == 1)
92- iflist[ifx] = !true;
93- if (true) {
94+ iflist[ifx] = !truev;
95+ if (truev) {
96 i2:
97 while ((cbits(i = getch())) == ' ')
98 ;
99--
1002.51.2
101