1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
9543
9544
9545
9546
9547
9548
9549
9550
9551
9552
9553
9554
9555
9556
9557
9558
9559
9560
9561
9562
9563
9564
9565
9566
9567
9568
9569
9570
9571
9572
9573
9574
9575
9576
9577
9578
9579
9580
9581
9582
9583
9584
9585
9586
9587
9588
9589
9590
9591
9592
9593
9594
9595
9596
9597
9598
9599
9600
9601
9602
9603
9604
9605
9606
9607
9608
9609
9610
9611
9612
9613
9614
9615
9616
9617
9618
9619
9620
9621
9622
9623
9624
9625
9626
9627
9628
9629
9630
9631
9632
9633
9634
9635
9636
9637
9638
9639
9640
9641
9642
9643
9644
9645
9646
9647
9648
9649
9650
9651
9652
9653
9654
9655
9656
9657
9658
9659
9660
9661
9662
9663
9664
9665
9666
9667
9668
9669
9670
9671
9672
9673
9674
9675
9676
9677
9678
9679
9680
9681
9682
9683
9684
9685
9686
9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698
9699
9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725
9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
9742
9743
9744
9745
9746
9747
9748
9749
9750
9751
9752
9753
9754
9755
9756
9757
9758
9759
9760
9761
9762
9763
9764
9765
9766
9767
9768
9769
9770
9771
9772
9773
9774
9775
9776
9777
9778
9779
9780
9781
9782
9783
9784
9785
9786
9787
9788
9789
9790
9791
9792
9793
9794
9795
9796
9797
9798
9799
9800
9801
9802
9803
9804
9805
9806
9807
9808
9809
9810
9811
9812
9813
9814
9815
9816
9817
9818
9819
9820
9821
9822
9823
9824
9825
9826
9827
9828
9829
9830
9831
9832
9833
9834
9835
9836
9837
9838
9839
9840
9841
9842
9843
9844
9845
9846
9847
9848
9849
9850
9851
9852
9853
9854
9855
9856
9857
9858
9859
9860
9861
9862
9863
9864
9865
9866
9867
9868
9869
9870
9871
9872
9873
9874
9875
9876
9877
9878
9879
9880
9881
9882
9883
9884
9885
9886
9887
9888
9889
9890
9891
9892
9893
9894
9895
9896
9897
9898
9899
9900
9901
9902
9903
9904
9905
9906
9907
9908
9909
9910
9911
9912
9913
9914
9915
9916
9917
9918
9919
9920
9921
9922
9923
9924
9925
9926
9927
9928
9929
9930
9931
9932
9933
9934
9935
9936
9937
9938
9939
9940
9941
9942
9943
9944
9945
9946
9947
9948
9949
9950
9951
9952
9953
9954
9955
9956
9957
9958
9959
9960
9961
9962
9963
9964
9965
9966
9967
9968
9969
9970
9971
9972
9973
9974
9975
9976
9977
9978
9979
9980
9981
9982
9983
9984
9985
9986
9987
9988
9989
9990
9991
9992
9993
9994
9995
9996
9997
9998
9999
10000
10001
10002
10003
10004
10005
10006
10007
10008
10009
10010
10011
10012
10013
10014
10015
10016
10017
10018
10019
10020
10021
10022
10023
10024
10025
10026
10027
10028
10029
10030
10031
10032
10033
10034
10035
10036
10037
10038
10039
10040
10041
10042
10043
10044
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
10067
10068
10069
10070
10071
10072
10073
10074
10075
10076
10077
10078
10079
10080
10081
10082
10083
10084
10085
10086
10087
10088
10089
10090
10091
10092
10093
10094
10095
10096
10097
10098
10099
10100
10101
10102
10103
10104
10105
10106
10107
10108
10109
10110
10111
10112
10113
10114
10115
10116
10117
10118
10119
10120
10121
10122
10123
10124
10125
10126
10127
10128
10129
10130
10131
10132
10133
10134
10135
10136
10137
10138
10139
10140
10141
10142
10143
10144
10145
10146
10147
10148
10149
10150
10151
10152
10153
10154
10155
10156
10157
10158
10159
10160
10161
10162
10163
10164
10165
10166
10167
10168
10169
10170
10171
10172
10173
10174
10175
10176
10177
10178
10179
10180
10181
10182
10183
10184
10185
10186
10187
10188
10189
10190
10191
10192
10193
10194
10195
10196
10197
10198
10199
10200
10201
10202
10203
10204
10205
10206
10207
10208
10209
10210
10211
10212
10213
10214
10215
10216
10217
10218
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229
10230
10231
10232
10233
10234
10235
10236
10237
10238
10239
10240
10241
10242
10243
10244
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
10278
10279
10280
10281
10282
10283
10284
10285
10286
10287
10288
10289
10290
10291
10292
10293
10294
10295
10296
10297
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
10311
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
10322
10323
10324
10325
10326
10327
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
10339
10340
10341
10342
10343
10344
10345
10346
10347
10348
10349
10350
10351
10352
10353
10354
10355
10356
10357
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
10417
10418
10419
10420
10421
10422
10423
10424
10425
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
10440
10441
10442
10443
10444
10445
10446
10447
10448
10449
10450
10451
10452
10453
10454
10455
10456
10457
10458
10459
10460
10461
10462
10463
10464
10465
10466
10467
10468
10469
10470
10471
10472
10473
10474
10475
10476
10477
10478
10479
10480
10481
10482
10483
10484
10485
10486
10487
10488
10489
10490
10491
10492
10493
10494
10495
10496
10497
10498
10499
10500
10501
10502
10503
10504
10505
10506
10507
10508
10509
10510
10511
10512
10513
10514
10515
10516
10517
10518
10519
10520
10521
10522
10523
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
10534
10535
10536
10537
10538
10539
10540
10541
10542
10543
10544
10545
10546
10547
10548
10549
10550
10551
10552
10553
10554
10555
10556
10557
10558
10559
10560
10561
10562
10563
10564
10565
10566
10567
10568
10569
10570
10571
10572
10573
10574
10575
10576
10577
10578
10579
10580
10581
10582
10583
10584
10585
10586
10587
10588
10589
10590
10591
10592
10593
10594
10595
10596
10597
10598
10599
10600
10601
10602
10603
10604
10605
10606
10607
10608
10609
10610
10611
10612
10613
10614
10615
10616
10617
10618
10619
10620
10621
10622
10623
10624
10625
10626
10627
10628
10629
10630
10631
10632
10633
10634
10635
10636
10637
10638
10639
10640
10641
10642
10643
10644
10645
10646
10647
10648
10649
10650
10651
10652
10653
10654
10655
10656
10657
10658
10659
10660
10661
10662
10663
10664
10665
10666
10667
10668
10669
10670
10671
10672
10673
10674
10675
10676
10677
10678
10679
10680
10681
10682
10683
10684
10685
10686
10687
10688
10689
10690
10691
10692
10693
10694
10695
10696
10697
10698
10699
10700
10701
10702
10703
10704
10705
10706
10707
10708
10709
10710
10711
10712
10713
10714
10715
10716
10717
10718
10719
10720
10721
10722
10723
10724
10725
10726
10727
10728
10729
10730
10731
10732
10733
10734
10735
10736
10737
10738
10739
10740
10741
10742
10743
10744
10745
10746
10747
10748
10749
10750
10751
10752
10753
10754
10755
10756
10757
10758
10759
10760
10761
10762
10763
10764
10765
10766
10767
10768
10769
10770
10771
10772
10773
10774
10775
10776
10777
10778
10779
10780
10781
10782
10783
10784
10785
10786
10787
10788
10789
10790
10791
10792
10793
10794
10795
10796
10797
10798
10799
10800
10801
10802
10803
10804
10805
10806
10807
10808
10809
10810
10811
10812
10813
10814
10815
10816
10817
10818
10819
10820
10821
10822
10823
10824
10825
10826
10827
10828
10829
10830
10831
10832
10833
10834
10835
10836
10837
10838
10839
10840
10841
10842
10843
10844
10845
10846
10847
10848
10849
10850
10851
10852
10853
10854
10855
10856
10857
10858
10859
10860
10861
10862
10863
10864
10865
10866
10867
10868
10869
10870
10871
10872
10873
10874
10875
10876
10877
10878
10879
10880
10881
10882
10883
10884
10885
10886
10887
10888
10889
10890
10891
10892
10893
10894
10895
10896
10897
10898
10899
10900
10901
10902
10903
10904
10905
10906
10907
10908
10909
10910
10911
10912
10913
10914
10915
10916
10917
10918
10919
10920
10921
10922
10923
10924
10925
10926
10927
10928
10929
10930
10931
10932
10933
10934
10935
10936
10937
10938
10939
10940
10941
10942
10943
10944
10945
10946
10947
10948
10949
10950
10951
10952
10953
10954
10955
10956
10957
10958
10959
10960
10961
10962
10963
10964
10965
10966
10967
10968
10969
10970
10971
10972
10973
10974
10975
10976
10977
10978
10979
10980
10981
10982
10983
10984
10985
10986
10987
10988
10989
10990
10991
10992
10993
10994
10995
10996
10997
10998
10999
11000
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
11349
11350
11351
11352
11353
11354
11355
11356
11357
11358
11359
11360
11361
11362
11363
11364
11365
11366
11367
11368
11369
11370
11371
11372
11373
11374
11375
11376
11377
11378
11379
11380
11381
11382
11383
11384
11385
11386
11387
11388
11389
11390
11391
11392
11393
11394
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
11406
11407
11408
11409
11410
11411
11412
11413
11414
11415
11416
11417
11418
11419
11420
11421
11422
11423
11424
11425
11426
11427
11428
11429
11430
11431
11432
11433
11434
11435
11436
11437
11438
11439
11440
11441
11442
11443
11444
11445
11446
11447
11448
11449
11450
11451
11452
11453
11454
11455
11456
11457
11458
11459
11460
11461
11462
11463
11464
11465
11466
11467
11468
11469
11470
11471
11472
11473
11474
11475
11476
11477
11478
11479
11480
11481
11482
11483
11484
11485
11486
11487
11488
11489
11490
11491
11492
11493
11494
11495
11496
11497
11498
11499
11500
11501
11502
11503
11504
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
11515
11516
11517
11518
11519
11520
11521
11522
11523
11524
11525
11526
11527
11528
11529
11530
11531
11532
11533
11534
11535
11536
11537
11538
11539
11540
11541
11542
11543
11544
11545
11546
11547
11548
11549
11550
11551
11552
11553
11554
11555
11556
11557
11558
11559
11560
11561
11562
11563
11564
11565
11566
11567
11568
11569
11570
11571
11572
11573
11574
11575
11576
11577
11578
11579
11580
11581
11582
11583
11584
11585
11586
11587
11588
11589
11590
11591
11592
11593
11594
11595
11596
11597
11598
11599
11600
11601
11602
11603
11604
11605
11606
11607
11608
11609
11610
11611
11612
11613
11614
11615
11616
11617
11618
11619
11620
11621
11622
11623
11624
11625
11626
11627
11628
11629
11630
11631
11632
11633
11634
11635
11636
11637
11638
11639
11640
11641
11642
11643
11644
11645
11646
11647
11648
11649
11650
11651
11652
11653
11654
11655
11656
11657
11658
11659
11660
11661
11662
11663
11664
11665
11666
11667
11668
11669
11670
11671
11672
11673
11674
11675
11676
11677
11678
11679
11680
11681
11682
11683
11684
11685
11686
11687
11688
11689
11690
11691
11692
11693
11694
11695
11696
11697
11698
11699
11700
11701
11702
11703
11704
11705
11706
11707
11708
11709
11710
11711
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
11724
11725
11726
11727
11728
11729
11730
11731
11732
11733
11734
11735
11736
11737
11738
11739
11740
11741
11742
11743
11744
11745
11746
11747
11748
11749
11750
11751
11752
11753
11754
11755
11756
|
commit 49053c0a649f4c8bd2b8d97ce915f401fbc0f3d9
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-10-31 22:30:29 +0800
Bump version and soname for 5.4.5.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 84c0cfc556287628df871703672879e530d0391f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-11-01 20:18:30 +0800
Add NEWS for 5.4.5.
NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
commit d90ed84db9770712e2421e170076b43bda9b64a7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-31 21:41:09 +0200
liblzma: Fix compilation of fastpos_tablegen.c.
The macro lzma_attr_visibility_hidden has to be defined to make
fastpos.h usable. The visibility attribute is irrelevant to
fastpos_tablegen.c so simply #define the macro to an empty value.
fastpos_tablegen.c is never built by the included build systems
and so the problem wasn't noticed earlier. It's just a standalone
program for generating fastpos_table.c.
Fixes: https://github.com/tukaani-project/xz/pull/69
Thanks to GitHub user Jamaika1.
src/liblzma/lzma/fastpos_tablegen.c | 2 ++
1 file changed, 2 insertions(+)
commit 9b1268538b0b2c6c0a121f95165de65fc71ad23c
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-10-31 21:51:40 +0800
Build: Fix text wrapping in an output message.
configure.ac | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
commit 068ee436f4a8a706125ef43e8228b30001b1554e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-22 17:59:11 +0300
liblzma: Use lzma_always_inline in memcmplen.h.
src/liblzma/common/memcmplen.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 6cdf0a7b7974baf58c1fd20ec3278f3b84ae56e5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-30 17:43:03 +0200
liblzma: #define lzma_always_inline in common.h.
src/liblzma/common/common.h | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
commit 33daad3961a4f07f3902b40f13e823e6e43e85da
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-22 17:15:32 +0300
liblzma: Use lzma_attr_visibility_hidden on private extern declarations.
These variables are internal to liblzma and not exposed in the API.
src/liblzma/check/check.h | 7 +++++++
src/liblzma/common/stream_flags_common.h | 3 +++
src/liblzma/lz/lz_encoder_hash.h | 1 +
src/liblzma/lzma/fastpos.h | 1 +
src/liblzma/rangecoder/price.h | 1 +
5 files changed, 13 insertions(+)
commit 6961a5ac7df178bfc2b7a181c40575847bc3035f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-22 17:08:39 +0300
liblzma: #define lzma_attr_visibility_hidden in common.h.
In ELF shared libs:
-fvisibility=hidden affects definitions of symbols but not
declarations.[*] This doesn't affect direct calls to functions
inside liblzma as a linker can replace a call to lzma_foo@plt
with a call directly to lzma_foo when -fvisibility=hidden is used.
[*] It has to be like this because otherwise every installed
header file would need to explictly set the symbol visibility
to default.
When accessing extern variables that aren't defined in the
same translation unit, compiler assumes that the variable has
the default visibility and thus indirection is needed. Unlike
function calls, linker cannot optimize this.
Using __attribute__((__visibility__("hidden"))) with the extern
variable declarations tells the compiler that indirection isn't
needed because the definition is in the same shared library.
About 15+ years ago, someone told me that it would be good if
the CRC tables would be defined in the same translation unit
as the C code of the CRC functions. While I understood that it
could help a tiny amount, I didn't want to change the code because
a separate translation unit for the CRC tables was needed for the
x86 assembly code anyway. But when visibility attributes are
supported, simply marking the extern declaration with the
hidden attribute will get identical result. When there are only
a few affected variables, this is trivial to do. I wish I had
understood this back then already.
src/liblzma/common/common.h | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 5b9e16764905d06fa8e8339ba185ddfee304e5fb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-30 22:54:28 +0300
liblzma: Refer to MinGW-w64 instead of MinGW in the API headers.
MinGW (formely a MinGW.org Project, later the MinGW.OSDN Project
at <https://osdn.net/projects/mingw/>) has GCC 9.2.0 as the
most recent GCC package (released 2021-02-02). The project might
still be alive but majority of people have switched to MinGW-w64.
Thus it seems clearer to refer to MinGW-w64 in our API headers too.
Building with MinGW is likely to still work but I haven't tested it
in the recent years.
src/liblzma/api/lzma.h | 4 ++--
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 36fabdbe67c8a8fbdc3ac695a91fc443a1328cc4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-27 00:58:17 +0300
CMake: Use -D_FILE_OFFSET_BITS=64 if (and only if) needed.
A CMake option LARGE_FILE_SUPPORT is created if and only if
-D_FILE_OFFSET_BITS=64 affects sizeof(off_t).
This is needed on many 32-bit platforms and even with 64-bit builds
with MinGW-w64 to get support for files larger than 2 GiB.
CMakeLists.txt | 7 ++++-
cmake/tuklib_large_file_support.cmake | 52 +++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
commit 989c8c354cbd2d20fbae4a432a3e31f5bc1cb9bf
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-30 02:14:25 +0300
CMake: Generate and install liblzma.pc if not using MSVC.
Autotools based build uses -pthread and thus adds it to Libs.private
in liblzma.pc. CMake doesn't use -pthread at all if pthread functions
are available in libc so Libs.private doesn't get -pthread either.
CMakeLists.txt | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit 983f3b458dc79c5976a4237fdfe4f8079f8d8830
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-30 01:13:13 +0300
CMake: Rearrange the PACKAGE_ variables.
The windres workaround now replaces spaces with \x20 so
the package name isn't repeated.
These changes will help with creation of liblzma.pc.
CMakeLists.txt | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
commit 4083c8e9501a48934a5fb563d2c3ce2ae143cd27
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-29 20:46:11 +0300
liblzma: Add Cflags.private to liblzma.pc.in for MSYS2.
It properly adds -DLZMA_API_STATIC when compiling code that
will be linked against static liblzma. Having it there on
systems other than Windows does no harm.
See: https://www.msys2.org/docs/pkgconfig/
src/liblzma/liblzma.pc.in | 1 +
1 file changed, 1 insertion(+)
commit 661549ecb7a9b136d72a01c137d9776c75d52d51
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-27 22:46:20 +0300
CMake: Create liblzma.def when building liblzma.dll with MinGW-w64.
CMakeLists.txt | 20 ++++++++++++++++++++
cmake/remove-ordinals.cmake | 26 ++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
commit 0e546eb4da05c52b7d257e5bd85e15c51c4d86a3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-26 21:44:42 +0300
CMake: Change one CMAKE_CURRENT_SOURCE_DIR to CMAKE_CURRENT_LIST_DIR.
In this case they have identical values.
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit da4d04e4d6e199d28b58bd2e0df4e120c52dd5d7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-01 19:10:57 +0300
CMake/Windows: Fix the import library filename.
Both PREFIX and IMPORT_PERFIX have to be set to "" to get
liblzma.dll and liblzma.dll.a.
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
commit 007558a358c48a0175cc8d47d11798d7967282ab
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-11 19:47:44 +0300
CMake: Don't shadow the cache entry ENABLE_THREADS with a normal variable.
Using set(ENABLE_THREADS "posix") is confusing because it sets
a new normal variable and leaves the cache entry with the same
name unchanged. The intent wasn't to change the cache entry so
this switches to a different variable name.
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
commit 7d01de67ee3dd76cfc12c23220e2e4cdc59708f1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-09 21:12:31 +0300
CMake: Edit threading related messages.
It's mostly to change from "thread method" to "threading method".
CMakeLists.txt | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
commit f8edcf3da689aad4b21e139197725450f2c456a0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-09 20:59:24 +0300
CMake: Use FATAL_ERROR if user-supplied options aren't understood.
This way typos are caught quickly and compounding error messages
are avoided (a single typo could cause more than one error).
This keeps using SEND_ERROR when the system is lacking a feature
(like threading library or sandboxing method). This way the whole
configuration log will be generated in case someone wishes to
report a problem upstream.
CMakeLists.txt | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
commit 1695021e4a233a9388ddd428654c1447f0ea3bfb
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-10-19 16:09:01 +0800
CMake: Add ALLOW_CLMUL_CRC option to enable/disable CLMUL.
The option is enabled by default, but will only be visible to a user
listing cache variables or using a CMake GUI application if the
immintrin.h header file is found.
This mirrors our Autotools build --disable-clmul-crc functionality.
CMakeLists.txt | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
commit 5056bc51071d1a07097c5667a0d5bd85242e31b9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-14 17:56:59 +0300
tuklib_integer: Revise unaligned reads and writes on strict-align archs.
In XZ Utils context this doesn't matter much because
unaligned reads and writes aren't used in hot code
when TUKLIB_FAST_UNALIGNED_ACCESS isn't #defined.
src/common/tuklib_integer.h | 256 ++++++++++++++++++++++++++++++++------------
1 file changed, 189 insertions(+), 67 deletions(-)
commit 9e14743ee5ba79181076bc33952245d5b18fbc58
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-23 02:21:49 +0300
tuklib_integer: Add missing write64be and write64le fallback functions.
src/common/tuklib_integer.h | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
commit 4cc91ceb3992ef4f51302b56178c3b2c2aeaaaad
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-10-12 20:12:18 +0800
Build: Update visibility.m4 from Gnulib.
Updating from version 6 -> 8 from upstream. Declarations for variables
and function bodies were added to avoid unnecessary failures with
-Werror.
m4/visibility.m4 | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 1824a6007cb1c8d5d7abcc7bf649148bc06fa72c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-10-06 19:36:35 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 8fdc71a27d07b10a3da52432432e080b6d577642
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-09-29 20:14:39 +0800
CMake: Rename xz and man page symlink custom targets.
The Ninja Generator for CMake cannot have a custom target and its
BYPRODUCTS have the same name. This has prevented Ninja builds on
Unix-like systems since the xz symlinks were introduced in
80a1a8bb838842a2be343bd88ad1462c21c5e2c9.
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 38171492ded6426ddf53d0c200fa8c93fcd02a60
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-27 19:54:35 +0300
CMake: Fix Windows build with Clang/LLVM 17.
llvm-windres 17.0.0 has more accurate emulation of GNU windres, so
the hack for GNU windres must now be used with llvm-windres too.
LLVM 16.0.6 has the old behavior and there likely won't be more
16.x releases. So we can simply check for >= 17.0.0.
The workaround must not be used with Clang that is acting in
MSVC mode. This checks for the known environments that need
the workaround instead of using "NOT MSVC".
See also:
https://github.com/llvm/llvm-project/commit/2bcc0fdc58a220cb9921b47ec8a32c85f2511a47
CMakeLists.txt | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
commit 1bce6fe48334b5df33d0487a9cbe41950122230e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-09-27 00:02:11 +0800
liblzma: Avoid compiler warning without creating extra symbol.
When the generic fast crc64 method is used, then we omit
lzma_crc64_table[][].
The C standards don't allow an empty translation unit which can be
avoided by declaring something, without exporting any symbols.
src/liblzma/check/crc64_table.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit dce95a593e6cd9779110aa1e314abd8b35c75f6b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-26 17:24:15 +0300
Build: Update the comment about -Werror usage in checks.
configure.ac | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
commit f3c32762ae309afa2fe330e7fb397acfdedc4d37
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-26 13:51:31 +0300
Build: Fix underquoted AC_LANG_SOURCE.
It made no practical difference in this case.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7dd57f2f2c8fde93fa42b4dbf6d9860717723b41
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-26 13:14:37 +0300
Build: Silence Autoconf warning.
There was a use of AC_COMPILE_IFELSE that didn't use
AC_LANG_SOURCE and Autoconf warned about this. The omission
had been intentional but it turned out that this didn't do
what I thought it would.
Autoconf 2.71 manual gives an impression that AC_LANG_SOURCE
inserts all #defines that have been made with AC_DEFINE so
far (confdefs.h). The idea was that omitting AC_LANG_SOURCE
would mean that only the exact code included in the
AC_COMPILE_IFELSE call would be compiled.
With C programs this is not true: the #defines get added without
AC_LANG_SOURCE too. There seems to be no neat way to avoid this.
Thus, with the C language at least, adding AC_LANG_SOURCE makes
no other difference than silencing a warning from Autoconf. The
generated "configure" remains identical. (Docs of AC_LANG_CONFTEST
say that the #defines have been inserted since Autoconf 2.63b and
that AC_COMPILE_IFELSE uses AC_LANG_CONFTEST. So the behavior is
documented if one also reads the docs of macros that one isn't
calling directly.)
Any extra code, including #defines, can cause problems for
these two tests because these tests must use -Werror.
CC=clang CFLAGS=-Weverything is the most extreme example.
It enables -Wreserved-macro-identifier which warns about
It's possible to write a test file that passes -Weverything but
it becomes impossible when Autoconf inserts confdefs.h.
So this commit adds AC_LANG_SOURCE to silence Autoconf warnings.
A different solution is needed for -Werror tests.
configure.ac | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
commit edec253e418562f3164a01ecc8805295fa022efa
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-09-26 00:47:26 +0800
Build: Remove Gnulib dependency from tests.
The tests do not use any Gnulib replacements so they do not need to link
libgnu.a or have /lib in the include path.
tests/Makefile.am | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
commit 46cb133ce7360496eecca1255b364c05f0205855
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-09-26 00:43:43 +0800
CMake: Remove /lib from tests include path.
The tests never included anything from /lib, so this was not needed.
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
commit 4ae13cfe0dedb8ddc3cf9ded8cd1ac09361b3bd1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-24 16:32:32 +0300
sysdefs.h: Update the comment about __USE_MINGW_ANSI_STDIO.
src/common/sysdefs.h | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 660c8c29e57d30dbd5009ef1f0ec1bbe195ccef6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-22 02:33:29 +0300
xz: Windows: Don't (de)compress to special files like "con" or "nul".
Before this commit, the following writes "foo" to the
console and deletes the input file:
echo foo | xz > con_xz
xz --suffix=_xz --decompress con_xz
It cannot happen without --suffix because names like con.xz
are also special and so attempting to decompress con.xz
(or compress con to con.xz) will already fail when opening
the input file.
Similar thing is possible when compressing. The following
writes to "nul" and the input file "n" is deleted.
echo foo | xz > n
xz --suffix=ul n
Now xz checks if the destination is a special file before
continuing. DOS/DJGPP version had a check for this but
Windows (and OS/2) didn't.
src/xz/file_io.c | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
commit b7ce6e80786fc0c08ed129e8ee262ea96a5473a1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-21 20:42:52 +0300
CMake: Wrap two overlong lines that are possible to wrap.
CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 1595f454d5c8257c668cccd6a86dd68175d5c430
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-21 20:36:31 +0300
CMake: Add a comment about threads on Cygwin.
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
commit 5be6275f19784cdd5a954f0188045c8ff4934d54
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-12 21:12:34 +0300
CMake: Bump maximum policy version to 3.27.
There are several new policies. CMP0149 may affect the Windows SDK
version that CMake will choose by default. The new behavior is more
predictable, always choosing the latest SDK version by default.
The other new policies shouldn't affect this package.
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e515643d7524851d1eb7dab73453e26d8521324c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-08 19:08:57 +0300
Doxygen: Add more C macro names to PREDEFINED.
doxygen/Doxyfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit e3478ae4f36cd06522a2fef023860893f068434d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-11 18:47:26 +0300
liblzma: Move a few __attribute__ uses in function declarations.
The API headers have many attributes but these were left
as is for now.
src/liblzma/common/common.c | 6 ++++--
src/liblzma/common/common.h | 8 ++++----
src/liblzma/common/memcmplen.h | 3 ++-
3 files changed, 10 insertions(+), 7 deletions(-)
commit b71b8922ef3971e5ccffd1e213888d44abe21d11
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-11 19:03:35 +0300
xz, xzdec, lzmainfo: Use tuklib_attr_noreturn.
For compatibility with C23's [[noreturn]], tuklib_attr_noreturn
must be at the beginning of declaration (before "extern" or
"static", and even before any GNU C's __attribute__).
This commit also moves all other function attributes to
the beginning of function declarations. "extern" is kept
at the beginning of a line so the attributes are listed on
separate lines before "extern" or "static".
src/lzmainfo/lzmainfo.c | 6 ++++--
src/xz/coder.c | 3 ++-
src/xz/hardware.h | 3 ++-
src/xz/message.h | 30 +++++++++++++++++-------------
src/xz/options.c | 3 ++-
src/xz/util.h | 8 ++++----
src/xzdec/xzdec.c | 9 ++++++---
7 files changed, 37 insertions(+), 25 deletions(-)
commit 359e5c6cb128dab64ea6070d21d1c240f96cea6b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-11 18:53:31 +0300
Remove incorrect uses of __attribute__((__malloc__)).
xrealloc() is obviously incorrect, modern GCC docs even
mention realloc() as an example where this attribute
cannot be used.
liblzma's lzma_alloc() and lzma_alloc_zero() would be
correct uses most of the time but custom allocators
may use a memory pool or otherwise hold the pointer
so aliasing issues could happen in theory.
The xstrdup() case likely was correct but I removed it anyway.
Now there are no __malloc__ attributes left in the code.
The allocations aren't in hot paths so this should make
no practical difference.
src/liblzma/common/common.c | 4 ++--
src/liblzma/common/common.h | 4 ++--
src/xz/util.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
commit 589b4cba22fccb1dbc919df5d134aefb2b5a6b01
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-19 14:03:45 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 43728ed2267e921fbdfa699ee1e91b105ab0e98b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-14 16:35:46 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit caf00e0988ba47842cfd93dfbb17f7d30120d6e7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-09-14 16:34:07 +0300
liblzma: Mark crc64_clmul() with __attribute__((__no_sanitize_address__)).
Thanks to Agostino Sarubbo.
Fixes: https://github.com/tukaani-project/xz/issues/62
src/liblzma/check/crc64_fast.c | 8 ++++++++
1 file changed, 8 insertions(+)
commit a70e96d2da761b8b3a77bf14e08002d871e5950b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-09-12 22:36:12 +0800
CMake: Fix time.h checks not running on second CMake run.
If CMake was configured more than once, HAVE_CLOCK_GETTIME and
HAVE_CLOCK_MONOTONIC would not be set as compile definitions. The check
for librt being needed to provide HAVE_CLOCK_GETTIME was also
simplified.
CMakeLists.txt | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
commit d5275d83bd2a9701c5feb8666785007c074b1359
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-09-12 22:34:06 +0800
CMake: Fix unconditionally defining HAVE_CLOCK_MONOTONIC.
If HAVE_CLOCK_GETTIME was defined, then HAVE_CLOCK_MONOTONIC was always
added as a compile definition even if the check for it failed.
CMakeLists.txt | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
commit 1f6e7c68fbdeeaa9482fc77de090be63d90912fd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-08-31 19:50:05 +0300
xz: Refactor thousand separator detection and disable it on MSVC.
Now the two variations of the format strings are created with
a macro, and the whole detection code can be easily disabled
on platforms where thousand separator formatting is known to
not work (MSVC has no support, and on DJGPP 2.05 it can have
problems in some cases).
src/xz/util.c | 89 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 45 insertions(+), 44 deletions(-)
commit ef71f83973a20cc28a3221f85681922026ea33f5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-08-31 18:14:43 +0300
xz: Fix a too relaxed assertion and remove uses of SSIZE_MAX.
SSIZE_MAX isn't readily available on MSVC. Removing it means
that there is one thing less to worry when porting to MSVC.
src/xz/file_io.c | 5 ++---
src/xz/file_io.h | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
commit cf8ba7c3a89e37736b926dfbe85dffeff725db47
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-28 23:14:45 +0800
Tests: Improve invalid unpadded size check in test_lzma_index_append().
This check was extended to test the code added to fix a failing assert
in 68bda971bb8b666a009331455fcedb4e18d837a4.
tests/test_index.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
commit 4a4180ce74788e97e90b9aab579bfd7c6dce3f59
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-28 21:54:41 +0800
Tests: Improve comments in test_index.c.
tests/test_index.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 4b23b84b89e39a5117e16f66c3b01db4f08ed3e7
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-28 21:52:54 +0800
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 773f1e8622cb1465df528cb16a749517650acd93
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-28 21:50:16 +0800
liblzma: Update assert in vli_ceil4().
The argument to vli_ceil4() should always guarantee the return value
is also a valid lzma_vli. Thus the highest three valid lzma_vli values
are invalid arguments. All uses of the function ensure this so the
assert is updated to match this.
src/liblzma/common/index.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 68bda971bb8b666a009331455fcedb4e18d837a4
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-28 21:31:25 +0800
liblzma: Add overflow check for Unpadded size in lzma_index_append().
This was not a security bug since there was no path to overflow
UINT64_MAX in lzma_index_append() or when it calls index_file_size().
The bug was discovered by a failing assert() in vli_ceil4() when called
from index_file_size() when unpadded_sum (the sum of the compressed size
of current Stream and the unpadded_size parameter) exceeds LZMA_VLI_MAX.
Previously, the unpadded_size parameter was checked to be not greater
than UNPADDED_SIZE_MAX, but no check was done once compressed_base was
added.
This could not have caused an integer overflow in index_file_size() when
called by lzma_index_append(). The calculation for file_size breaks down
into the sum of:
- Compressed base from all previous Streams
- 2 * LZMA_STREAM_HEADER_SIZE (size of the current Streams header and
footer)
- stream_padding (can be set by lzma_index_stream_padding())
- Compressed base from the current Stream
- Unpadded size (parameter to lzma_index_append())
The sum of everything except for Unpadded size must be less than
LZMA_VLI_MAX. This is guarenteed by overflow checks in the functions
that can set these values including lzma_index_stream_padding(),
lzma_index_append(), and lzma_index_cat(). The maximum value for
Unpadded size is enforced by lzma_index_append() to be less than or
equal UNPADDED_SIZE_MAX. Thus, the sum cannot exceed UINT64_MAX since
LZMA_VLI_MAX is half of UINT64_MAX.
Thanks to Joona Kannisto for reporting this.
src/liblzma/common/index.c | 6 ++++++
1 file changed, 6 insertions(+)
commit b41bb79c602481d7ea93d65f5b3e3f08dc54233b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-28 22:18:29 +0800
Translations: Update the Esperanto translation.
po/eo.po | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
commit 6614e6d4bf8e2b5af6eb73930148e0ffc8d2265a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-09 20:55:36 +0800
Docs: Update INSTALL for --enable-threads method win95.
The Autotools build allows win95 threads and --enable-small together now
if the compiler supports __attribute__((__constructor__)).
INSTALL | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit bfb623ad96fa6f1dbc0c560403c4296e3c8e26c9
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-09 20:54:15 +0800
CMake: Conditionally allow win95 threads and --enable-small.
CMakeLists.txt | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
commit e919ebb29ac9f5270cd7176a39d0d3b4cea875a9
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-09 20:35:16 +0800
Build: Conditionally allow win95 threads and --enable-small.
When the compiler supports __attribute__((__constructor__))
mythread_once() is never used, even with --enable-small. A configuration
with win95 threads and --enable-small will compile and be thread safe so
it can be allowed.
This isn't a very common configuration since MSVC does not support
__attribute__((__constructor__)), but MINGW32 and CLANG32 environments
for MSYS2 can use win95 threads and have
__attribute__((__constructor__)) support.
configure.ac | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
commit c0c0cd4a483a672b66a13761583bc4f84d86d501
Author: Jamaika1 <lukaszcz18@wp.pl>
Date: 2023-08-08 14:07:59 +0200
mythread.h: Fix typo error in Vista threads mythread_once().
The "once_" variable was accidentally referred to as just "once". This
prevented building with Vista threads when
HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR was not defined.
src/common/mythread.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d93fbefcc48a8737fdf5678ce66d1c1d605752a0
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-03 20:10:21 +0800
Tests: Style fixes to test_lzip_decoder.c.
tests/test_lzip_decoder.c | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
commit 65981d8e45741fd1502e007609469e1d60312e69
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-03 15:56:20 +0800
Translations: Update the Chinese (simplified) translation.
po/zh_CN.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a108ed589171d683c34238a87e358b87f69e39a0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-08-02 17:15:12 +0300
xz: Omit an empty paragraph on the man page.
src/xz/xz.1 | 1 -
1 file changed, 1 deletion(-)
commit 03c51c5c08fe3579d8bbc8eea8251a1128001330
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-02 20:32:20 +0800
Bump version and soname for 5.4.4.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit d7fa3f1b58a77f79b1a4e12452418b5555632e18
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-08-02 20:30:07 +0800
Add NEWS for 5.4.4.
NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
commit 6a1093c0004c42eeaef312456c295671496dd67a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-08-02 15:19:43 +0300
build-aux/manconv.sh: Fix US-ASCII and UTF-8 output.
groff defaults to SGR escapes. Using -P-c passes -c to grotty
which restores the old behavior. Perhaps there is a better way to
get pure plain text output but this works for now.
build-aux/manconv.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f6f9f5651a7e2d89f588981533155ab850e063f7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-08-01 19:10:43 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 0dd83ba8767dad722e0f0f94e0e4146e290a28cb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-08-01 18:22:24 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 4170a80785cc69edfc5fdfe498bed5f40db6a7ef
Author: ChanTsune <41658782+ChanTsune@users.noreply.github.com>
Date: 2023-08-01 18:17:17 +0300
mythread.h: Disable signal functions in builds targeting Wasm + WASI.
signal.h in WASI SDK doesn't currently provide sigprocmask()
or sigset_t. liblzma doesn't need them so this change makes
liblzma and xzdec build against WASI SDK. xz doesn't build yet
and the tests don't either as tuktest needs setjmp() which
isn't (yet?) implemented in WASI SDK.
Closes: https://github.com/tukaani-project/xz/pull/57
See also: https://github.com/tukaani-project/xz/pull/56
(The original commit was edited a little by Lasse Collin.)
src/common/mythread.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0db6fbe0be1545a4f25fcd6993371155b37bbb26
Author: Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: 2023-07-31 14:02:21 +0200
Docs: Fix typos found by codespell
CMakeLists.txt | 4 ++--
NEWS | 2 +-
configure.ac | 2 +-
src/liblzma/api/lzma/container.h | 4 ++--
src/liblzma/api/lzma/filter.h | 2 +-
src/liblzma/api/lzma/lzma12.h | 4 ++--
src/liblzma/common/block_buffer_encoder.c | 2 +-
src/liblzma/common/common.h | 2 +-
src/liblzma/common/file_info.c | 2 +-
src/liblzma/common/lzip_decoder.c | 2 +-
src/liblzma/common/stream_decoder_mt.c | 8 ++++----
src/liblzma/common/string_conversion.c | 6 +++---
src/liblzma/lz/lz_encoder.h | 2 +-
src/liblzma/lzma/lzma_encoder.c | 4 ++--
src/xz/hardware.c | 4 ++--
tests/test_filter_flags.c | 4 ++--
tests/test_index.c | 2 +-
tests/test_vli.c | 2 +-
18 files changed, 29 insertions(+), 29 deletions(-)
commit 84a3a1f4e4f146b3b5fa73fe708cacb0d9f829f3
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-26 20:26:23 +0800
Update .gitignore.
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit 962b3d41e0c27355ba3052ef7b7d9a887de807e5
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-28 22:03:08 +0800
CMake: Conditionally allow the creation of broken symlinks.
The CMake build will try to create broken symlinks on Unix and Unix-like
platforms. Cygwin and MSYS2 are Unix-like, but may not be able to create
broken symlinks. The value of the CYGWIN or MSYS environment variables
determine if broken symlinks are valid.
The default for MSYS2 does not allow for broken symlinks, so the CMake
build has been broken for MSYS2 since commit
80a1a8bb838842a2be343bd88ad1462c21c5e2c9.
CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 75 insertions(+), 7 deletions(-)
commit 19899340cf74d98304f9f5b726c72e85c7017d72
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-24 21:43:44 +0800
liblzma: Prevent an empty translation unit in Windows builds.
To workaround Automake lacking Windows resource compiler support, an
empty source file is compiled to overwrite the resource files for static
library builds. Translation units without an external declaration are
not allowed by the C standard and result in a warning when used with
-Wempty-translation-unit (Clang) or -pedantic (GCC).
src/liblzma/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit ef7fbe83937abd7f55f1637c1d08b559f1d3d6cc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-21 18:05:44 +0800
Tests: Skip .lz files in test_files.sh if not configured.
Previously if the lzip decoder was not configured then test_files.sh
would pass the lzip tests instead of skipping them.
tests/test_files.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e49815ba7aa610b72e8724025eceee23c27e7b23
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 22:11:13 +0800
Tests: Add ARM64 filter test to test_compress.sh.
tests/test_compress.sh | 1 +
1 file changed, 1 insertion(+)
commit db5b57b827c2b084586c51da1b8a3ab0984bdb40
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-22 18:37:56 +0800
Translations: Update the Vietnamese translation.
po/vi.po | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
commit e6ba5014081c98cb068253b3e5f9e372dd157f3c
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:30:05 +0800
Translations: Update the Croatian translation.
po/hr.po | 49 ++++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 19 deletions(-)
commit 82657a1f10a25050a3e9c246c41deb785cccba3a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:28:32 +0800
Translations: Update the Korean man page translations.
po4a/ko.po | 1255 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 629 insertions(+), 626 deletions(-)
commit fab35907d13efbe7c457e00a310123335d7bae3e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:25:24 +0800
Translations: Update the Korean translation.
po/ko.po | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
commit f530fe1964c34797fa3b775ec5804d68007c1579
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:24:05 +0800
Translations: Update the Polish translation.
po/pl.po | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
commit 10b3500cc2617aabdbc802a63164ce0a3683ad2b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:22:23 +0800
Translations: Update the German man page translations.
po4a/de.po | 1255 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 629 insertions(+), 626 deletions(-)
commit 3d14e8a34dba176f975326924ae28a3ab5fee165
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:18:44 +0800
Translations: Update the German translation.
po/de.po | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
commit bdcc180a2da15039c47455c1cafd1ce9aff442e4
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:17:10 +0800
Translations: Update the Chinese (simplified) translation.
po/zh_CN.po | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
commit 844240350d33cb46ba8827b74dc8758e2abed9e5
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:15:47 +0800
Translations: Update the Swedish translation.
po/sv.po | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
commit bdc7952bcfbc20c134f723ff5cbf84ab690fb4fc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:14:00 +0800
Translations: Update the Ukrainian man page translations.
po4a/uk.po | 1253 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 628 insertions(+), 625 deletions(-)
commit 143396e070c8d8afb56e3a5f688b214222cf71e0
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:09:15 +0800
Translations: Update the Ukrainian translation.
po/uk.po | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
commit 1b8146d64eaac51b40079f5788b85c1eb79e35de
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:06:57 +0800
Translations: Update the Spanish translation.
po/es.po | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
commit f947ce09d79ef8fa6549d350c4d72e4a8a9fa697
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:05:19 +0800
Translations: Update the Romanian translation.
po/ro.po | 48 ++++++++++++++++++++++++++++++------------------
1 file changed, 30 insertions(+), 18 deletions(-)
commit f681301a368def3f597a7c7bea7cb3f7a2f933e7
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-20 20:02:56 +0800
Translations: Update the Romanian man page translations.
po4a/ro.po | 1254 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 629 insertions(+), 625 deletions(-)
commit 8bc3146c6be920b56283f4ee846456cb34ae4b6f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-13 21:26:47 +0800
xz: Update man page Authors and date.
src/xz/xz.1 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit c2905540ef905412b54c76488758712d3e2a0f9d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-18 23:19:09 +0800
xz: Slight reword in xz man page for consistency.
Changed will print => prints in xz --robot --version description to
match --robot --info-memory description.
src/xz/xz.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2600d3352449faf57d9cb3fa00cbe40548a1310f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-18 22:49:57 +0800
liblzma: Improve comment in string_conversion.c.
The comment used "flag" when referring to decoder options. Just
referring to them as options is more clear and consistent.
src/liblzma/common/string_conversion.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 98fc14541eec3e1dcf694075c8533f19a3cee552
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-13 21:21:54 +0800
liblzma: Reword lzma_str_list_filters() documentation.
Reword "options required" to "options read". The previous wording
may have suggested that the options listed were all required when
the filters are used for encoding or decoding. Now it should be
more clear that the options listed are the ones relevant for
encoding or decoding.
src/liblzma/api/lzma/filter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1ac79b4cbaecf3f4930a5d8ce6f7e1f2b63c2a01
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-07-18 17:37:33 +0300
xz: Translate the second "%s: " in message.c since French needs "%s : ".
This string is used to print a filename when using "xz -v" and
stderr isn't a terminal.
src/xz/message.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 97851be2c6c64494f23c3a735601c13d4387820b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-07-18 14:35:33 +0300
xz: Make "%s: %s" translatable because French needs "%s : %s".
src/xz/args.c | 5 ++++-
src/xz/coder.c | 8 ++++----
src/xz/file_io.c | 8 ++++----
src/xz/list.c | 11 ++++++-----
4 files changed, 18 insertions(+), 14 deletions(-)
commit b406828a6dfd3caa4f77efe3ff3e3eea263eee62
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-07-18 13:57:54 +0300
liblzma: Tweak #if condition in memcmplen.h.
Maybe ICC always #defines _MSC_VER on Windows but now
it's very clear which code will get used.
src/liblzma/common/memcmplen.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ef4a07ad9434f81417395f6fe0bb331e027a703b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-07-18 13:49:43 +0300
liblzma: Omit unnecessary parenthesis in a preprocessor directive.
src/liblzma/common/memcmplen.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 64ee0caaea06654b28afaee850fb187a11bf9cb2
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-06-28 20:22:38 +0800
liblzma: Prevent warning for MSYS2 Windows build.
In lzma_memcmplen(), the <intrin.h> header file is only included if
_MSC_VER and _M_X64 are both defined but _BitScanForward64() was
previously used if _M_X64 was defined. GCC for MSYS2 defines _M_X64 but
not _MSC_VER so _BitScanForward64() was used without including
<intrin.h>.
Now, lzma_memcmplen() will use __builtin_ctzll() for MSYS2 GCC builds as
expected.
src/liblzma/common/memcmplen.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit ba177057643dae6e9c167ee26471181c199c8a00
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-14 23:20:33 +0800
Docs: Add a new section to INSTALL for Tests.
The new Tests section describes basic information about the tests, how
to run them, and important details when cross compiling. We have had a
few questions about how to compile the tests without running them, so
hopefully this information will help others with the same question in the
future.
Fixes: https://github.com/tukaani-project/xz/issues/54
INSTALL | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 64 insertions(+), 17 deletions(-)
commit 0745b900fafa5ac2c31e8ec3cfba3053457c8b1f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-14 21:10:27 +0800
Docs: Update README.
This adds an entry to "Other implementations of the .xz format" for
XZ for Java.
README | 4 ++++
1 file changed, 4 insertions(+)
commit c972d44103c4edf88e73917ef08bde69db9d06cb
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-18 13:27:46 +0300
xz: Fix typo in man page.
The Memory limit information section described three output
columns when it actually has six. This was reworded to
"multiple" to make it more future proof.
src/xz/xz.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6e21f1b4e2c580b64d258e3b81ac9e44d53b9283
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-14 21:30:25 +0800
Tests: Improve feature testing for skipping.
Fixed a bug where test_compress_* would all fail if arm64 or armthumb
filters were enabled for compression but arm was disabled. Since the
grep tests only checked for "define HAVE_ENCODER_ARM", this would match
on HAVE_ENCODER_ARM64 or HAVE_ENCODER_ARMTHUMB.
Now the config.h feature test requires " 1" at the end to prevent the
prefix problem. have_feature() was also updated for this even though
there were known current bugs affecting it. This is just in case future
features have a similar prefix problem.
tests/test_compress.sh | 4 ++--
tests/test_files.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 26c37d290c0884a4518a26b949575420a77fb938
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-10 20:56:28 +0800
Translations: Update the Chinese (traditional) translation.
po/zh_TW.po | 659 ++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 377 insertions(+), 282 deletions(-)
commit 2ec65181e28335692a3a4fac4fefc4303111d355
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-07-08 20:03:59 +0800
Translations: Update the Vietnamese translation.
po/vi.po | 620 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 349 insertions(+), 271 deletions(-)
commit c44c7e7590db1b89c97e106f5c516bf69189e233
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-06-28 20:46:31 +0800
Tests: Fix memory leaks in test_index.
Several tests were missing calls to lzma_index_end() to clean up the
lzma_index structs. The memory leaks were discovered by using
-fsanitize=address with GCC.
tests/test_index.c | 11 +++++++++++
1 file changed, 11 insertions(+)
commit b9499c94fccc03eba5311b5305f04149a7c5af65
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-06-28 20:43:29 +0800
Tests: Fix memory leaks in test_block_header.
test_block_header was not properly freeing the filter options between
calls to lzma_block_header_decode(). The memory leaks were discovered by
using -fsanitize=address with GCC.
tests/test_block_header.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
commit 1155471651ad456c5f90aee6435931fae65682bf
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-06-28 20:31:11 +0800
liblzma: Prevent uninitialzed warning in mt stream encoder.
This change only impacts the compiler warning since it was impossible
for the wait_abs struct in stream_encode_mt() to be used before it was
initialized since mythread_condtime_set() will always be called before
mythread_cond_timedwait().
Since the mythread.h code is different between the POSIX and
Windows versions, this warning was only present on Windows builds.
Thanks to Arthur S for reporting the warning and providing an initial
patch.
src/liblzma/common/stream_encoder_mt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 62dd1c9bf0c66679ceeebc8b99bca136ca43bcb9
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-06-07 00:10:38 +0800
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit d04eb78ab3892d3678c180437dd66379efa051fd
Author: Benjamin Buch <bebuch@users.noreply.github.com>
Date: 2023-06-06 15:32:45 +0200
CMake: Protects against double find_package
Boost iostream uses `find_package` in quiet mode and then again uses
`find_package` with required. This second call triggers a
`add_library cannot create imported target "LibLZMA::LibLZMA"
because another target with the same name already exists.`
This can simply be fixed by skipping the alias part on secondary
`find_package` runs.
CMakeLists.txt | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
commit 12ea1fb29763dd72376aca73d69621aff01eaa7f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-31 20:26:42 +0800
Translations: Update the Esperanto translation.
po/eo.po | 185 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 92 insertions(+), 93 deletions(-)
commit a4d45c07c1e4aa0ea9410b4eed7301c97e960319
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-31 20:25:00 +0800
Translations: Update the Croatian translation.
po/hr.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f51b7bcea6f948db9529b3e6d850e76a30cc0e96
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-31 20:15:53 +0800
Translations: Update the Chinese (simplified) translation.
po/zh_CN.po | 317 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 157 insertions(+), 160 deletions(-)
commit d5b81c19a7594fbb913bb3450360bc2145f29568
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-17 23:12:13 +0800
Translations: Update German translation of man pages.
po4a/de.po | 52 ++++++++++++----------------------------------------
1 file changed, 12 insertions(+), 40 deletions(-)
commit 36860a3e30d5675b4dba3a343159458d8864bceb
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-17 23:09:18 +0800
Translations: Update the German translation.
po/de.po | 189 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 94 insertions(+), 95 deletions(-)
commit f05641ef0d4990c4c58f459039d412475b94b37d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-17 20:30:01 +0800
Translations: Update the Croatian translation.
po/hr.po | 187 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 93 insertions(+), 94 deletions(-)
commit b852f6f11d43cafce871cd158c80488f86619a63
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-17 20:26:54 +0800
Translations: Update Korean translation of man pages.
po4a/ko.po | 3015 ++++++++++++------------------------------------------------
1 file changed, 568 insertions(+), 2447 deletions(-)
commit fdcb78fb6f5313eda363869690685471d7ab9731
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-17 20:13:01 +0800
Translations: Update the Korean translation.
po/ko.po | 319 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 158 insertions(+), 161 deletions(-)
commit 9e39cebe3ccdd4bc320ce6e7eea989bdd167c8b2
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 23:49:09 +0800
Translations: Update the Spanish translation.
po/es.po | 319 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 158 insertions(+), 161 deletions(-)
commit 7a578d1d8293fc1cf7c6f9df76bc6a0e55c51a14
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 23:47:23 +0800
Translations: Update the Romanian translation.
po/ro.po | 195 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 98 insertions(+), 97 deletions(-)
commit 362320fea5383bae179763763625532bad6d10e8
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 23:45:43 +0800
Translations: Update Romanian translation of man pages.
po4a/ro.po | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
commit 29c5a870be23d0a565b959404b34a8b1babef7df
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 23:43:51 +0800
Translations: Update Ukrainian translation of man pages.
po4a/uk.po | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit 5ee57572773207371712b1bbcd9b5b8c1baad2cc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 23:37:54 +0800
Translations: Update the Ukrainian translation.
po/uk.po | 321 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 159 insertions(+), 162 deletions(-)
commit dfc257bdb224780d3c8cdeca5a8e52848b9adc0a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 23:07:35 +0800
Translations: Update the Polish translation.
po/pl.po | 316 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 155 insertions(+), 161 deletions(-)
commit f6df4c4ab7378d2971ae1606f4eecc011ea5fc6d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 22:52:14 +0800
Translations: Update the Swedish translation.
po/sv.po | 319 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 158 insertions(+), 161 deletions(-)
commit 25da22e0521ec698dae4eb5e994b4cd3f4708b60
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-16 21:21:38 +0800
Translations: Update the Esperanto translation.
po/eo.po | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
commit 4f57a9c9915b7b9267885cf9fca58e5c8208458d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-11 23:49:23 +0800
liblzma: Adds lzma_nothrow to MicroLZMA API functions.
None of the liblzma functions may throw an exception, so this
attribute should be applied to all liblzma API functions.
src/liblzma/api/lzma/container.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 238b4e5458b4bd2cadefb768b8ea7c6b70a191ac
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-04 20:38:52 +0800
Translations: Update the Croatian translation.
po/hr.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 0cee63c3c6c4f9084a5e7fa7c15a1863ac8e5ffc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-04 19:50:42 +0800
Bump version and soname for 5.4.3.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 01f937ea9a49005c5091c0165fa0c1e572dd1749
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-05-02 20:39:56 +0800
Add NEWS for 5.4.3.
NEWS | 10 ++++++++++
1 file changed, 10 insertions(+)
commit e9b9ea953179502d5245b4e6ca4f5ffe9d5797b1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-05-03 22:46:42 +0300
tuklib_integer.h: Fix a recent copypaste error in Clang detection.
Wrong line was changed in 7062348bf35c1e4cbfee00ad9fffb4a21aa6eff7.
Also, this has >= instead of == since ints larger than 32 bits would
work too even if not relevant in practice.
src/common/tuklib_integer.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit be6e39a8622f0d905072874ec25b1ffd155b12e1
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-04-20 20:15:00 +0800
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 9e343a46cf87a345799222c0b0b3a6f3358dde0c
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-04-19 22:22:16 +0800
Windows: Include <intrin.h> when needed.
Legacy Windows did not need to #include <intrin.h> to use the MSVC
intrinsics. Newer versions likely just issue a warning, but the MSVC
documentation says to include the header file for the intrinsics we use.
GCC and Clang can "pretend" to be MSVC on Windows, so extra checks are
needed in tuklib_integer.h to only include <intrin.h> when it will is
actually needed.
src/common/tuklib_integer.h | 6 ++++++
src/liblzma/common/memcmplen.h | 10 ++++++++++
2 files changed, 16 insertions(+)
commit 12321a9390acc076b414035a46df9d7545ac379f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-04-19 21:59:03 +0800
tuklib_integer: Use __builtin_clz() with Clang.
Clang has support for __builtin_clz(), but previously Clang would
fallback to either the MSVC intrinsic or the regular C code. This was
discovered due to a bug where a new version of Clang required the
<intrin.h> header file in order to use the MSVC intrinsics.
Thanks to Anton Kochkov for notifying us about the bug.
src/common/tuklib_integer.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit d1f0e01c395960efd6c29ff144eda4f4c8c1c6d3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-04-14 18:42:33 +0300
liblzma: Update project maintainers in lzma.h.
AUTHORS was updated earlier, lzma.h was simply forgotten.
src/liblzma/api/lzma.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8204c5d1304e1e3b7487801b4acaf8e3179a6c52
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-04-13 20:45:19 +0800
liblzma: Cleans up old commented out code.
src/liblzma/common/alone_encoder.c | 11 -----------
1 file changed, 11 deletions(-)
commit 32980d1562bc031013306be1c787761fa63da87d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-28 22:32:40 +0800
CMake: Update liblzma-config.cmake generation.
Now that the threading is configurable, the liblzma CMake package only
needs the threading library when using POSIX threads.
CMakeLists.txt | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
commit 023907faa965476fb921a6344253c50e0ba795f9
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-28 22:25:33 +0800
CMake: Allows setting thread method.
The thread method is now configurable for the CMake build. It matches
the Autotools build by allowing ON (pick the best threading method),
OFF (no threading), posix, win95, and vista. If both Windows and
posix threading are both available, then ON will choose Windows
threading. Windows threading will also not use:
target_link_libraries(liblzma Threads::Threads)
since on systems like MinGW-w64 it would link the posix threads
without purpose.
CMakeLists.txt | 144 +++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 104 insertions(+), 40 deletions(-)
commit ba176d77cbb164b13006516660fc1ff6c59dedb5
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-24 20:05:59 +0800
CMake: Only build xzdec if decoders are enabled.
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c99d697df800e9bc47e09facf88bcfdb9e0264a5
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-22 15:42:04 +0800
Build: Removes redundant check for LZMA1 filter support.
src/liblzma/lzma/Makefile.inc | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
commit 54a2fd8c850e626343b79c4cc8fcac2f638ec890
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-23 15:14:29 +0200
CMake: Bump maximum policy version to 3.26.
It adds only one new policy related to FOLDERS which we don't use.
This makes it clear that the code is compatible with the policies
up to 3.26.
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 622d0fdc02d5f565c2872d79bc70c669c95c8284
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-21 23:36:00 +0800
CMake: Conditionally build xz list.* files if decoders are enabled.
CMakeLists.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 3e2dc523c596cd770a6a7c58cacc0d0d8761e853
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-25 11:46:50 +0800
CMake: Allow configuring features as cache variables.
This allows users to change the features they build either in
CMakeCache.txt or by using a CMake GUI. The sources built for
liblzma are affected by this too, so only the necessary files
will be compiled.
CMakeLists.txt | 528 ++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 391 insertions(+), 137 deletions(-)
commit 0c053f97337fa4ead77acefb577e8e86f8ef388d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-21 14:07:51 +0200
Build: Add a comment that AC_PROG_CC_C99 is needed for Autoconf 2.69.
It's obsolete in Autoconf >= 2.70 and just an alias for AC_PROG_CC
but Autoconf 2.69 requires AC_PROG_CC_C99 to get a C99 compiler.
configure.ac | 3 +++
1 file changed, 3 insertions(+)
commit 915d4f6058d52f84d2b58b0a5f3c8272eaa6c1bd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-21 14:04:37 +0200
Build: configure.ac: Use AS_IF and AS_CASE where required.
This makes no functional difference in the generated configure
(at least with the Autotools versions I have installed) but this
change might prevent future bugs like the one that was just
fixed in the commit 5a5bd7f871818029d5ccbe189f087f591258c294.
configure.ac | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
commit b848c039586ed2cddb6fb033680dac107cc5143f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-21 13:12:03 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit c775ba1602a74f29dbc2088bbe4d02c23fc32ba1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-21 13:11:49 +0200
Build: Fix --disable-threads breaking the building of shared libs.
This is broken in the releases 5.2.6 to 5.4.2. A workaround
for these releases is to pass EGREP='grep -E' as an argument
to configure in addition to --disable-threads.
The problem appeared when m4/ax_pthread.m4 was updated in
the commit 6629ed929cc7d45a11e385f357ab58ec15e7e4ad which
introduced the use of AC_EGREP_CPP. AC_EGREP_CPP calls
AC_REQUIRE([AC_PROG_EGREP]) to set the shell variable EGREP
but this was only executed if POSIX threads were enabled.
Libtool code also has AC_REQUIRE([AC_PROG_EGREP]) but Autoconf
omits it as AC_PROG_EGREP has already been required earlier.
Thus, if not using POSIX threads, the shell variable EGREP
would be undefined in the Libtool code in configure.
ax_pthread.m4 is fine. The bug was in configure.ac which called
AX_PTHREAD conditionally in an incorrect way. Using AS_CASE
ensures that all AC_REQUIREs get always run.
Thanks to Frank Busse for reporting the bug.
Fixes: https://github.com/tukaani-project/xz/issues/45
configure.ac | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit 0673c9ec98b6bae12b33dc295564514aaa26e2fc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-19 22:45:59 +0200
liblzma: Silence -Wsign-conversion in SSE2 code in memcmplen.h.
Thanks to Christian Hesse for reporting the issue.
Fixes: https://github.com/tukaani-project/xz/issues/44
src/liblzma/common/memcmplen.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 6ca8046ecbc7a1c81ee08f544bfd1414819fb2e8
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-18 23:22:06 +0800
Bump version and soname for 5.4.2.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit ce4f246600db10e77fc93d492ea045b4c9830bc6
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-18 22:10:57 +0800
Add NEWS for 5.4.2.
NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
commit 3634fe330788fc0df217acdb6581031a851600a3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-18 16:00:54 +0200
Update the copy of GNU GPLv3 from gnu.org to COPYING.GPLv3.
COPYING.GPLv3 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 97679d25ce7cb014328f1455bb338903c003d54f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-18 15:51:57 +0200
Change a few HTTP URLs to HTTPS.
The xz man page timestamp was intentionally left unchanged.
INSTALL | 2 +-
README | 8 ++++----
configure.ac | 2 +-
dos/INSTALL.txt | 4 ++--
src/liblzma/api/lzma.h | 8 ++++----
src/liblzma/check/sha256.c | 2 +-
src/xz/xz.1 | 2 +-
windows/INSTALL-MinGW.txt | 10 +++++-----
8 files changed, 19 insertions(+), 19 deletions(-)
commit 01a67e89a56c3ebf5f6681bd06f0edc22a1ae594
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-18 00:40:28 +0800
CMake: Fix typo in a comment.
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5dca3f5cbab31105196c89cd6df0a9bbc3307c05
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-17 18:36:22 +0200
Windows: build.bash: Copy liblzma API docs to the output package.
windows/build.bash | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit ae252862b30b509ab88b2bbcaa08e8d51b57e928
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-17 08:53:38 +0200
Windows: Add microlzma_*.c to the VS project files.
These should have been included in 5.3.2alpha already.
windows/vs2013/liblzma.vcxproj | 2 ++
windows/vs2013/liblzma_dll.vcxproj | 2 ++
windows/vs2017/liblzma.vcxproj | 2 ++
windows/vs2017/liblzma_dll.vcxproj | 2 ++
windows/vs2019/liblzma.vcxproj | 2 ++
windows/vs2019/liblzma_dll.vcxproj | 2 ++
6 files changed, 12 insertions(+)
commit 147d282cc3733e2723df82622b6540ddfb52635e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-17 08:43:51 +0200
CMake: Add microlzma_*.c to the build.
These should have been included in 5.3.2alpha already.
CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
commit 4523a5ee29f45c0256af67a15771bc8bbd25ba53
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-17 08:41:36 +0200
Build: Update comments about unaligned access to mention 64-bit.
cmake/tuklib_integer.cmake | 7 +++----
m4/tuklib_integer.m4 | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
commit 82aacb40367dc580b09c5a7b270f6c98b63e49b9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-17 00:02:30 +0200
Tests: Update .gitignore.
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 5d022c24921eec938604a8cb10d70aa08dbd8575
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-14 20:04:03 +0200
po4a/update-po: Display the script name consistently in error messages.
po4a/update-po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 896295117324f323c0b8db6a31ad6ebfaa88793d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-17 01:30:36 +0800
Doc: Rename Doxygen HTML doc directory name liblzma => api.
When the docs are installed, calling the directory "liblzma" is
confusing since multiple other files in the doc directory are for
liblzma. This should also make it more natural for distros when they
package the documentation.
.gitignore | 2 +-
Makefile.am | 18 +++++++++---------
PACKAGERS | 4 ++--
doxygen/Doxyfile | 2 +-
doxygen/update-doxygen | 18 +++++++++---------
5 files changed, 22 insertions(+), 22 deletions(-)
commit 94097157fae308b2c1a5edb4e8597c68b45eeaea
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-16 22:07:15 +0800
liblzma: Remove note from lzma_options_bcj about the ARM64 exception.
This was left in by mistake since an early version of the ARM64 filter
used a different struct for its options.
src/liblzma/api/lzma/bcj.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit da16d0b73b79d7785ece6f78a577fadd1fb59d0e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-15 19:19:13 +0200
COPYING: Add a note about the included Doxygen-generated HTML.
COPYING | 11 +++++++++++
1 file changed, 11 insertions(+)
commit e57c74f9ef19201f72c106f2c347596f40229936
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-16 21:41:09 +0800
Doc: Update PACKAGERS with details about liblzma API docs install.
PACKAGERS | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
commit 7e2fa48bb73edb25457232e2e62a4f81c6b95281
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-16 21:38:32 +0800
liblzma: Add set lzma.h as the main page for Doxygen documentation.
The \mainpage command is used in the first block of comments in lzma.h.
This changes the previously nearly empty index.html to use the first
comment block in lzma.h for its contents.
lzma.h is no longer documented separately, but this is for the better
since lzma.h only defined a few macros that users do not need to use.
The individual API header files all have a disclaimer that they should
not be #included directly, so there should be no confusion on the fact
that lzma.h should be the only header used by applications.
Additionally, the note "See ../lzma.h for information about liblzma as
a whole." was removed since lzma.h is now the main page of the
generated HTML and does not have its own page anymore. So it would be
confusing in the HTML version and was only a "nice to have" when
browsing the source files.
src/liblzma/api/lzma.h | 1 +
src/liblzma/api/lzma/base.h | 2 --
src/liblzma/api/lzma/bcj.h | 2 --
src/liblzma/api/lzma/block.h | 2 --
src/liblzma/api/lzma/check.h | 2 --
src/liblzma/api/lzma/container.h | 2 --
src/liblzma/api/lzma/delta.h | 2 --
src/liblzma/api/lzma/filter.h | 2 --
src/liblzma/api/lzma/hardware.h | 2 --
src/liblzma/api/lzma/index.h | 2 --
src/liblzma/api/lzma/index_hash.h | 4 +---
src/liblzma/api/lzma/lzma12.h | 2 --
src/liblzma/api/lzma/stream_flags.h | 2 --
src/liblzma/api/lzma/version.h | 2 --
src/liblzma/api/lzma/vli.h | 2 --
15 files changed, 2 insertions(+), 29 deletions(-)
commit d42977c7acfdf7fd9acc8803cf411eca7dc10478
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-16 21:37:32 +0800
Build: Generate doxygen documentation in autogen.sh.
Another command line option (--no-doxygen) was added to disable
creating the doxygen documenation in cases where it not wanted or
if the doxygen tool is not installed.
autogen.sh | 35 +++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
commit 8fc712fcf41d821069c670f22b8bf628e7a4a877
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-16 21:35:55 +0800
Build: Create doxygen/update-doxygen script.
This is a helper script to generate the Doxygen documentation. It can be
run in 'liblzma' or 'internal' mode by setting the first argument. It
will default to 'liblzma' mode and only generate documentation for the
liblzma API header files.
The helper script will be run during the custom mydist hook when we
create releases. This hook already alters the source directory, so its
fine to do it here too. This way, we can include the Doxygen generated
files in the distrubtion and when installing.
In 'liblzma' mode, the JavaScript is stripped from the .html files and
the .js files are removed. This avoids license hassle from jQuery and
other libraries that Doxygen 1.9.6 puts into jquery.js in minified form.
Makefile.am | 1 +
doxygen/update-doxygen | 111 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+)
commit 77d2c025d19fbac7277c63239cfb1338f02c66c0
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-03-16 21:34:36 +0800
Build: Install Doxygen docs and include in distribution if generated.
Added a install-data-local target to install the Doxygen documentation
only when it has been generated. In order to correctly remove the docs,
a corresponding uninstall-local target was added.
If the doxygen docs exist in the source tree, they will also be included
in the distribution now too.
Makefile.am | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 9af8f6f947a43974a4ff025f4c896f2fb4c91b4f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-03 20:37:30 +0800
Doxygen: Refactor Doxyfile.in to doxygen/Doxyfile.
Instead of having Doxyfile.in configured by Autoconf, the Doxyfile
can have the tags that need to be configured piped into the doxygen
command through stdin with the overrides after Doxyfile's contents.
Going forward, the documentation should be generated in two different
modes: liblzma or internal.
liblzma is useful for most users. It is the documentation for just
the liblzma API header files. This is the default.
internal is for people who want to understand how xz and liblzma work.
It might be useful for people who want to contribute to the project.
.gitignore | 3 +-
Doxyfile.in | 1234 -------------------------
Makefile.am | 1 -
configure.ac | 1 -
doxygen/Doxyfile | 2684 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 2686 insertions(+), 1237 deletions(-)
commit 1c558a26928b753fcf1c0d4bce9c0643285edd86
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-28 23:22:36 +0800
Tests: Remove unused macros and functions.
tests/tests.h | 75 -----------------------------------------------------------
1 file changed, 75 deletions(-)
commit 7479a69a45a1b8fdb9a209e11f247dce11ac1ba0
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-12 22:29:07 +0800
Tests: Refactors existing lzma_index tests.
Converts the existing lzma_index tests into tuktests and covers every
API function from index.h except for lzma_file_info_decoder, which can
be tested in the future.
tests/test_index.c | 2036 ++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 1492 insertions(+), 544 deletions(-)
commit fd56d5353360279c10e8e5e05f5bc6ea03f64584
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-07 19:59:23 +0200
xz: Make Capsicum sandbox more strict with stdin and stdout.
src/xz/file_io.c | 8 ++++++++
1 file changed, 8 insertions(+)
commit d1bdaaebc68cae7f0ba457fa990b520df2186fd1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-03-11 19:31:40 +0200
xz: Don't fail if Capsicum is enabled but kernel doesn't support it.
(This commit combines related commits from the master branch.)
If Capsicum support is missing from the kernel or xz is being run
in an emulator that lacks Capsicum suport, the syscalls will fail
and set errno to ENOSYS. Previously xz would display and error and
exit, making xz unusable. Now it will check for ENOSYS and run
without sandbox support. Other tools like ssh behave similarly.
Displaying a warning for missing Capsicum support was considered
but such extra output would quickly become annoying. It would also
break test_scripts.sh in "make check".
Also move cap_enter() to be the first step instead of the last one.
This matches the example in the cap_rights_limit(2) man page. With
the current code it shouldn't make any practical difference though.
Thanks to Xin Li for the bug report, suggesting a fix, and testing:
https://github.com/tukaani-project/xz/pull/43
Thanks to Jia Tan for most of the original commits.
src/xz/file_io.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
commit 5d351c69c19d212ddd2cf1f3bdb24900820c6776
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-04 21:06:35 +0800
Build: Adjust CMake version search regex.
Now, the LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, and LZMA_VERSION_PATCH
macros do not need to be on consecutive lines in version.h. They can be
separated by more whitespace, comments, or even other content, as long
as they appear in the proper order (major, minor, patch).
CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
commit b82d4831e3f2339c4cdbc47776c99462088c11b7
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-26 09:50:21 +0800
liblzma: Improve documentation for version.h.
Specified parameter and return values for API functions and documented
a few more of the macros.
src/liblzma/api/lzma/version.h | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
commit 2caba3efe3e0c2d7c6dca00e22c56812326a34e6
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-24 23:46:23 +0800
liblzma: Clarify lzma_lzma_preset() documentation in lzma12.h.
lzma_lzma_preset() does not guarentee that the lzma_options_lzma are
usable in an encoder even if it returns false (success). If liblzma
is built with default configurations, then the options will always be
usable. However if the match finders hc3, hc4, or bt4 are disabled, then
the options may not be usable depending on the preset level requested.
The documentation was updated to reflect this complexity, since this
behavior was unclear before.
src/liblzma/api/lzma/lzma12.h | 5 +++++
1 file changed, 5 insertions(+)
commit 594f904673ba55a833adfa60bbab6b60d4902d08
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-27 18:38:35 +0200
CMake: Require that the C compiler supports C99 or a newer standard.
Thanks to autoantwort for reporting the issue and suggesting
a different patch:
https://github.com/tukaani-project/xz/pull/42
CMakeLists.txt | 8 ++++++++
1 file changed, 8 insertions(+)
commit 88101143cb774bca6b7006c8335b09dc3f334140
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-24 18:10:37 +0800
Tests: Small tweak to test-vli.c.
The static global variables can be disabled if encoders and decoders
are not built. If they are not disabled and -Werror is used, it will
cause an usused warning as an error.
tests/test_vli.c | 2 ++
1 file changed, 2 insertions(+)
commit 4042dbf03a06e019ccdd1e9d1b94cf613d62d5a9
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-06 21:46:43 +0800
liblzma: Replace '\n' -> newline in filter.h documentation.
The '\n' renders as a newline when the comments are converted to html
by Doxygen.
src/liblzma/api/lzma/filter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3971f5c5024750ce8286891c6f79ae1661047483
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-06 21:45:37 +0800
liblzma: Shorten return description for two functions in filter.h.
Shorten the description for lzma_raw_encoder_memusage() and
lzma_raw_decoder_memusage().
src/liblzma/api/lzma/filter.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
commit 5e61b39432752b6cd1a7b518f0f9e4f0c3f0f242
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-06 21:44:45 +0800
liblzma: Reword a few lines in filter.h
src/liblzma/api/lzma/filter.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 8a53533869defa1191b41f176a0312cb53a139e2
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-06 21:35:06 +0800
liblzma: Improve documentation in filter.h.
All functions now explicitly specify parameter and return values.
The notes and code annotations were moved before the parameter and
return value descriptions for consistency.
Also, the description above lzma_filter_encoder_is_supported() about
not being able to list available filters was removed since
lzma_str_list_filters() will do this.
src/liblzma/api/lzma/filter.h | 226 ++++++++++++++++++++++++++----------------
1 file changed, 143 insertions(+), 83 deletions(-)
commit 6d05b08b17ac8cb93165ee8f310fdd925b0b258f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-23 20:46:16 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit dfc9a54082e0fc7b3b796ea15336b5075acc79d5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-21 22:57:10 +0200
liblzma: Avoid null pointer + 0 (undefined behavior in C).
In the C99 and C17 standards, section 6.5.6 paragraph 8 means that
adding 0 to a null pointer is undefined behavior. As of writing,
"clang -fsanitize=undefined" (Clang 15) diagnoses this. However,
I'm not aware of any compiler that would take advantage of this
when optimizing (Clang 15 included). It's good to avoid this anyway
since compilers might some day infer that pointer arithmetic implies
that the pointer is not NULL. That is, the following foo() would then
unconditionally return 0, even for foo(NULL, 0):
void bar(char *a, char *b);
int foo(char *a, size_t n)
{
bar(a, a + n);
return a == NULL;
}
In contrast to C, C++ explicitly allows null pointer + 0. So if
the above is compiled as C++ then there is no undefined behavior
in the foo(NULL, 0) call.
To me it seems that changing the C standard would be the sane
thing to do (just add one sentence) as it would ensure that a huge
amount of old code won't break in the future. Based on web searches
it seems that a large number of codebases (where null pointer + 0
occurs) are being fixed instead to be future-proof in case compilers
will some day optimize based on it (like making the above foo(NULL, 0)
return 0) which in the worst case will cause security bugs.
Some projects don't plan to change it. For example, gnulib and thus
many GNU tools currently require that null pointer + 0 is defined:
https://lists.gnu.org/archive/html/bug-gnulib/2021-11/msg00000.html
https://www.gnu.org/software/gnulib/manual/html_node/Other-portability-assumptions.html
In XZ Utils null pointer + 0 issue should be fixed after this
commit. This adds a few if-statements and thus branches to avoid
null pointer + 0. These check for size > 0 instead of ptr != NULL
because this way bugs where size > 0 && ptr == NULL will likely
get caught quickly. None of them are in hot spots so it shouldn't
matter for performance.
A little less readable version would be replacing
ptr + offset
with
offset != 0 ? ptr + offset : ptr
or creating a macro for it:
#define my_ptr_add(ptr, offset) \
((offset) != 0 ? ((ptr) + (offset)) : (ptr))
Checking for offset != 0 instead of ptr != NULL allows GCC >= 8.1,
Clang >= 7, and Clang-based ICX to optimize it to the very same code
as ptr + offset. That is, it won't create a branch. So for hot code
this could be a good solution to avoid null pointer + 0. Unfortunately
other compilers like ICC 2021 or MSVC 19.33 (VS2022) will create a
branch from my_ptr_add().
Thanks to Marcin Kowalczyk for reporting the problem:
https://github.com/tukaani-project/xz/issues/36
src/liblzma/common/block_decoder.c | 5 ++++-
src/liblzma/common/block_encoder.c | 7 +++++--
src/liblzma/common/common.c | 20 ++++++++++++++------
src/liblzma/common/index_decoder.c | 13 ++++++++++---
src/liblzma/common/index_encoder.c | 11 +++++++++--
src/liblzma/common/index_hash.c | 13 ++++++++++---
src/liblzma/common/lzip_decoder.c | 6 +++++-
src/liblzma/delta/delta_decoder.c | 7 ++++++-
src/liblzma/delta/delta_encoder.c | 12 ++++++++++--
src/liblzma/simple/simple_coder.c | 6 ++++--
10 files changed, 77 insertions(+), 23 deletions(-)
commit f6dce49cb656b358e2fb2a3032e35e20af34dc84
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-07 00:00:44 +0800
liblzma: Adjust container.h for consistency with filter.h.
src/liblzma/api/lzma/container.h | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
commit 173d240bb4763aedc8c01df4d9c83e311d954c33
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-07 00:00:09 +0800
liblzma: Fix small typos and reword a few things in filter.h.
src/liblzma/api/lzma/container.h | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
commit 17797bacde3f7264048ef0976c137a600148d6cf
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-06 23:42:08 +0800
liblzma: Convert list of flags in lzma_mt to bulleted list.
src/liblzma/api/lzma/container.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
commit 37da0e727161b401b8bfd8dccf163a4b2fc0460b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-26 23:17:41 +0800
liblzma: Fix typo in documentation in container.h
lzma_microlzma_decoder -> lzma_microlzma_encoder
src/liblzma/api/lzma/container.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b8331077c626e6bf14f4671d09b561146eaf816a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-26 23:16:34 +0800
liblzma: Improve documentation for container.h
Standardizing each function to always specify parameters and return
values. Also moved the parameters and return values to the end of each
function description.
src/liblzma/api/lzma/container.h | 146 +++++++++++++++++++++++++--------------
1 file changed, 93 insertions(+), 53 deletions(-)
commit b9a3511bb61d3b6ce49abd33dce6155a573f5272
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-22 20:59:41 +0800
CMake: Add LZIP decoder test to list of tests.
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
commit cd82ef2fb48b174c57cd03b84a9a0f978772cb89
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-17 20:56:49 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 076e911ba25cadf2cbdfbd0f65991a002e210c0b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-17 20:48:28 +0200
Build: Use only the generic symbol versioning on MicroBlaze.
On MicroBlaze, GCC 12 is broken in sense that
__has_attribute(__symver__) returns true but it still doesn't
support the __symver__ attribute even though the platform is ELF
and symbol versioning is supported if using the traditional
__asm__(".symver ...") method. Avoiding the traditional method is
good because it breaks LTO (-flto) builds with GCC.
See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766
For now the only extra symbols in liblzma_linux.map are the
compatibility symbols with the patch that spread from RHEL/CentOS 7.
These require the use of __symver__ attribute or __asm__(".symver ...")
in the C code. Compatibility with the patch from CentOS 7 doesn't
seem valuable on MicroBlaze so use liblzma_generic.map on MicroBlaze
instead. It doesn't require anything special in the C code and thus
no LTO issues either.
An alternative would be to detect support for __symver__
attribute in configure.ac and CMakeLists.txt and fall back
to __asm__(".symver ...") but then LTO would be silently broken
on MicroBlaze. It sounds likely that MicroBlaze is a special
case so let's treat it as a such because that is simpler. If
a similar issue exists on some other platform too then hopefully
someone will report it and this can be reconsidered.
(This doesn't do the same fix in CMakeLists.txt. Perhaps it should
but perhaps CMake build of liblzma doesn't matter much on MicroBlaze.
The problem breaks the build so it's easy to notice and can be fixed
later.)
Thanks to Vincent Fazio for reporting the problem and proposing
a patch (in the end that solution wasn't used):
https://github.com/tukaani-project/xz/pull/32
configure.ac | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
commit bc34e5ac9996667d2c1ec9a7895ec5931ac4caea
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-16 21:09:00 +0200
liblzma: Very minor API doc tweaks.
Use "member" to refer to struct members as that's the term used
by the C standard.
Use lzma_options_delta.dist and such in docs so that in Doxygen's
HTML output they will link to the doc of the struct member.
Clean up a few trailing white spaces too.
src/liblzma/api/lzma/block.h | 6 +++---
src/liblzma/api/lzma/delta.h | 6 +++---
src/liblzma/api/lzma/index.h | 10 +++++-----
src/liblzma/api/lzma/stream_flags.h | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
commit d31fbd28be5b79eb682db50004b0fb7aad5299ec
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-17 00:54:33 +0800
liblzma: Adjust spacing in doc headers in bcj.h.
src/liblzma/api/lzma/bcj.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 701e9be6bede19771895f756082db0c017f86f07
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-17 00:44:44 +0800
liblzma: Adjust documentation in bcj.h for consistent style.
src/liblzma/api/lzma/bcj.h | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
commit 762c4d0b62d2694cf3a01e030fdfe68e09e7b503
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-17 00:36:05 +0800
liblzma: Rename field => member in documentation.
Also adjusted preset value => preset level.
src/liblzma/api/lzma/base.h | 18 +++++++--------
src/liblzma/api/lzma/block.h | 44 ++++++++++++++++++-------------------
src/liblzma/api/lzma/container.h | 26 +++++++++++-----------
src/liblzma/api/lzma/delta.h | 12 +++++-----
src/liblzma/api/lzma/index.h | 30 ++++++++++++-------------
src/liblzma/api/lzma/lzma12.h | 28 +++++++++++------------
src/liblzma/api/lzma/stream_flags.h | 32 +++++++++++++--------------
7 files changed, 95 insertions(+), 95 deletions(-)
commit 0ce1db0223854d94b4a0d17737ac0486a75d9e6a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-02-16 17:59:50 +0200
liblzma: Silence a warning from MSVC.
It gives C4146 here since unary minus with unsigned integer
is still unsigned (which is the intention here). Doing it
with substraction makes it clearer and avoids the warning.
Thanks to Nathan Moinvaziri for reporting this.
src/liblzma/check/crc64_fast.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d83da006b3e8dbad9112e6cde6b27049d193c9ec
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-16 21:04:54 +0800
liblzma: Improve documentation for stream_flags.h
Standardizing each function to always specify parameters and return
values. Also moved the parameters and return values to the end of each
function description.
A few small things were reworded and long sentences broken up.
src/liblzma/api/lzma/stream_flags.h | 76 ++++++++++++++++++++++---------------
1 file changed, 46 insertions(+), 30 deletions(-)
commit 2796bb4736f645d34939b5d62d5958f534e41e69
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-14 21:50:16 +0800
liblzma: Improve documentation in lzma12.h.
All functions now explicitly specify parameter and return values.
src/liblzma/api/lzma/lzma12.h | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
commit ebebaa8d9381afea440eb1b01917117551adf68f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-27 22:44:06 +0800
liblzma: Improve documentation in check.h.
All functions now explicitly specify parameter and return values.
Also moved the note about SHA-256 functions not being exported to the
top of the file.
src/liblzma/api/lzma/check.h | 41 ++++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 13 deletions(-)
commit 765fa2865aab97ea713c1715922e322b3cf599a7
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-08 21:33:52 +0800
liblzma: Improve documentation in index.h
All functions now explicitly specify parameter and return values.
src/liblzma/api/lzma/index.h | 177 ++++++++++++++++++++++++++++++-------------
1 file changed, 126 insertions(+), 51 deletions(-)
commit 918e208af5960728b6def01e692b395f7d8e3701
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-08 20:35:32 +0800
liblzma: Reword a comment in index.h.
src/liblzma/api/lzma/index.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1f157d214bc09338876d2467b549935679abc0bf
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-08 20:30:23 +0800
liblzma: Omit lzma_index_iter's internal field from Doxygen docs.
Add \private above this field and its sub-fields since it is not meant
to be modified by users.
src/liblzma/api/lzma/index.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 28757fa46d8e0f0a9c17628b2b6af9bcb3cd96fc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-21 21:32:03 +0800
liblzma: Fix documentation for LZMA_MEMLIMIT_ERROR.
LZMA_MEMLIMIT_ERROR was missing the "<" character needed to put
documentation after a member.
src/liblzma/api/lzma/base.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 135d5a1a65a9e199b9a5550c1f788cf43cd81018
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-21 00:29:38 +0800
liblzma: Improve documentation for base.h.
Standardizing each function to always specify params and return values.
Also fixed a small grammar mistake.
src/liblzma/api/lzma/base.h | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
commit 2287d5668384e289d51e72724997dc920483768e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-14 00:08:33 +0800
liblzma: Minor improvements to vli.h.
Added [out] annotations to parameters that are pointers and can have
their value changed. Also added a clarification to lzma_vli_is_valid.
src/liblzma/api/lzma/vli.h | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
commit 7124b8a16ae60cb2e93218ff531868eebd673bde
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-10 21:38:02 +0800
liblzma: Add comments for macros in delta.h.
Document LZMA_DELTA_DIST_MIN and LZMA_DELTA_DIST_MAX for completeness
and to avoid Doxygen warnings.
src/liblzma/api/lzma/delta.h | 8 ++++++++
1 file changed, 8 insertions(+)
commit 59c7bb8931159fdb1a31bbbeaed0e6984e2d3c81
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-10 21:35:23 +0800
liblzma: Improve documentation in index_hash.h.
All functions now explicitly specify parameter and return values.
Also reworded the description of lzma_index_hash_init() for readability.
src/liblzma/api/lzma/index_hash.h | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
commit e970c28ac3cb2e8051925f81db2fe953664c2645
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:33:32 +0800
liblzma: Fix bug in lzma_str_from_filters() not checking filters[] length.
The bug is only a problem in applications that do not properly terminate
the filters[] array with LZMA_VLI_UNKNOWN or have more than
LZMA_FILTERS_MAX filters. This bug does not affect xz.
src/liblzma/common/string_conversion.c | 7 +++++++
1 file changed, 7 insertions(+)
commit 85e01266a96689448abb249da6c6abc3afcd4a4e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:32:47 +0800
Tests: Create test_filter_str.c.
Tests lzma_str_to_filters(), lzma_str_from_filters(), and
lzma_str_list_filters() API functions.
CMakeLists.txt | 1 +
tests/Makefile.am | 2 +
tests/test_filter_str.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 596 insertions(+)
commit 3fa0f3ba12dd3383f62dbfa18a864f9b4217fa0a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-22 08:49:00 +0800
liblzma: Fix typos in comments in string_conversion.c.
src/liblzma/common/string_conversion.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 32dbe045d74e94f75c53236fa2a6c0454d7b6d9e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:20:20 +0800
liblzma: Clarify block encoder and decoder documentation.
Added a few sentences to the description for lzma_block_encoder() and
lzma_block_decoder() to highlight that the Block Header must be coded
before calling these functions.
src/liblzma/api/lzma/block.h | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
commit ccf12acbfa7331b1bbb99ec55879186eb35f879f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:12:24 +0800
Update lzma_block documentation for lzma_block_uncomp_encode().
src/liblzma/api/lzma/block.h | 3 +++
1 file changed, 3 insertions(+)
commit 6a0b168dd9dc1ef437255c4bfdc6eff8b96fdb24
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:11:37 +0800
liblzma: Minor edits to lzma_block header_size documentation.
src/liblzma/api/lzma/block.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 84ce36f90e68471fec1f0e61cd93ac7ed9ab4883
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:11:07 +0800
liblzma: Enumerate functions that read version in lzma_block.
src/liblzma/api/lzma/block.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
commit d6620774682830d606f57109861b6763805b3492
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:10:34 +0800
liblzma: Clarify comment in block.h.
src/liblzma/api/lzma/block.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 880adb5aa25f66a53d81c2f3acc716f7a4d373d1
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-03 00:07:23 +0800
liblzma: Improve documentation for block.h.
Standardizing each function to always specify params and return values.
Output pointer parameters are also marked with doxygen style [out] to
make it clear. Any note sections were also moved above the parameter and
return sections for consistency.
src/liblzma/api/lzma/block.h | 96 ++++++++++++++++++++++++++++++++++----------
1 file changed, 75 insertions(+), 21 deletions(-)
commit b5b1b1f061c342271e4977ce5cba604a19c0ca52
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-02-01 23:38:30 +0800
liblzma: Clarify a comment about LZMA_STR_NO_VALIDATION.
The flag description for LZMA_STR_NO_VALIDATION was previously confusing
about the treatment for filters than cannot be used with .xz format
(lzma1) without using LZMA_STR_ALL_FILTERS. Now, it is clear that
LZMA_STR_NO_VALIDATION is not a super set of LZMA_STR_ALL_FILTERS.
src/liblzma/api/lzma/filter.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit e904e778b82b14f2779aab80d6c8f3c01a3fc54b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-27 20:14:51 +0800
Translations: Add Brazilian Portuguese translation of man pages.
Thanks to Rafael Fontenelle.
po4a/po4a.conf | 2 +-
po4a/pt_BR.po | 3677 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 3678 insertions(+), 1 deletion(-)
commit e9c47e79c9584ba1126f5fa0dbe6c96e67411aa6
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-24 20:48:50 +0800
liblzma: Fix documentation in filter.h for lzma_str_to_filters()
The previous documentation for lzma_str_to_filters() was technically
correct, but misleading. lzma_str_to_filters() returns NULL on success,
which is in practice always defined to 0. This is the same value as
LZMA_OK, but lzma_str_to_filters() does not return lzma_ret so we should
be more clear.
src/liblzma/api/lzma/filter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 99575947a58a60416c570eb78038d18a1ea4cef4
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-07 21:55:06 +0800
xz: Refactor duplicated check for custom suffix when using --format=raw
src/xz/args.c | 8 ++++++++
src/xz/suffix.c | 26 ++++++++------------------
src/xz/suffix.h | 8 ++++++++
3 files changed, 24 insertions(+), 18 deletions(-)
commit 76dec92fcca4a9ccd2063ed6d5d9e3474665baad
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-20 21:53:14 +0800
liblzma: Set documentation on all reserved fields to private.
This prevents the reserved fields from being part of the generated
Doxygen documentation.
src/liblzma/api/lzma/base.h | 17 +++++++++++++++
src/liblzma/api/lzma/block.h | 43 +++++++++++++++++++++++++++++++++++++
src/liblzma/api/lzma/container.h | 24 +++++++++++++++++++++
src/liblzma/api/lzma/delta.h | 12 +++++++++++
src/liblzma/api/lzma/index.h | 27 +++++++++++++++++++++++
src/liblzma/api/lzma/lzma12.h | 22 +++++++++++++++++++
src/liblzma/api/lzma/stream_flags.h | 28 ++++++++++++++++++++++++
7 files changed, 173 insertions(+)
commit bd213d06ebf92cf42eeb97e7c578bddc857f8ea8
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-21 23:59:43 +0800
liblzma: Highlight liblzma API headers should not be included directly.
This improves the generated Doxygen HTML files to better highlight
how to properly use the liblzma API header files.
src/liblzma/api/lzma/base.h | 5 +++--
src/liblzma/api/lzma/bcj.h | 5 +++--
src/liblzma/api/lzma/block.h | 5 +++--
src/liblzma/api/lzma/check.h | 5 +++--
src/liblzma/api/lzma/container.h | 5 +++--
src/liblzma/api/lzma/delta.h | 5 +++--
src/liblzma/api/lzma/filter.h | 5 +++--
src/liblzma/api/lzma/hardware.h | 5 +++--
src/liblzma/api/lzma/index.h | 5 +++--
src/liblzma/api/lzma/index_hash.h | 5 +++--
src/liblzma/api/lzma/lzma12.h | 5 +++--
src/liblzma/api/lzma/stream_flags.h | 5 +++--
src/liblzma/api/lzma/version.h | 5 +++--
src/liblzma/api/lzma/vli.h | 5 +++--
14 files changed, 42 insertions(+), 28 deletions(-)
commit 257dbff0ba1a7bc45a74d203ece015c9f70c88cd
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-19 20:35:09 +0800
tuklib_physmem: Silence warning from -Wcast-function-type on MinGW-w64.
tuklib_physmem depends on GetProcAddress() for both MSVC and MinGW-w64
to retrieve a function address. The proper way to do this is to cast the
return value to the type of function pointer retrieved. Unfortunately,
this causes a cast-function-type warning, so the best solution is to
simply ignore the warning.
src/common/tuklib_physmem.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 720ad4a44282a7ee59aa9920eaf495d85d245d97
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-16 21:35:45 +0800
xz: Add missing comment for coder_set_compression_settings()
src/xz/coder.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 88dc19163421282369c0989e997c05f9a447edc6
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-16 20:55:10 +0800
xz: Do not set compression settings with raw format in list mode.
Calling coder_set_compression_settings() in list mode with verbose mode
on caused the filter chain and memory requirements to print. This was
unnecessary since the command results in an error and not consistent
with other formats like lzma and alone.
src/xz/args.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 039e0ab13efb144642f9d99eeeb9c668e76bb430
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-13 20:37:06 +0800
Translations: Update the Brazilian Portuguese translation.
po/pt_BR.po | 603 ++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 344 insertions(+), 259 deletions(-)
commit 718f7a60e740b26b8353965edaaddc7d4deb4d85
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 13:04:05 +0200
Build: Omit -Wmissing-noreturn from the default warnings.
It's not that important. It can be annoying in builds that
disable many features since in those cases the tests programs
will correctly trigger this warning with Clang.
configure.ac | 1 -
1 file changed, 1 deletion(-)
commit 3ccedb09724c998c39d708c945f6da5852c39e13
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 06:05:58 +0200
xz: Use ssize_t for the to-be-ignored return value from write(fd, ptr, 1).
It makes no difference here as the return value fits into an int
too and it then gets ignored but this looks better.
src/xz/file_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 09fbd2f0527def89e839c8907de4fe7ef6bc5019
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 06:01:12 +0200
xz: Silence warnings from -Wsign-conversion in a 32-bit build.
src/common/tuklib_mbstr_fw.c | 2 +-
src/xz/list.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 683d3f178ef1487b5418be49f331b0131a101b40
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 05:38:48 +0200
liblzma: Silence another warning from -Wsign-conversion in a 32-bit build.
It doesn't warn on a 64-bit system because truncating
a ptrdiff_t (signed long) to uint32_t is diagnosed under
-Wconversion by GCC and -Wshorten-64-to-32 by Clang.
src/liblzma/lz/lz_encoder_mf.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 2b8062ef94a38d0f9ad0d1b309e8748db52f5c15
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 04:46:45 +0200
liblzma: Silence a warning from -Wsign-conversion in a 32-bit build.
src/common/mythread.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit b16b9c0d22227012518595c2222facc73bd833a8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 04:17:24 +0200
Build: Make configure add more warning flags for GCC and Clang.
-Wstrict-aliasing was removed from the list since it is enabled
by -Wall already.
A normal build is clean with these on GNU/Linux x86-64 with
GCC 12.2.0 and Clang 14.0.6.
configure.ac | 36 +++++++++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
commit c47ecd6d3909d0d3ff48dfd6e2ee41e7c7130b94
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 04:14:18 +0200
Tests: Fix warnings from clang --Wassign-enum.
Explicitly casting the integer to lzma_check silences the warning.
Since such an invalid value is needed in multiple tests, a constant
INVALID_LZMA_CHECK_ID was added to tests.h.
The use of 0x1000 for lzma_block.check wasn't optimal as if
the underlying type is a char then 0x1000 will be truncated to 0.
However, in these test cases the value is ignored, thus even with
such truncation the test would have passed.
tests/test_block_header.c | 6 +++---
tests/test_check.c | 2 +-
tests/test_stream_flags.c | 8 ++++----
tests/tests.h | 9 +++++++++
4 files changed, 17 insertions(+), 8 deletions(-)
commit 34e13ce015232968731de2a9ec3440a08b0084b1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 03:51:07 +0200
Tests: Silence warnings from -Wsign-conversion.
Note that assigning an unsigned int to lzma_check doesn't warn
on GNU/Linux x86-64 since the enum type is unsigned on that
platform. The enum can be signed on some other platform though
so it's best to use enumeration type lzma_check in these situations.
tests/test_check.c | 6 +++---
tests/test_stream_flags.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
commit 6671d0fe46b77f0fafce860836b7a12dc3cda14a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 03:19:59 +0200
liblzma: Silence warnings from clang -Wconditional-uninitialized.
This is similar to 2ce4f36f179a81d0c6e182a409f363df759d1ad0.
The actual initialization of the variables is done inside
mythread_sync() macro. Clang doesn't seem to see that
the initialization code inside the macro is always executed.
src/liblzma/common/stream_decoder_mt.c | 8 +++++---
src/liblzma/common/stream_encoder_mt.c | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
commit d3e833ca1d2abda54648494c33aca73a40a47efe
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 03:11:40 +0200
Fix warnings from clang -Wdocumentation.
src/liblzma/check/check.h | 4 ----
src/liblzma/lz/lz_encoder_mf.c | 4 ++--
src/xz/options.c | 4 ++--
3 files changed, 4 insertions(+), 8 deletions(-)
commit 977dd2e26bc50efec8d30fb90380394042d24558
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 03:04:28 +0200
Tests: test_lzip_decoder: Remove trailing white-space.
tests/test_lzip_decoder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c55157ed7437ab14f2afb7fecf331e321f2edf9a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-12 03:03:55 +0200
Tests: test_lzip_decoder: Silence warnings from -Wsign-conversion.
tests/test_lzip_decoder.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
commit 18b845e69752c975dfeda418ec00eda22605c2ee
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-11 18:52:54 +0200
Bump version and soname for 5.4.1.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 4080bbb844fb36701ffb978f0c41ea2c2c9f8960
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-11 23:58:16 +0800
Add NEWS for 5.4.1.
NEWS | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
commit 674c89fdb8c457ebc3a0652e235d8b6cd7b7dee2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 11:56:11 +0200
sysdefs.h: Don't include strings.h anymore.
On some platforms src/xz/suffix.c may need <strings.h> for
strcasecmp() but suffix.c includes the header when it needs it.
Unless there is an old system that otherwise supports enough C99
to build XZ Utils but doesn't have C89/C90-compatible <string.h>,
there should be no need to include <strings.h> in sysdefs.h.
src/common/sysdefs.h | 6 ------
1 file changed, 6 deletions(-)
commit 2a6b938084fac9ddb39cd69c9beeed15c3b6f6f6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 11:23:41 +0200
xz: Include <strings.h> in suffix.c if needed for strcasecmp().
SUSv2 and POSIX.1‐2017 declare only a few functions in <strings.h>.
Of these, strcasecmp() is used on some platforms in suffix.c.
Nothing else in the project needs <strings.h> (at least if
building on a modern system).
sysdefs.h currently includes <strings.h> if HAVE_STRINGS_H is
defined and suffix.c relied on this.
Note that dos/config.h doesn't #define HAVE_STRINGS_H even though
DJGPP does have strings.h. It isn't needed with DJGPP as strcasecmp()
is also in <string.h> in DJGPP.
src/xz/suffix.c | 3 +++
1 file changed, 3 insertions(+)
commit aea639e81beb548e3114c74b6d9a894d6e036189
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-11 22:46:48 +0800
xz: Fix warning -Wformat-nonliteral on clang in message.c.
clang and gcc differ in how they handle -Wformat-nonliteral. gcc will
allow a non-literal format string as long as the function takes its
format arguments as a va_list.
src/xz/message.c | 9 +++++++++
1 file changed, 9 insertions(+)
commit e3b42bfcb0f67988beee7c7022fed0361282be45
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-11 20:58:31 +0800
Tests: Fix test_filter_flags copy/paste error.
tests/test_filter_flags.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 21625b7e11d004788e40eb5eb88d9d89f65fe347
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-11 20:42:29 +0800
Tests: Fix type-limits warning in test_filter_flags.
This only occurs in test_filter_flags when the BCJ filters are not
configured and built. In this case, ARRAY_SIZE() returns 0 and causes a
type-limits warning with the loop variable since an unsigned number will
always be >= 0.
tests/test_filter_flags.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
commit c337983e928682d56ce3470b286a8d5b8646e0ad
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 22:14:03 +0200
liblzma: CLMUL CRC64: Work around a bug in MSVC, second attempt.
This affects only 32-bit x86 builds. x86-64 is OK as is.
I still cannot easily test this myself. The reporter has tested
this and it passes the tests included in the CMake build and
performance is good: raw CRC64 is 2-3 times faster than the
C version of the slice-by-four method. (Note that liblzma doesn't
include a MSVC-compatible version of the 32-bit x86 assembly code
for the slice-by-four method.)
Thanks to Iouri Kharon for figuring out a fix, testing, and
benchmarking.
src/liblzma/check/crc64_fast.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit b7fb438ea0e3ee02e3a164f3b72fae456cbe34d7
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-11 01:18:50 +0800
Tests: Fix unused function warning in test_block_header.
One of the global arrays of filters was only used in a test that
required both encoders and decoders to be configured in the build.
tests/test_block_header.c | 4 ++++
1 file changed, 4 insertions(+)
commit 68e9ef036d18d7c3952bff0b391d5989b86934da
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-11 01:08:03 +0800
Tests: Fix unused function warning in test_index_hash.
test_index_hash does not use fill_index_hash() unless both encoders
and decoders are configured in the build.
tests/test_index_hash.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit a387707cd8cdefbffb5b7429bda4b7fcc192954a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 00:33:14 +0200
Windows: Update INSTALL-MSVC.txt to recommend CMake over project files.
windows/INSTALL-MSVC.txt | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
commit 52902ad69518255a14b0144f0a2379e06fde5b6e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 12:47:16 +0200
Revert "liblzma: CLMUL CRC64: Workaround a bug in MSVC (VS2015-2022)."
This reverts commit 36edc65ab4cf10a131f239acbd423b4510ba52d5.
It was reported that it wasn't a good enough fix and MSVC
still produced (different kind of) bad code when building
for 32-bit x86 if optimizations are enabled.
Thanks to Iouri Kharon.
src/liblzma/check/crc64_fast.c | 6 ------
1 file changed, 6 deletions(-)
commit e81b9fc48ca70f9228308d3f1871cd81f9a5a496
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 10:05:13 +0200
sysdefs.h: Fix a comment.
src/common/sysdefs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6e89ab58b031aa046308a0b3504ff0a5be042571
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 10:04:06 +0200
sysdefs.h: Don't include memory.h anymore even if it were available.
It quite probably was never needed, that is, any system where memory.h
was required likely couldn't compile XZ Utils for other reasons anyway.
XZ Utils 5.2.6 and later source packages were generated using
Autoconf 2.71 which no longer defines HAVE_MEMORY_H. So the code
being removed is no longer used anyway.
src/common/sysdefs.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
commit 65c59ad429aa59f9df0326d9fc82931ba4a9d123
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-10 08:50:26 +0200
CMake/Windows: Add a workaround for windres from GNU binutils.
This is combined from the following commits in the master branch:
443dfebced041adc88f10d824188eeef5b5821a9
6b117d3b1fe91eb26d533ab16a2e552f84148d47
5e34774c31d1b7509b5cb77a3be9973adec59ea0
Thanks to Iouri Kharon for the bug report, the original patch,
and testing.
CMakeLists.txt | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
commit 43521e77acc907863fa4f94aae276366172cb9ee
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-06 22:53:38 +0200
Tests: test_filter_flags: Clean up minor issues.
Here are the list of the most significant issues addressed:
- Avoid using internal common.h header. It's not good to copy the
constants like this but common.h cannot be included for use outside
of liblzma. This is the quickest thing to do that could be fixed later.
- Omit the INIT_FILTER macro. Initialization should be done with just
regular designated initializers.
- Use start_offset = 257 for BCJ tests. It demonstrates that Filter
Flags encoder and decoder don't validate the options thoroughly.
257 is valid only for the x86 filter. This is a bit silly but
not a significant problem in practice because the encoder and
decoder initialization functions will catch bad alignment still.
Perhaps this should be fixed but it's not urgent and doesn't need
to be in 5.4.x.
- Various tweaks to comments such as filter id -> Filter ID
tests/test_filter_flags.c | 153 +++++++++++++++++++++++-----------------------
1 file changed, 78 insertions(+), 75 deletions(-)
commit 6b44cead95d767414272dc3a67898a36bfdf95b3
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-29 23:33:33 +0800
Tests: Refactors existing filter flags tests.
Converts the existing filter flags tests into tuktests.
tests/test_filter_flags.c | 655 ++++++++++++++++++++++++++++++++--------------
1 file changed, 457 insertions(+), 198 deletions(-)
commit 1bbefa9659b202ba31bd244a9d0e4f0d37ff3ed7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-08 00:32:29 +0200
Tests: tuktest.h: Support tuktest_malloc(0).
It's not needed in XZ Utils at least for now. It's good to support
it still because if such use is needed later, it wouldn't be
caught on GNU/Linux since malloc(0) from glibc returns non-NULL.
tests/tuktest.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ce3a3fbc7c2c399aeed644d54f3bd56ac914dfee
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-07 21:57:11 +0200
CMake: Update cmake_minimum_required from 3.13...3.16 to 3.13...3.25.
The changes listed on cmake-policies(7) for versions 3.17 to 3.25
shouldn't affect this project.
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 99fcd57f2ea35eaa94e09f674d5364329c880fa2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-08 00:24:23 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit c0c13d9d82eb8a4302c8bbb8b4c5178d285fe9ab
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-07 19:50:35 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 3d45987451b1c3bb42697b29341824c0e5484cba
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-09 11:27:24 +0200
CMake: Fix a copypaste error in xzdec Windows resource file handling.
It was my mistake. Thanks to Iouri Kharon for the bug report.
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 706bce5018d7cf83094e13454a0731169ec119b5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-07 19:50:03 +0200
CMake/Windows: Add resource files to xz.exe and xzdec.exe.
The command line tools cannot be built with MSVC for now but
they can be built with MinGW-w64.
Thanks to Iouri Kharon for the bug report and the original patch.
CMakeLists.txt | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit e96dee55df04113c33b387ccdb6cb70935422d91
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-09 12:22:05 +0200
liblzma: CLMUL CRC64: Workaround a bug in MSVC (VS2015-2022).
I haven't tested with MSVC myself and there doesn't seem to be
information about the problem online, so I'm relying on the bug report.
Thanks to Iouri Kharon for the bug report and the patch.
src/liblzma/check/crc64_fast.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 52bc1ee34dda9bb6fb40175e5952863066681b77
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-07 19:31:15 +0200
Build: Require that _mm_set_epi64x() is usable to enable CLMUL support.
VS2013 doesn't have _mm_set_epi64x() so this way CLMUL gets
disabled with VS2013.
Thanks to Iouri Kharon for the bug report.
CMakeLists.txt | 3 ++-
configure.ac | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
commit bad44cfe19e8be8ae76755369be2a34abcd2b4fa
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-29 00:25:18 +0800
Tests: Creates test_index_hash.c
Tests all API functions exported from index_hash.h. Does not have a
dedicated test for lzma_index_hash_end.
[Minor edits were made by Lasse Collin.]
.gitignore | 1 +
CMakeLists.txt | 2 +
tests/Makefile.am | 3 +
tests/test_index_hash.c | 388 ++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 394 insertions(+)
commit 692ccdf5516dfe55fb6e9c5cdfb31f4c02c1ecd1
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-05 20:57:25 +0800
liblzma: Remove common.h include from common/index.h.
common/index.h is needed by liblzma internally and tests. common.h will
include and define many things that are not needed by the tests.
Also, this prevents include order problems because both common.h and
lzma.h define LZMA_API. On most platforms it results only in a warning
but on Windows it would break the build as the definition in common.h
must be used only for building liblzma itself.
src/liblzma/common/index.c | 1 +
src/liblzma/common/index.h | 9 +++++++--
src/liblzma/common/index_decoder.h | 1 +
src/liblzma/common/stream_buffer_encoder.c | 1 +
4 files changed, 10 insertions(+), 2 deletions(-)
commit 2ac7bafc8f07c1edefe96a4a7a040ddfff0eb5bb
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-08-17 20:20:16 +0800
liblzma: Add NULL check to lzma_index_hash_append.
This is for consistency with lzma_index_append.
src/liblzma/common/index_hash.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit db714d30e0c74d1dd4af1a23ed62b44e0e8e4efc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-08-17 17:59:51 +0800
liblzma: Replaced hardcoded 0x0 index indicator byte with macro
src/liblzma/common/index.h | 3 +++
src/liblzma/common/index_decoder.c | 2 +-
src/liblzma/common/index_encoder.c | 2 +-
src/liblzma/common/index_hash.c | 2 +-
src/liblzma/common/stream_decoder.c | 3 ++-
src/liblzma/common/stream_decoder_mt.c | 2 +-
6 files changed, 9 insertions(+), 5 deletions(-)
commit 39d2585dcd3e827cfc3c46025ab6708c4aeb36c6
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-06 20:43:31 +0800
Style: Change #if !defined() to #ifndef in mythread.h.
src/common/mythread.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3f0130aa288e4ed57ace609517db9700a41223af
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-06 20:35:55 +0800
Build: Add missing stream_decoder_mt.c to .vcxproj files.
The line in the .vcxproj files for building with was missing in 5.4.0.
Thank to Hajin Jang for reporting the issue.
windows/vs2013/liblzma.vcxproj | 1 +
windows/vs2013/liblzma_dll.vcxproj | 1 +
windows/vs2017/liblzma.vcxproj | 1 +
windows/vs2017/liblzma_dll.vcxproj | 1 +
windows/vs2019/liblzma.vcxproj | 1 +
windows/vs2019/liblzma_dll.vcxproj | 1 +
6 files changed, 6 insertions(+)
commit f204d1050a515d17851eed9049862ce5a9c729c1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-04 22:40:54 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 34a9c2d650d6c30bd88e1b21910dd863209aa884
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-04 18:40:28 +0200
Tests: Adjust style in test_compress.sh.
tests/test_compress.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
commit 761c208d58e0c3daa0f46e68b406adfc318d2a46
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-04 23:58:58 +0800
Tests: Replace non portable shell parameter expansion
The shell parameter expansion using # and ## is not supported in
Solaris 10 Bourne shell (/bin/sh). Even though this is POSIX, it is not fully
portable, so we should avoid it.
tests/create_compress_files.c | 2 +-
tests/test_compress.sh | 20 +++++++++++++-------
tests/test_compress_prepared_bcj_sparc | 2 +-
tests/test_compress_prepared_bcj_x86 | 2 +-
4 files changed, 16 insertions(+), 10 deletions(-)
commit 8a7cbc074547e55e57f4f3696f69bedeb05e14c4
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-03 21:02:38 +0800
Translations: Add Korean translation of man pages.
Thanks to Seong-ho Cho
po4a/ko.po | 5552 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po4a/po4a.conf | 2 +-
2 files changed, 5553 insertions(+), 1 deletion(-)
commit ca2af49bb8be5995eb0e6a3abf457622626d49a7
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-03 20:47:27 +0800
Translations: Update the Esperanto translation.
po/eo.po | 620 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 332 insertions(+), 288 deletions(-)
commit bfba3394aed03311fe9a746d3141b2e16d8b9325
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2023-01-02 17:05:07 +0200
Build: Fix config.h comments.
configure.ac | 2 +-
m4/tuklib_progname.m4 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 507648ad114c2ae0cd6d181063e1ac07e8106718
Author: Jia Tan <jiat0218@gmail.com>
Date: 2023-01-02 22:33:48 +0800
Build: Only define HAVE_PROGRAM_INVOCATION_NAME if it is set to 1.
HAVE_DECL_PROGRAM_INVOCATION_NAME is renamed to
HAVE_PROGRAM_INVOCATION_NAME. Previously,
HAVE_DECL_PROGRAM_INVOCATION_NAME was always set when
building with autotools. CMake would only set this when it was 1, and the
dos/config.h did not define it. The new macro definition is consistent
across build systems.
cmake/tuklib_progname.cmake | 5 ++---
m4/tuklib_progname.m4 | 5 ++++-
src/common/tuklib_progname.c | 2 +-
src/common/tuklib_progname.h | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
commit ab5229d32adfec1f3fbc95228d9dd6f560732ab5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-30 20:10:08 +0200
Tests: test_check: Test corner cases of CLMUL CRC64.
tests/test_check.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
commit 8791826f31733fda0a13b411c2ed930faaeb25aa
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-30 19:36:49 +0200
Tests: Clarify a comment in test_lzip_decoder.c.
tests/test_lzip_decoder.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit c410d812ea12bfc74f6b727c1a799478c79f19ca
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-29 01:55:19 +0800
xz: Includes <time.h> and <sys/time.h> conditionally in mytime.c.
Previously, mytime.c depended on mythread.h for <time.h> to be included.
src/xz/mytime.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 501c6013d4a59fae5d4368e9657c4885493db809
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-29 01:15:27 +0800
liblzma: Includes sys/time.h conditionally in mythread
Previously, <sys/time.h> was always included, even if mythread only used
clock_gettime. <time.h> is still needed even if clock_gettime is not used
though because struct timespec is needed for mythread_condtime.
src/common/mythread.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 9e3cb514b5b95bd235dcdff3db4436f57444ee4f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-29 01:10:53 +0800
Build: No longer require HAVE_DECL_CLOCK_MONOTONIC to always be set.
Previously, if threading was enabled HAVE_DECL_CLOCK_MONOTONIC would always
be set to 0 or 1. However, this macro was needed in xz so if xz was not
built with threading and HAVE_DECL_CLOCK_MONOTONIC was not defined but
HAVE_CLOCK_GETTIME was, it caused a warning during build. Now,
HAVE_DECL_CLOCK_MONOTONIC has been renamed to HAVE_CLOCK_MONOTONIC and
will only be set if it is 1.
CMakeLists.txt | 8 +++-----
configure.ac | 5 ++++-
src/common/mythread.h | 4 ++--
src/xz/mytime.c | 5 ++---
4 files changed, 11 insertions(+), 11 deletions(-)
commit 6fc3e5467911572fa9af4021ea46396261aae796
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-28 01:14:07 +0800
Translations: Add Ukrainian translations of man pages.
Thanks to Yuri Chornoivan
po4a/po4a.conf | 2 +-
po4a/uk.po | 3676 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 3677 insertions(+), 1 deletion(-)
commit e84f2ab7f8bc38cd8f8befa0bb398656c3c11f8e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-22 23:14:53 +0800
liblzma: Update documentation for lzma_filter_encoder.
src/liblzma/common/filter_encoder.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit b14b8dbba9a3b232787ae218b46430b9246383dd
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-21 21:12:03 +0800
Tests: Adds lzip decoder tests
.gitignore | 1 +
tests/Makefile.am | 2 +
tests/test_lzip_decoder.c | 471 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 474 insertions(+)
commit 09a114805e1d4f9a02a06cee7dbf2f5014d1f710
Author: Jia Cheong Tan <jiat0218@gmail.com>
Date: 2022-12-20 22:05:21 +0800
Doxygen: Update .gitignore for generating docs for in source build.
In source builds are not recommended, but we should still ignore
the generated artifacts.
.gitignore | 2 ++
1 file changed, 2 insertions(+)
commit d3e6fe44196bf9478ad193522e2b48febf2eca6b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-20 20:46:44 +0800
liblzma: Fix lzma_microlzma_encoder() return value.
Using return_if_error on lzma_lzma_lclppb_encode was improper because
return_if_error is expecting an lzma_ret value, but
lzma_lzma_lclppb_encode returns a boolean. This could result in
lzma_microlzma_encoder, which would be misleading for applications.
src/liblzma/common/microlzma_encoder.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit b55a27b46f52524a4a8d9cdef03e6689cefc1375
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-16 18:30:02 +0200
liblzma: Update authors list in arm64.c.
src/liblzma/simple/arm64.c | 1 +
1 file changed, 1 insertion(+)
commit 2fd28d2b7cec3468324a6f15eff7e73c285b1d7d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-16 20:58:55 +0800
CMake: Update .gitignore for CMake artifacts from in source build.
In source builds are not recommended, but we can make it easier
by ignoring the generated artifacts from CMake.
.gitignore | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
commit b69da6d4bb6bb11fc0cf066920791990d2b22a06
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 20:37:17 +0200
Bump version to 5.4.0 and soname to 5.4.0.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 6 +++---
src/liblzma/liblzma_generic.map | 2 +-
src/liblzma/liblzma_linux.map | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
commit 20869eb3fb280ff4f271ef527b12b6bf68b05e19
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 20:29:39 +0200
Update INSTALL: CMake on Windows isn't experimental anymore.
Using CMake to build liblzma should work on a few other OSes
but building the command line tools is still subtly broken.
It is known that shared library versioning may differ between
CMake and Libtool builds on some OSes, most notably Darwin.
INSTALL | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
commit cbbd84451944e3e8c63acfaa3c923f6d8aff7852
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 19:47:53 +0200
Add NEWS for 5.4.0.
NEWS | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 202 insertions(+)
commit c3e94d37e8d10a3e96019864b6f5d7b578db2c14
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 17:41:20 +0200
Fix a typo in NEWS.
NEWS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0d2a2e0a545c3da2b3e9500f1e531eb903087245
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 17:41:03 +0200
Add NEWS for 5.2.10.
NEWS | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 177ece1c8eb007188fb1b04eff09ca2193fbdea6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 12:30:45 +0200
Tests: Fix a typo in tests/files/README.
tests/files/README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 60f45bdbaa6b07558b3f4baac285739b0c6342f5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-13 12:30:09 +0200
Tests: Add two ARM64 test files.
tests/files/README | 7 +++++++
tests/files/good-1-arm64-lzma2-1.xz | Bin 0 -> 512 bytes
tests/files/good-1-arm64-lzma2-2.xz | Bin 0 -> 488 bytes
tests/test_files.sh | 5 +++++
4 files changed, 12 insertions(+)
commit f5e419550619c548c7c35d7e367cf00580a56521
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-12 22:44:21 +0200
Translations: Update the Catalan translation.
po/ca.po | 657 +++++++++++++++++++++++++++++----------------------------------
1 file changed, 306 insertions(+), 351 deletions(-)
commit 0fb9d355da3789b1757040af475b4e6bbc8b8af8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-12 19:18:12 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit e5b6c161c61a37c54dcb76a99bbb83ac4abe02dc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-12 19:07:58 +0200
Update AUTHORS.
AUTHORS | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit f2d98e691099d82054d5f3071ef6f5e809932e44
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-12 15:31:14 +0200
Docs: Omit multi-threaded decompress from TODO.
The TODO file outdated still.
TODO | 2 --
1 file changed, 2 deletions(-)
commit b42908c42a4cc091db45a7e5ba0e0ecceaa3f6da
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-11 21:16:09 +0200
Docs: Update xz-file-format.txt to 1.1.0 for ARM64 filter.
doc/xz-file-format.txt | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
commit 854f2f5946b353cb0963fd6dfd54d363adc89b9f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-11 21:13:57 +0200
xz: Rename --experimental-arm64 to --arm64.
src/xz/args.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 31dbd1e5fb65831915a7bbb531c3f19aea8d57a5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-11 21:13:06 +0200
liblzma: Change LZMA_FILTER_ARM64 to the official Filter ID 0x0A.
src/liblzma/api/lzma/bcj.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
commit 01b3549e523edac899ec4925b282ceddd20da116
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-08 19:24:22 +0200
xz: Make args_info.files_name a const pointer.
src/xz/args.c | 2 +-
src/xz/args.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit bc665b84ea6bf7946394a08122177efe41b26a5f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-08 19:18:16 +0200
xz: Don't modify argv[].
The code that parses --memlimit options and --block-list modified
the argv[] when parsing the option string from optarg. This was
visible in "ps auxf" and such and could be confusing. I didn't
understand it back in the day when I wrote that code. Now a copy
is allocated when modifiable strings are needed.
src/xz/args.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
commit a13064e1c290de7933db72b6dffbd65cfce59c9f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-08 18:18:57 +0200
Translations: Update the German man page translations.
po4a/de.po | 4570 ++++++++++++++++++------------------------------------------
1 file changed, 1374 insertions(+), 3196 deletions(-)
commit 8bdbe42a8d0d75dff70206b923fc4bce5c69a40a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-06 23:05:56 +0800
Translations: Update the German translation.
po/de.po | 586 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 315 insertions(+), 271 deletions(-)
commit 5c304b57c24ef40ff57f864301065f0244c05bde
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-06 23:04:25 +0800
Translations: Update the Turkish translation.
po/tr.po | 221 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 108 insertions(+), 113 deletions(-)
commit 6d86781fdb937970486500447ebb49b98244235b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-06 23:02:11 +0800
Translations: Update the Croatian translation.
po/hr.po | 228 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 113 insertions(+), 115 deletions(-)
commit 7a5b4b8075eb36026b1796f04ffed5830c42396a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-06 22:56:30 +0800
Translations: Add Romanian translation of man pages.
Thanks to Remus-Gabriel Chelu.
po4a/po4a.conf | 2 +-
po4a/ro.po | 3692 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 3693 insertions(+), 1 deletion(-)
commit c6977e7400088177556e8771bcb839eb7d90caa3
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-12-06 22:52:13 +0800
Translations: Update the Romanian translation.
po/ro.po | 294 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 147 insertions(+), 147 deletions(-)
commit ac2a747e939c2cbccff7a49c399769af5e02d2ab
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-08 17:30:09 +0200
liblzma: Check for unexpected NULL pointers in block_header_decode().
The API docs gave an impression that such checks are done
but they actually weren't done. In practice it made little
difference since the calling code has a bug if these are NULL.
Thanks to Jia Tan for the original patch that checked for
block->filters == NULL.
src/liblzma/common/block_header_decoder.c | 4 ++++
1 file changed, 4 insertions(+)
commit 24790f49ae66938c1c7574315e1c0aba1ed5ed25
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 20:59:32 +0200
Bump version number for 5.3.5beta.
This also sorts the symbol names alphabetically in liblzma_*.map.
src/liblzma/api/lzma/version.h | 4 ++--
src/liblzma/liblzma_generic.map | 10 +++++-----
src/liblzma/liblzma_linux.map | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
commit 7e53c5bcb3c2c17f47c096c06ff6b1481e6ecafa
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 20:57:26 +0200
Add NEWS for 5.3.5beta.
NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
commit 5865f2aaac326fcbd9f8a7d62defa230e4cb644e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 20:57:09 +0200
Update THANKS.
THANKS | 3 +++
1 file changed, 3 insertions(+)
commit 62b270988ec67314d69976df484d2974c6eacfda
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 20:04:17 +0200
liblzma: Use __has_attribute(__symver__) to fix Clang detection.
If someone sets up Clang to define __GNUC__ to 10 or greater
then symvers broke. __has_attribute is supported by such GCC
and Clang versions that don't support __symver__ so this should
be much better and simpler way to detect if __symver__ is
actually supported.
Thanks to Tomasz Gajc for the bug report.
src/liblzma/common/common.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit f9ca7d45162664ddd9fb70e19335c2426e5d75bb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 18:51:52 +0200
liblzma: Omit zero-skipping from ARM64 filter.
It has some complicated downsides and its usefulness is more limited
than I originally thought. So this change is bad for certain very
specific situations but a generic solution that works for other
filters (and is otherwise better too) is planned anyway. And this
way 7-Zip can use the same compatible filter for the .7z format.
This is still marked as experimental with a new temporary Filter ID.
src/liblzma/api/lzma/bcj.h | 2 +-
src/liblzma/simple/arm64.c | 81 +++++++++++++---------------------------------
2 files changed, 24 insertions(+), 59 deletions(-)
commit 5baec3f0a9c85e6abf45c0f652f699b074129a8b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 18:13:27 +0200
xz: Omit the special notes about ARM64 filter on the man page.
src/xz/xz.1 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
commit 0c3627b51862eb0dcdd4fc283d046250571991c6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 18:12:03 +0200
liblzma: Don't be over-specific in lzma_str_to_filters API doc.
src/liblzma/api/lzma/filter.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 94adf057f27b1970f493dc99cd166407d7255639
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 17:54:23 +0200
liblzma: Silence unused variable warning when BCJ filters are disabled.
Thanks to Jia Tan for the original patch.
src/liblzma/common/string_conversion.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit c68af4441744e5ffc41a472e1be9c9d53a1d9780
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-12-01 17:38:03 +0200
Translations: Update the Chinese (simplified) translation.
po/zh_CN.po | 608 ++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 348 insertions(+), 260 deletions(-)
commit 3be6942e5c27d29995d41da52fbe274e4ce4a537
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-30 18:55:03 +0200
Add NEWS for 5.2.9.
NEWS | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
commit 7c16e312cb2f40b81154c0e5be13a3c6b8da485d
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-11-30 23:33:08 +0800
xz: Remove message_filters_to_str function prototype from message.h.
This was forgotten from 7484744af6cbabe81e92af7d9e061dfd597fff7b.
src/xz/message.h | 16 ----------------
1 file changed, 16 deletions(-)
commit 764955e2d4f2a5e8d6d6fec63af694f799e050e7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-30 18:08:34 +0200
Change the bug report address.
It forwards to me and Jia Tan.
Also update the IRC reference in README as #tukaani was moved
to Libera Chat long ago.
CMakeLists.txt | 2 +-
README | 11 +++++------
configure.ac | 2 +-
dos/config.h | 2 +-
windows/README-Windows.txt | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
commit c21983c76031e01da01ad3c6cc716fe4b8a75070
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-30 17:50:17 +0200
Build: Add string_conversion.c to CMake, DOS, and VS files.
CMakeLists.txt | 1 +
dos/Makefile | 1 +
windows/vs2013/liblzma.vcxproj | 1 +
windows/vs2013/liblzma_dll.vcxproj | 1 +
windows/vs2017/liblzma.vcxproj | 1 +
windows/vs2017/liblzma_dll.vcxproj | 1 +
windows/vs2019/liblzma.vcxproj | 1 +
windows/vs2019/liblzma_dll.vcxproj | 1 +
8 files changed, 8 insertions(+)
commit 30be0c35d24eb5175459d69dbf7d92e2b087ef82
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-30 17:38:32 +0200
Update to HTTPS URLs in AUTHORS.
AUTHORS | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 0a72b9ca2fe20082da9b7128fe0d908af947a851
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-11-30 00:52:06 +0800
liblzma: Improve documentation for string to filter functions.
src/liblzma/api/lzma/filter.h | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
commit a6e21fcede3b196160a52dd294d965c508a4bb33
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-29 22:27:42 +0200
liblzma: Two fixes to lzma_str_list_filters() API docs.
Thanks to Jia Tan.
src/liblzma/api/lzma/filter.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 7484744af6cbabe81e92af7d9e061dfd597fff7b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-28 21:57:47 +0200
xz: Use lzma_str_from_filters().
Two uses: Displaying encoder filter chain when compressing with -vv,
and displaying the decoder filter chain in --list -vv.
src/xz/list.c | 28 ++++++---
src/xz/message.c | 175 +++----------------------------------------------------
2 files changed, 28 insertions(+), 175 deletions(-)
commit cedeeca2ea6ada5b0411b2ae10d7a859e837f203
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-28 21:37:48 +0200
liblzma: Add lzma_str_to_filters, _from_filters, and _list_filters.
lzma_str_to_filters() uses static error messages which makes
them not very precise. It tells the position in the string
where an error occurred though which helps quite a bit if
applications take advantage of it. Dynamic error messages can
be added later with a new flag if it seems important enough.
src/liblzma/api/lzma/filter.h | 258 +++++++
src/liblzma/common/Makefile.inc | 1 +
src/liblzma/common/string_conversion.c | 1302 ++++++++++++++++++++++++++++++++
src/liblzma/liblzma_generic.map | 3 +
src/liblzma/liblzma_linux.map | 3 +
5 files changed, 1567 insertions(+)
commit 072ebf7b1335421193ffa9d4a70d5533786b8995
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-28 21:02:19 +0200
liblzma: Make lzma_validate_chain() available outside filter_common.c.
src/liblzma/common/filter_common.c | 8 ++++----
src/liblzma/common/filter_common.h | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
commit 5f22bd2d37e3bd01a5d701b51750eb51f09c11bf
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-28 10:51:03 +0200
liblzma: Remove lzma_lz_decoder_uncompressed() as it's now unused.
src/liblzma/lz/lz_decoder.c | 14 --------------
src/liblzma/lz/lz_decoder.h | 3 ---
2 files changed, 17 deletions(-)
commit cee83206465b95729ab649aa2f57fdbde8dcaf89
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-28 10:48:53 +0200
liblzma: Use LZMA1EXT feature in lzma_microlzma_decoder().
Here too this avoids the slightly ugly method to set
the uncompressed size.
Also moved the setting of dict_size to the struct initializer.
src/liblzma/common/microlzma_decoder.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
commit e310e8b6a490dfb468f4ed68feff246d776b323c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-28 10:28:20 +0200
liblzma: Use LZMA1EXT feature in lzma_alone_decoder().
This avoids the need to use the slightly ugly method to
set the uncompressed size.
src/liblzma/common/alone_decoder.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
commit 33b8a24b6646a9dbfd8358405aec466b13078559
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-27 23:16:21 +0200
liblzma: Add LZMA_FILTER_LZMA1EXT to support LZMA1 without end marker.
Some file formats need support for LZMA1 streams that don't use
the end of payload marker (EOPM) alias end of stream (EOS) marker.
So far liblzma API has supported decompressing such streams via
lzma_alone_decoder() when .lzma header specifies a known
uncompressed size. Encoding support hasn't been available in the API.
Instead of adding a new LZMA1-only API for this purpose, this commit
adds a new filter ID for use with raw encoder and decoder. The main
benefit of this approach is that then also filter chains are possible,
for example, if someone wants to implement support for .7z files that
use the x86 BCJ filter with LZMA1 (not BCJ2 as that isn't supported
in liblzma).
src/liblzma/api/lzma/lzma12.h | 123 ++++++++++++++++++++++++++++++--
src/liblzma/common/filter_common.c | 7 ++
src/liblzma/common/filter_decoder.c | 6 ++
src/liblzma/common/filter_encoder.c | 9 +++
src/liblzma/lzma/lzma2_encoder.c | 2 +-
src/liblzma/lzma/lzma_decoder.c | 26 ++++++-
src/liblzma/lzma/lzma_encoder.c | 40 +++++++++--
src/liblzma/lzma/lzma_encoder.h | 3 +-
src/liblzma/lzma/lzma_encoder_private.h | 3 +
9 files changed, 204 insertions(+), 15 deletions(-)
commit 9a304bf1e45b3ddf61aaeaa7c764915b34618ede
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-27 18:43:07 +0200
liblzma: Avoid unneeded use of void pointer in LZMA decoder.
src/liblzma/lzma/lzma_decoder.c | 3 +--
src/liblzma/lzma/lzma_decoder.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
commit 218394958c7683f892275bb40eae880620feebcc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-27 18:20:33 +0200
liblzma: Pass the Filter ID to LZ encoder and decoder.
This allows using two Filter IDs with the same
initialization function and data structures.
src/liblzma/common/alone_decoder.c | 1 +
src/liblzma/common/alone_encoder.c | 1 +
src/liblzma/common/common.h | 7 +++++--
src/liblzma/common/lzip_decoder.c | 1 +
src/liblzma/common/microlzma_decoder.c | 1 +
src/liblzma/common/microlzma_encoder.c | 1 +
src/liblzma/lz/lz_decoder.c | 5 +++--
src/liblzma/lz/lz_decoder.h | 3 ++-
src/liblzma/lz/lz_encoder.c | 5 +++--
src/liblzma/lz/lz_encoder.h | 3 ++-
src/liblzma/lzma/lzma2_decoder.c | 3 ++-
src/liblzma/lzma/lzma2_encoder.c | 3 ++-
src/liblzma/lzma/lzma_decoder.c | 2 +-
src/liblzma/lzma/lzma_encoder.c | 2 +-
14 files changed, 26 insertions(+), 12 deletions(-)
commit 1663c7676b76f4c514031797f3db1896e8100f7f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-27 01:03:16 +0200
liblzma: Remove two FIXME comments.
src/liblzma/common/filter_encoder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 11fe708db783ac36ebeeb85da164e29e8c300910
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-26 22:25:30 +0200
xz: Use lzma_filters_free().
src/xz/list.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
commit e782af9110d8499c7ac2929bc871540eefea5ea1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-26 22:21:13 +0200
liblzma: Use lzma_filters_free() in more places.
src/liblzma/common/block_header_decoder.c | 20 ++------------------
src/liblzma/common/stream_decoder.c | 4 +---
src/liblzma/common/stream_decoder_mt.c | 22 +++++-----------------
3 files changed, 8 insertions(+), 38 deletions(-)
commit 90caaded2dc6db1d6a55b01160d7e87f4a423628
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-25 18:04:37 +0200
liblzma: Omit simple coder init functions if they are disabled.
src/liblzma/simple/arm.c | 4 ++++
src/liblzma/simple/armthumb.c | 4 ++++
src/liblzma/simple/ia64.c | 4 ++++
src/liblzma/simple/powerpc.c | 4 ++++
src/liblzma/simple/sparc.c | 4 ++++
src/liblzma/simple/x86.c | 4 ++++
6 files changed, 24 insertions(+)
commit 5cd9f0df78cc4f8a7807bf6104adea13034fbb45
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 23:24:59 +0200
xz: Allow nice_len 2 and 3 even if match finder requires 3 or 4.
Now that liblzma accepts these, we avoid the extra check and
there's one message less for translators too.
src/xz/options.c | 5 -----
1 file changed, 5 deletions(-)
commit 3be88ae071371caa279b44e13f4836fb178fe4ae
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 23:23:55 +0200
liblzma: Allow nice_len 2 and 3 even if match finder requires 3 or 4.
That is, if the specified nice_len is smaller than the minimum
of the match finder, silently use the match finder's minimum value
instead of reporting an error. The old behavior is annoying to users
and it complicates xz options handling too.
src/liblzma/lz/lz_encoder.c | 14 +++++++++-----
src/liblzma/lz/lz_encoder.h | 9 +++++++++
src/liblzma/lzma/lzma_encoder.c | 11 ++++++++---
3 files changed, 26 insertions(+), 8 deletions(-)
commit 93439cfafe1768b3b18d67d2356ef7e7559bba59
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 16:25:10 +0200
liblzma: Add lzma_filters_update() support to the multi-threaded encoder.
A tiny downside of this is that now a 1-4 tiny allocations are made
for every Block because each worker thread needs its own copy of
the filter chain.
src/liblzma/api/lzma/filter.h | 36 +++++++------
src/liblzma/common/stream_encoder_mt.c | 96 +++++++++++++++++++++++++++++++---
2 files changed, 109 insertions(+), 23 deletions(-)
commit 17ac51e689794eb41cab3e80946fec689caea2d2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 14:53:22 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 06824396b2b6c84f3a235cb7c19c2a9701167797
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 14:52:44 +0200
Build: Don't put GNU/Linux-specific symbol versions into static liblzma.
It not only makes no sense to put symbol versions into a static library
but it can also cause breakage.
By default Libtool #defines PIC if building a shared library and
doesn't define it for static libraries. This is documented in the
Libtool manual. It can be overriden using --with-pic or --without-pic.
configure.ac detects if --with-pic or --without-pic is used and then
gives an error if neither --disable-shared nor --disable-static was
used at the same time. Thus, in normal situations it works to build
both shared and static library at the same time on GNU/Linux,
only --with-pic or --without-pic requires that only one type of
library is built.
Thanks to John Paul Adrian Glaubitz from Debian for reporting
the problem that occurred on ia64:
https://www.mail-archive.com/xz-devel@tukaani.org/msg00610.html
CMakeLists.txt | 5 +-
configure.ac | 143 +++++++++++++++++++++++++++++---------------
src/liblzma/common/common.h | 12 ++++
3 files changed, 111 insertions(+), 49 deletions(-)
commit e1acf7107291f8b3d6d609a7133331ff36d35d14
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 01:32:16 +0200
liblzma: Refactor to use lzma_filters_free().
lzma_filters_free() sets the options to NULL and ids to
LZMA_VLI_UNKNOWN so there is no need to do it by caller;
the filter arrays will always be left in a safe state.
Also use memcpy() instead of a loop to copy a filter chain
when it is known to be safe to copy LZMA_FILTERS_MAX + 1
(even if the elements past the terminator might be uninitialized).
src/liblzma/common/stream_encoder.c | 16 ++++------------
src/liblzma/common/stream_encoder_mt.c | 11 ++---------
2 files changed, 6 insertions(+), 21 deletions(-)
commit cb05dbcf8b868441ec805016222f3fd77f1c5caa
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 01:26:37 +0200
liblzma: Fix another invalid free() after memory allocation failure.
This time it can happen when lzma_stream_encoder_mt() is used
to reinitialize an existing multi-threaded Stream encoder
and one of 1-4 tiny allocations in lzma_filters_copy() fail.
It's very similar to the previous bug
10430fbf3820dafd4eafd38ec8be161a6978ed2b, happening with
an array of lzma_filter structures whose old options are freed
but the replacement never arrives due to a memory allocation
failure in lzma_filters_copy().
src/liblzma/common/stream_encoder_mt.c | 4 ++++
1 file changed, 4 insertions(+)
commit 75f1a6c26df4ce329da0882786403e3ccf5cd898
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-05-05 20:53:42 +0800
liblzma: Add support for LZMA_SYNC_FLUSH in the Block encoder.
The documentation mentions that lzma_block_encoder() supports
LZMA_SYNC_FLUSH but it was never added to supported_actions[]
in the internal structure. Because of this, LZMA_SYNC_FLUSH could
not be used with the Block encoder unless it was the next coder
after something like stream_encoder() or stream_encoder_mt().
src/liblzma/common/block_encoder.c | 1 +
1 file changed, 1 insertion(+)
commit d0901645170b638c517f5c50866b6ef48f491c65
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 01:02:50 +0200
liblzma: Add new API function lzma_filters_free().
This is small but convenient and should have been added
a long time ago.
src/liblzma/api/lzma/filter.h | 21 +++++++++++++++++++++
src/liblzma/common/filter_common.c | 26 ++++++++++++++++++++++++++
src/liblzma/liblzma_generic.map | 1 +
src/liblzma/liblzma_linux.map | 1 +
4 files changed, 49 insertions(+)
commit ae1f8a723dcde2f2c5cf444bcbb5fc5026b3c3c5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-24 00:02:31 +0200
CMake: Don't use symbol versioning with static library.
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
commit 48c1b99dc537a27e1ca929d8837e778e5ba32191
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-23 21:55:22 +0200
liblzma: Add lzma_attr_warn_unused_result to lzma_filters_copy().
src/liblzma/api/lzma/filter.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 10430fbf3820dafd4eafd38ec8be161a6978ed2b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-23 21:26:21 +0200
liblzma: Fix invalid free() after memory allocation failure.
The bug was in the single-threaded .xz Stream encoder
in the code that is used for both re-initialization and for
lzma_filters_update(). To trigger it, an application had
to either re-initialize an existing encoder instance with
lzma_stream_encoder() or use lzma_filters_update(), and
then one of the 1-4 tiny allocations in lzma_filters_copy()
(called from stream_encoder_update()) must fail. An error
was correctly reported but the encoder state was corrupted.
This is related to the recent fix in
f8ee61e74eb40600445fdb601c374d582e1e9c8a which is good but
it wasn't enough to fix the main problem in stream_encoder.c.
src/liblzma/common/stream_encoder.c | 39 +++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
commit cafd6dc397ca8b5b5f7775e8d6876b8fe70f8e70
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-22 16:37:15 +0200
liblzma: Fix language in a comment.
src/liblzma/common/stream_encoder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c392bf8ccba857baaf50399c4b460119befacd54
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-22 11:20:17 +0200
liblzma: Fix infinite loop in LZMA encoder init with dict_size >= 2 GiB.
The encoder doesn't support dictionary sizes larger than 1536 MiB.
This is validated, for example, when calculating the memory usage
via lzma_raw_encoder_memusage(). It is also enforced by the LZ
part of the encoder initialization. However, LZMA encoder with
LZMA_MODE_NORMAL did an unsafe calculation with dict_size before
such validation and that results in an infinite loop if dict_size
was 2 << 30 or greater.
src/liblzma/lzma/lzma_encoder.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
commit f50534c973a591ccf65485adfc827a8a7126ca6c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-21 13:02:33 +0200
liblzma: Fix two Doxygen commands in the API headers.
These were caught by clang -Wdocumentation.
src/liblzma/api/lzma/hardware.h | 2 +-
src/liblzma/api/lzma/index_hash.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 649d4872ed2f55196114a061d45b416fc4353569
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-19 19:09:55 +0200
xz: Refactor duplicate code from hardware_memlimit_mtenc_get().
src/xz/hardware.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d327743bb547a53364e5951a16e5f1663fe4b9ff
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-19 19:06:13 +0200
xz: Add support --threads=+N so that -T+1 gives threaded mode.
src/xz/args.c | 18 +++++++++++++++---
src/xz/hardware.c | 17 +++++++++++++++--
src/xz/hardware.h | 1 +
src/xz/xz.1 | 21 ++++++++++++++++++++-
4 files changed, 51 insertions(+), 6 deletions(-)
commit a11a2b8b5e830ba682c1d81aaa7078842b296995
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-11-19 23:18:04 +0800
CMake: Adds test_memlimit to CMake tests
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
commit 2af8d9e9b3f44f62d19e7c39297ec63af2e8c64f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-15 19:10:21 +0200
Translations: Update the Korean translation.
po/ko.po | 652 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 371 insertions(+), 281 deletions(-)
commit 16ac05677292f7e21a4feaddcfb2ab062ea5f385
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-15 19:09:28 +0200
Translations: Update the Turkish translation.
po/tr.po | 568 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 310 insertions(+), 258 deletions(-)
commit b9a67d9a5fa207062d4aa8a01639234609315d31
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-15 10:58:39 +0200
Bump version number for 5.3.4alpha.
src/liblzma/api/lzma/version.h | 2 +-
src/liblzma/liblzma_generic.map | 2 +-
src/liblzma/liblzma_linux.map | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit 5b999ba289b3280457b7386b9ac65dbbdf1575a5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-15 10:54:40 +0200
Add NEWS for 5.3.4alpha.
NEWS | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
commit ce8db9e37da4f6c87691c5066f51f91f2411c44a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-15 10:54:08 +0200
Add NEWS for 5.2.8.
NEWS | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
commit b56bc8251d2736224af6bdaaae734ceb8926a879
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 23:19:57 +0200
Revert "liblzma: Simple/BCJ filters: Allow disabling generic BCJ options."
This reverts commit 177bdc922cb17bd0fd831ab8139dfae912a5c2b8
and also does equivalent change to arm64.c.
Now that ARM64 filter will use lzma_options_bcj, this change
is not needed anymore.
src/liblzma/simple/arm.c | 2 +-
src/liblzma/simple/arm64.c | 2 +-
src/liblzma/simple/armthumb.c | 2 +-
src/liblzma/simple/ia64.c | 2 +-
src/liblzma/simple/powerpc.c | 2 +-
src/liblzma/simple/simple_coder.c | 4 ++--
src/liblzma/simple/simple_private.h | 2 +-
src/liblzma/simple/sparc.c | 2 +-
src/liblzma/simple/x86.c | 3 +--
9 files changed, 10 insertions(+), 11 deletions(-)
commit 8370ec8edf9ddf8d1d9fef03d8d1027503ec4c35
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 23:14:41 +0200
Replace the experimental ARM64 filter with a new experimental version.
This is incompatible with the previous version.
This has space/tab fixes in filter_*.c and bcj.h too.
src/liblzma/api/lzma/bcj.h | 41 +-----
src/liblzma/common/filter_common.c | 14 +-
src/liblzma/common/filter_decoder.c | 12 +-
src/liblzma/common/filter_encoder.c | 17 +--
src/liblzma/simple/arm64.c | 283 ++++++++++++++----------------------
src/liblzma/simple/simple_decoder.h | 4 -
src/liblzma/simple/simple_encoder.h | 2 -
src/xz/args.c | 2 +-
src/xz/message.c | 13 +-
src/xz/options.c | 39 -----
src/xz/options.h | 7 -
11 files changed, 147 insertions(+), 287 deletions(-)
commit f644473a211394447824ea00518d0a214ff3f7f2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 21:34:57 +0200
liblzma: Add fast CRC64 for 32/64-bit x86 using SSSE3 + SSE4.1 + CLMUL.
It also works on E2K as it supports these intrinsics.
On x86-64 runtime detection is used so the code keeps working on
older processors too. A CLMUL-only build can be done by using
-msse4.1 -mpclmul in CFLAGS and this will reduce the library
size since the generic implementation and its 8 KiB lookup table
will be omitted.
On 32-bit x86 this isn't used by default for now because by default
on 32-bit x86 the separate assembly file crc64_x86.S is used.
If --disable-assembler is used then this new CLMUL code is used
the same way as on 64-bit x86. However, a CLMUL-only build
(-msse4.1 -mpclmul) won't omit the 8 KiB lookup table on
32-bit x86 due to a currently-missing check for disabled
assembler usage.
The configure.ac check should be such that the code won't be
built if something in the toolchain doesn't support it but
--disable-clmul-crc option can be used to unconditionally
disable this feature.
CLMUL speeds up decompression of files that have compressed very
well (assuming CRC64 is used as a check type). It is know that
the CLMUL code is significantly slower than the generic code for
tiny inputs (especially 1-8 bytes but up to 16 bytes). If that
is a real-world problem then there is already a commented-out
variant that uses the generic version for small inputs.
Thanks to Ilya Kurdyukov for the original patch which was
derived from a white paper from Intel [1] (published in 2009)
and public domain code from [2] (released in 2016).
[1] https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
[2] https://github.com/rawrunprotected/crc
CMakeLists.txt | 26 ++-
INSTALL | 12 ++
configure.ac | 59 +++++-
src/liblzma/check/crc64_fast.c | 449 +++++++++++++++++++++++++++++++++++++++-
src/liblzma/check/crc64_table.c | 21 +-
5 files changed, 554 insertions(+), 13 deletions(-)
commit 3b466bc79672bb2b06d1245a500588e6026e0ba0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 20:14:34 +0200
Translations: Update the Swedish translation one more time.
po/sv.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit e963379a8622ebdff6ce78e76b803bcd1e1d16d6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 19:34:15 +0200
Translations: Update the Swedish translation again.
po/sv.po | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit a4bc689a823a2254f29ac9d233170add5121b307
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 19:07:45 +0200
Translations: Update the Swedish translation.
po/sv.po | 671 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 382 insertions(+), 289 deletions(-)
commit bbf2073d824ab4ba33bed4b77f467435abd333a5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 18:58:09 +0200
Translations: Update the Ukrainian translation.
po/uk.po | 618 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 354 insertions(+), 264 deletions(-)
commit ac10b1b3622e70881595586edfb8a3ebdcd76bb6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 17:58:07 +0200
Build: Omit x86_64 from --enable-assembler.
It didn't do anything. There are only 32-bit x86 assembly files
and it feels likely that new files won't be added as intrinsics
in C are more portable across toolchains and OSes.
configure.ac | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit eb0f1450ad9f23dac03050d9c8375980240aee21
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-14 16:00:52 +0200
liblzma: Use __attribute__((__constructor__)) if available.
This uses it for CRC table initializations when using --disable-small.
It avoids mythread_once() overhead. It also means that then
--disable-small --disable-threads is thread-safe if this attribute
is supported.
CMakeLists.txt | 15 +++++++++++++++
INSTALL | 4 +++-
configure.ac | 31 ++++++++++++++++++++++++++++---
src/liblzma/check/crc32_small.c | 7 +++++++
src/liblzma/check/crc64_small.c | 5 +++++
src/liblzma/lz/lz_encoder.c | 2 +-
6 files changed, 59 insertions(+), 5 deletions(-)
commit 6553f49b11dafad35c73b05f12e14865ea1fd8a1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-12 21:19:52 +0200
Translations: Update the Romanian translation.
po/ro.po | 651 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 380 insertions(+), 271 deletions(-)
commit db97e69e12393becc29f8febd53133d0d36989bd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-12 21:17:45 +0200
Translations: Update the Hungarian translation.
po/hu.po | 625 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 357 insertions(+), 268 deletions(-)
commit 2bbb9c0f3829a8b121b36998d273a6c6f92000f4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 17:58:57 +0200
Translations: Update the Finnish translation.
po/fi.po | 610 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 348 insertions(+), 262 deletions(-)
commit 3c8cbb8137b6f8ed9416c1209d73cdbcb015251f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 17:58:18 +0200
Translations: Update the Croatian translation.
po/hr.po | 680 +++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 381 insertions(+), 299 deletions(-)
commit 26c3359eac0988d6f3986735cd1363bec1678e8e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 17:57:18 +0200
Translations: Update the Polish translation.
po/pl.po | 569 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 309 insertions(+), 260 deletions(-)
commit 577e467b137c735afb8de6ae71ac7a73c2960cc4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 17:56:44 +0200
Translations: Update the Spanish translation.
po/es.po | 598 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 344 insertions(+), 254 deletions(-)
commit f9b4ff6e9a0f1678650775582d3e4fe782abce97
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 17:16:03 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit a39961ef211e1bf030b17edeea3cff29fe263b67
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 17:15:25 +0200
liblzma: Fix building with Intel ICC (the classic compiler).
It claims __GNUC__ >= 10 but doesn't support __symver__ attribute.
Thanks to Stephen Sachs.
src/liblzma/common/common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c715f683dcb1a817d565da292cddfbceda643e12
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 14:35:58 +0200
liblzma: Fix incorrect #ifdef for x86 SSE2 support.
__SSE2__ is the correct macro for SSE2 support with GCC, Clang,
and ICC. __SSE2_MATH__ means doing floating point math with SSE2
instead of 387. Often the latter macro is defined if the first
one is but it was still a bug.
src/liblzma/common/memcmplen.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit bd334ae56afe7f642ad4d0f1ac19e74e82daa1ce
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 13:27:06 +0200
Add NEWS for 5.2.7 (forgotten cherry-pick from v5.2).
NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
commit 3c7860cf49de6f81046b3a4034a89f3a4803a576
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 13:16:21 +0200
xzdiff: Add support for .lz files.
The other scripts don't need changes for .lz support because
in those scripts it is enough that xz supports .lz.
src/scripts/xzdiff.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit d76c752a6d77052e5ad57ade555082585f7ac5d8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-11 12:23:58 +0200
Scripts: Ignore warnings from xz.
In practice this means making the scripts work when
the input files have an unsupported check type which
isn't a problem in practice unless support for
some check types has been disabled at build time.
src/scripts/xzdiff.in | 5 +++--
src/scripts/xzgrep.in | 2 +-
src/scripts/xzless.in | 4 ++--
src/scripts/xzmore.in | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
commit 6552535afd1fe29d726ab6e68cf14ce3624fd48c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-10 12:34:43 +0200
Translations: Rename poa4/fr_FR.po to po4a/fr.po.
That's how it is preferred at the Translation Project.
On my system /usr/share/man/fr_FR doesn't contain any
other man pages than XZ Utils while /usr/share/man/fr
has quite a few, so this will fix that too.
Thanks to Benno Schulenberg from the Translation Project.
po4a/{fr_FR.po => fr.po} | 0
po4a/po4a.conf | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
commit 0918159ce4c75bfb60aff0193b559f8a9f41d25a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 18:48:50 +0200
xz: Update the man page about BCJ filters, including upcoming --arm64.
The --arm64 isn't actually implemented yet in the form
described in this commit.
Thanks to Jia Tan.
src/xz/xz.1 | 66 +++++++++++++++++++++++++++----------------------------------
1 file changed, 29 insertions(+), 37 deletions(-)
commit ba2ae3596f6be1587495f33b367488f6e00e56f1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 18:14:14 +0200
xz: Add --arm64 to --long-help and omit endianness from ARM(-Thumb).
Modern 32-bit ARM in big endian mode use little endian for
instruction encoding still, so the filters work on such
executables too. It's likely less confusing for users this way.
The --arm64 option hasn't been implemented yet (there is
--experimental-arm64 but it's different). The --arm64 option
is added now anyway because this is the likely result and the
strings need to be ready for translators.
Thanks to Jia Tan.
src/xz/message.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 802d57d9215d9c81dbee86edb43c9e93a7f7ec55
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 15:12:13 +0200
Windows: Update the VS project files for ARM64 and .lz support.
windows/vs2013/config.h | 9 +++++++++
windows/vs2013/liblzma.vcxproj | 5 ++++-
windows/vs2013/liblzma_dll.vcxproj | 5 ++++-
windows/vs2017/config.h | 9 +++++++++
windows/vs2017/liblzma.vcxproj | 3 +++
windows/vs2017/liblzma_dll.vcxproj | 3 +++
windows/vs2019/config.h | 9 +++++++++
windows/vs2019/liblzma.vcxproj | 5 ++++-
windows/vs2019/liblzma_dll.vcxproj | 5 ++++-
9 files changed, 49 insertions(+), 4 deletions(-)
commit 5846aeda05972bc803c6094821ae836229ebe691
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 14:57:48 +0200
DOS: Update Makefile and config.h to include ARM64 and .lz support.
dos/Makefile | 2 ++
dos/config.h | 9 +++++++++
2 files changed, 11 insertions(+)
commit 781da8d6c44de6aa278c916375250668a0b107f2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 14:45:05 +0200
CMake: Add lzip decoder files and #define to the build.
CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
commit df8ad4af65a9c4846b108550d0083770a69dee64
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 14:41:56 +0200
Docs: Update INSTALL and also add new prohibited options to PACKAGERS.
INSTALL | 49 +++++++++++++++++++++++++++++++++++++++++--------
PACKAGERS | 2 ++
2 files changed, 43 insertions(+), 8 deletions(-)
commit c8ef089c149afaab413c3a51be827dd1d11afe0e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-20 17:39:06 +0300
Tests: Test the .lz files in test_files.sh.
tests/test_files.sh | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
commit c8f70ebb4628ceb6cb29cc9195d9deadf69d2bd7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-20 15:35:59 +0300
Tests: Add .lz (lzip) test files.
tests/files/README | 109 +++++++++++++++++++++++++++++----
tests/files/bad-1-v0-uncomp-size.lz | Bin 0 -> 42 bytes
tests/files/bad-1-v1-crc32.lz | Bin 0 -> 50 bytes
tests/files/bad-1-v1-dict-1.lz | Bin 0 -> 50 bytes
tests/files/bad-1-v1-dict-2.lz | Bin 0 -> 50 bytes
tests/files/bad-1-v1-magic-1.lz | Bin 0 -> 50 bytes
tests/files/bad-1-v1-magic-2.lz | Bin 0 -> 50 bytes
tests/files/bad-1-v1-member-size.lz | Bin 0 -> 50 bytes
tests/files/bad-1-v1-trailing-magic.lz | Bin 0 -> 54 bytes
tests/files/bad-1-v1-uncomp-size.lz | Bin 0 -> 50 bytes
tests/files/good-1-v0-trailing-1.lz | Bin 0 -> 59 bytes
tests/files/good-1-v0.lz | Bin 0 -> 42 bytes
tests/files/good-1-v1-trailing-1.lz | Bin 0 -> 67 bytes
tests/files/good-1-v1-trailing-2.lz | Bin 0 -> 70 bytes
tests/files/good-1-v1.lz | Bin 0 -> 50 bytes
tests/files/good-2-v0-v1.lz | Bin 0 -> 78 bytes
tests/files/good-2-v1-v0.lz | Bin 0 -> 78 bytes
tests/files/good-2-v1-v1.lz | Bin 0 -> 86 bytes
tests/files/unsupported-1-v234.lz | Bin 0 -> 50 bytes
19 files changed, 98 insertions(+), 11 deletions(-)
commit 731db13e6fa3ad3e3fc786c0ccf6eac4cce6865f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-19 22:32:51 +0300
xz: Remove the commented-out FORMAT_GZIP, gzip, .gz, and .tgz.
src/xz/args.c | 2 --
src/xz/coder.h | 1 -
src/xz/suffix.c | 9 ---------
3 files changed, 12 deletions(-)
commit 3176f992c55b8d788c4633809aaf9447376a5a12
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-08 21:28:15 +0300
xz: Add .lz (lzip) decompression support.
If configured with --disable-lzip-decoder then --long-help will
still list `lzip' in --format but I left it like that since
due to translations it would be messy to have two help strings.
Features are disabled only in special situations so wrong help
in such a situation shouldn't matter much.
Thanks to Michał Górny for the original patch.
src/xz/args.c | 9 ++++++++
src/xz/coder.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
src/xz/coder.h | 3 +++
src/xz/message.c | 2 +-
src/xz/suffix.c | 26 ++++++++++++++++++----
src/xz/xz.1 | 46 +++++++++++++++++++++++++++++++++-----
6 files changed, 141 insertions(+), 13 deletions(-)
commit 034086e1ae1459210837a24e04878435c86dc41b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-08 00:29:20 +0300
liblzma: Add .lz support to lzma_auto_decoder().
Thanks to Michał Górny for the original patch.
src/liblzma/api/lzma/container.h | 10 ++++++----
src/liblzma/common/Makefile.inc | 3 ++-
src/liblzma/common/auto_decoder.c | 23 +++++++++++++++++------
src/liblzma/common/lzip_decoder.h | 22 ++++++++++++++++++++++
4 files changed, 47 insertions(+), 11 deletions(-)
commit 0538db038f3cdc352007dacb42454aa1806b8e40
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-06 15:50:20 +0300
liblzma: Add .lz (lzip) decompression support (format versions 0 and 1).
Support for format version 0 was removed from lzip 1.18 for some
reason. .lz format version 0 files are rare (and old) but some
source packages were released in this format, and some people might
have personal files in this format too. It's very little extra code
to support it along side format version 1 so this commits adds
support for both.
The Sync Flush marker extentension to the original .lz format
version 1 isn't supported. It would require changes to the
LZMA decoder itself. Such files are very rare anyway.
See the API doc for lzma_lzip_decoder() for more details about
the .lz format support.
Thanks to Michał Górny for the original patch.
configure.ac | 21 ++
src/liblzma/api/lzma/container.h | 62 +++++-
src/liblzma/common/Makefile.inc | 5 +
src/liblzma/common/lzip_decoder.c | 413 ++++++++++++++++++++++++++++++++++++++
src/liblzma/liblzma_generic.map | 1 +
src/liblzma/liblzma_linux.map | 1 +
6 files changed, 501 insertions(+), 2 deletions(-)
commit 633d48a075b9ce4b9c08a7a56a7eb4cabc18100c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 14:17:23 +0200
liblzma: Add the missing Makefile.inc change for --disable-microlzma.
This was forgotten from commit 59c4d6e1390f6f4176f43ac1dad1f7ac03c449b8.
src/liblzma/common/Makefile.inc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
commit 724285dadbdc88765c8fb83eab9816575a260966
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 14:10:52 +0200
xz: Add comments about stdin and src_st.st_size.
"xz -v < regular_file > out.xz" doesn't display the percentage
and estimated remaining time because it doesn't even try to
check the input file size when input is read from stdin.
This could be improved but for now there's just a comment
to remind about it.
src/xz/coder.c | 9 +++++++++
src/xz/file_io.c | 4 ++++
2 files changed, 13 insertions(+)
commit f723eec68b0e44234910f669a29119de33018967
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 12:48:22 +0200
xz: Fix displaying of file sizes in progress indicator in passthru mode.
It worked for one input file since the counters are zero when
xz starts but they weren't reset when starting a new file in
passthru mode. For example, if files A, B, and C are one byte each,
then "xz -dcvf A B C" would show file sizes as 1, 2, and 3 bytes
instead of 1, 1, and 1 byte.
src/xz/coder.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 69265d0f223ddf1d66f799b8b047df22923e376f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-09 11:27:20 +0200
xz: Add a comment why --to-stdout is not in --help.
It is on the man page still.
src/xz/message.c | 3 +++
1 file changed, 3 insertions(+)
commit fe6b8852a3c6a0eb5a3c33512e0a69af257d3bc7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 23:05:37 +0200
xz: Make xz -lvv show that the upcoming --arm64 needs 5.4.0 to decompress.
src/xz/list.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
commit fb3f05ac9f2b4b0e3643401960fbeab31997ac7a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 22:26:54 +0200
Docs: Update faq.txt a little.
doc/faq.txt | 66 ++++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 43 insertions(+), 23 deletions(-)
commit 05331f091ec3b68eccbfb2a9a7a576072768fb4b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 16:57:17 +0200
Translations: Update Turkish translation.
po/tr.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ed3a4822963b4940d84e6f44d47277c394fc046d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 14:55:32 +0200
Translations: Update Croatian translation.
po/hr.po | 190 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 96 insertions(+), 94 deletions(-)
commit 4746f5ec721316bc4c6fec9905b2902e0360e0af
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 14:13:03 +0200
liblzma: Update API docs about decoder flags.
src/liblzma/api/lzma/container.h | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
commit 8779a9db5d0cec00c9dc9e9965dd2dda04f9d80d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 14:01:50 +0200
liblzma: Use the return_if_error() macro in alone_decoder.c.
src/liblzma/common/alone_decoder.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit 3f4990b6822961e75cd9b4e2e82b1df63f6f8fcc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 14:00:58 +0200
liblzma: Fix a comment in auto_decoder.c.
src/liblzma/common/auto_decoder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 026a5897c72a2041ae08ceec54ce8b1cdeb51334
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-08 13:43:19 +0200
xz: Initialize the pledge(2) sandbox at the very beginning of main().
It feels better that the initializations are sandboxed too.
They don't do anything that the pledge() call wouldn't allow.
src/xz/main.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
commit 49a59f6ca001c3ce9affa2c162b437aad021b4d5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-07 22:51:16 +0200
xz: Extend --robot --info-memory output.
Now it includes everything that the human-readable --info-memory shows.
src/xz/hardware.c | 24 +++++++++++++++---------
src/xz/xz.1 | 47 +++++++++++++++++++++++++++++++++++++++++------
2 files changed, 56 insertions(+), 15 deletions(-)
commit 5e2450c75cbac966c62cf2231c824f2cc91ddba8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-11-07 17:22:04 +0200
liblzma: Include cached memory in reported memusage in threaded decoder.
This affects lzma_memusage() and lzma_memlimit_set() when used
with the threaded decompressor. Now all allocations are reported
by lzma_memusage() (so it's not misleading) and lzma_memlimit_set()
cannot lower the limit below that value.
The alternative would have been to allow lowering the limit if
doing so is possible by freeing the cached memory but since
the primary use case of lzma_memlimit_set() is to increase
memlimit after LZMA_MEMLIMIT_ERROR this simple approach
was selected.
The cached memory was always included when enforcing
the memory usage limit while decoding.
Thanks to Jia Tan.
src/liblzma/common/stream_decoder_mt.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
commit 1fc6e7dd1fabdb60124d449b99273330ccab3ff1
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-11-07 16:24:14 +0200
xz: Avoid a compiler warning in progress_speed() in message.c.
This should be smaller too since it avoids the string constants.
src/xz/message.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
commit cf118c014683069b5dbe91898acdc40f2f0a1f5d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-31 16:26:05 +0200
Build: Clarify comment in configure.ac about SSE2.
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit aad3c609ffb72f581a7a2b67be3ad70b2b327840
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-31 16:16:37 +0200
Build: Remove obsolete commented-out lines from configure.ac.
configure.ac | 4 ----
1 file changed, 4 deletions(-)
commit e53e0e2186c6b8ce866bd19aec52f1c318ed31ba
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-31 13:31:58 +0200
Windows: Fix mythread_once() macro with Vista threads.
Don't call InitOnceComplete() if initialization was already done.
So far mythread_once() has been needed only when building
with --enable-small. windows/build.bash does this together
with --disable-threads so the Vista-specific mythread_once()
is never needed by those builds. VS project files or
CMake-builds don't support HAVE_SMALL builds at all.
src/common/mythread.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 48dde3bab9dc04081acb5aa7cf7c5044b8a49f58
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-31 11:54:44 +0200
liblzma: Silence -Wconversion warning from crc64_fast.c.
src/liblzma/check/crc64_fast.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit a243c617ff249d915ac123de4f536b80322c1fdb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-31 11:49:47 +0200
CMake: Sync tuklib_cpucores.cmake with tuklib_cpucores.m4.
This was forgotten from commit 2611c4d90535652d3eb7ef4a026a6691276fab43.
cmake/tuklib_cpucores.cmake | 5 +++++
1 file changed, 5 insertions(+)
commit 05c72de06fcaaedc78f8abba7d5ec568ddcf1e75
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-27 15:49:18 +0300
Tests: test_files.sh: Make it not fail if features were disabled at build.
It now tries to test as many files as easily possible.
The exit status indicates skipping if any of the files were
skipped. This way it is easy to notice if something is being
skipped when it isn't expected.
tests/test_files.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 4 deletions(-)
commit b3459327a51f4b8239d19e6c34b4e0c6bc2d81de
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-27 15:30:13 +0300
Tests: test_files.sh: Suppress an expected warning from the log.
xz (but not xzdec) will normally warn about unsupported check
but since we are testing specifically such a file, it's better
to silence that warning so that it doesn't look suspicious in
test_files.sh.log.
The use of -q and -Q in xzdec is just for consistency and
doesn't affect the result at least for now.
tests/test_files.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 798c86e4231e0835ab76ccd0810c8ea30833b2ce
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-27 15:27:50 +0300
Tests: test_files.sh: Print the reason for skipping if xz & xzdec missing.
tests/test_files.sh | 1 +
1 file changed, 1 insertion(+)
commit c1dd8524e1af07f16b790463899de06a6a5fcc08
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-27 01:12:40 +0300
Tests: Keep test_compress_* working when some filters are unavailable.
tests/test_compress.sh | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
commit ce30ada91951d0746879ae438da11f1ee8a90aa0
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-10-23 21:01:08 +0800
Tests: test_bcj_exact_size skips properly now if PowerPC filter disabled.
tests/test_bcj_exact_size.c | 3 +++
1 file changed, 3 insertions(+)
commit 89c5cfcacaca7130509fac836e2f30c46b824502
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-26 00:05:57 +0300
Tests: Test also unsupported-*.xz.
tests/test_files.sh | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
commit a4b214b93ac741edef9c41e55865b0b867ca2587
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 23:45:03 +0300
Build: Use AC_CONFIG_HEADERS instead of the ancient AC_CONFIG_HEADER.
We require Autoconf >= 2.69 and that has AC_CONFIG_HEADERS.
There is a warning about AC_PROG_CC_C99 being obsolete but
it cannot be removed because it is needed with Autoconf 2.69.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 04f299b64e73f50afc188c2590ebebc6b73ed744
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 23:31:44 +0300
Build: Update m4/ax_pthread.m4 from Autoconf Archive.
m4/ax_pthread.m4 | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
commit 59c4d6e1390f6f4176f43ac1dad1f7ac03c449b8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 23:28:34 +0300
Build: Add configure option --disable-microlzma.
MicroLZMA was made for EROFS and used by erofs-utils.
It might be used by something else in the future but
those wanting a smaller build for specific situations
can now disable this rarely-needed feature.
configure.ac | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
commit 054ccd6d14b2cc6eddc56897af280d3221414150
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 23:09:11 +0300
xz: Fix --single-stream with an empty .xz Stream.
Example:
$ xz -dc --single-stream good-0-empty.xz
xz: good-0-empty.xz: Internal error (bug)
The code, that is tries to catch some input file issues early,
didn't anticipate LZMA_STREAM_END which is possible in that
code only when --single-stream is used.
src/xz/coder.c | 9 +++++++++
1 file changed, 9 insertions(+)
commit 563288ea705e83ff5cb292adf794650c263bca1d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 21:11:58 +0300
xz: Add support for OpenBSD's pledge() sandbox.
configure.ac | 12 +++++++++---
src/xz/file_io.c | 11 +++++++++++
src/xz/main.c | 13 +++++++++++++
src/xz/private.h | 2 +-
4 files changed, 34 insertions(+), 4 deletions(-)
commit f9913e8ee2ba0b1e4ff4d0aa4c001aae305ed944
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 19:07:17 +0300
xz: Fix decompressor behavior if input uses an unsupported check type.
Now files with unsupported check will make xz display
a warning, set the exit status to 2 (unless --no-warn is used),
and then decompress the file normally. This is how it was
supposed to work since the beginning but this was broken by
the commit 231c3c7098f1099a56abb8afece76fc9b8699f05, that is,
a little before 5.0.0 was released. The buggy behavior displayed
a message, set exit status 1 (error), and xz didn't attempt to
to decompress the file.
This doesn't matter today except for special builds that disable
CRC64 or SHA-256 at build time (but such builds should be used
in special situations only). The bug matters if new check type
is added in the future and an old xz version is used to decompress
such a file; however, it's likely that such files would use a new
filter too and an old xz wouldn't be able to decompress the file
anyway.
The first hunk in the commit is the actual fix. The second hunk
is a cleanup since LZMA_TELL_ANY_CHECK isn't used in xz.
There is a test file for unsupported check type but it wasn't
used by test_files.sh, perhaps due to different behavior between
xz and the simpler xzdec.
src/xz/coder.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
commit aa4fe145b9486adc454f44fd3e09be9add808a0f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 18:36:19 +0300
xz: Clarify the man page: input file isn't removed if an error occurs.
src/xz/xz.1 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 8b46ae8cdeddfd7dc01fec92971b8696e9a96c5d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 18:30:55 +0300
xz: Refactor to remove is_empty_filename().
Long ago it was used in list.c too but nowadays it's needed
only in io_open_src() so it's nicer to avoid a separate function.
src/xz/file_io.c | 4 +++-
src/xz/util.c | 12 ------------
src/xz/util.h | 4 ----
3 files changed, 3 insertions(+), 17 deletions(-)
commit 85624015978b0de294cff3df79006df987c552b1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-25 18:23:54 +0300
xz: If input file cannot be removed, treat it as a warning, not error.
Treating it as a warning (message + exit status 2) matches gzip
and it seems more logical as at that point the output file has
already been successfully closed. When it's a warning it is
possible to suppress it with --no-warn.
src/xz/file_io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit fda9f85f52c546f7ca0313cf89481da4707fecb3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-24 16:25:09 +0300
liblzma: Threaded decoder: Stop the worker threads on errors.
It's waste of CPU time and electricity to leave the unfinished
worker threads running when it is known that their output will
get ignored.
src/liblzma/common/stream_decoder_mt.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
commit 2611c4d90535652d3eb7ef4a026a6691276fab43
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-20 20:22:50 +0300
tuklib_cpucores: Use HW_NCPUONLINE on OpenBSD.
On OpenBSD the number of cores online is often less
than what HW_NCPU would return because OpenBSD disables
simultaneous multi-threading (SMT) by default.
Thanks to Christian Weisgerber.
m4/tuklib_cpucores.m4 | 5 +++++
src/common/tuklib_cpucores.c | 9 +++++++++
2 files changed, 14 insertions(+)
commit 424ac91c7e0419393ff2bde4f62e21fa611c776d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-19 19:39:35 +0300
Tests: Skip tests in test_*.sh if encoders and/or decoders are disabled.
This isn't perfect as the scripts can still fail if only
certain filters are disabled. This is still an improvement
as now "make check" has better behavior when all encoders
or decoders are disabled.
Grepping ../config.h is simple and fairly clean but it only
works if config.h was created. CMake builds don't create
config.h but they don't use these test scripts either.
Thanks to Sebastian Andrzej Siewior for reporting the problem.
Thanks to Jia Tan for the original patch which grepped xz
error messages instead of config.h.
tests/test_compress.sh | 12 ++++++++++++
tests/test_files.sh | 11 +++++++++++
tests/test_scripts.sh | 11 +++++++++++
3 files changed, 34 insertions(+)
commit ca8bf9d7c5a30be8ba1eeb106fd892f19e83ed09
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-19 18:54:34 +0300
Test: Remove the (exit 1) lines.
I suspect that I used these in the original version because
Autoconf's manual describes that such a trick is needed in
some specific situations for portability reasons. None of those
situations listed on Autoconf 2.71 manual apply to these test
scripts though so this cleans them up.
tests/test_compress.sh | 10 ----------
tests/test_files.sh | 9 ---------
tests/test_scripts.sh | 6 ------
3 files changed, 25 deletions(-)
commit 82fcb7cfc17ce62f79ebc7ca2374e1daca5e4d5e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-19 17:14:57 +0300
Tests: Fix a warning in test_memlimit.c when decoders are disabled.
tests/test_memlimit.c | 3 +++
1 file changed, 3 insertions(+)
commit b5f8271b45b9b0e59485ffba3640ca3418835ec4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-19 17:11:46 +0300
Tests: Add test_memlimit to .gitignore.
Thanks to Jia Tan.
.gitignore | 1 +
1 file changed, 1 insertion(+)
commit 6a86e81cab202d0a812a7b2e9efacaf70c58ba38
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-10-06 21:53:09 +0300
Tests: Refactor test_stream_flags.c.
Converts test_stream_flags to tuktest. Also the test will now
compile and skip properly if encoders or decoders are disabled.
Thanks to Sebastian Andrzej Siewior.
tests/test_stream_flags.c | 533 ++++++++++++++++++++++++++++++++++++----------
1 file changed, 416 insertions(+), 117 deletions(-)
commit 827ac5b4821491fd3afe0d0e1ddac326253aeb66
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-10-06 17:00:38 +0800
Tests: Refactor test_block_header.c.
test_block_header now achieves higher test coverage. Also the
test will now compile and skip properly if encoders or decoders
are disabled.
Thanks to Sebastian Andrzej Siewior.
tests/test_block_header.c | 486 +++++++++++++++++++++++++++++++++++-----------
1 file changed, 370 insertions(+), 116 deletions(-)
commit 84963318952064a93bfc52edd6b0ef70593384ee
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-10-05 23:54:12 +0800
Tests: Fix compilation issues.
test_bcj_exact_size, test_check, test_hardware, and test_index will
all now compile and skip properly if encoders or decoders are disabled.
Also fixed a small typo (disabed -> disabled).
Thanks to Sebastian Andrzej Siewior.
tests/test_bcj_exact_size.c | 20 ++++++++++++++------
tests/test_check.c | 8 +++++++-
tests/test_hardware.c | 2 +-
tests/test_index.c | 6 ++++++
tests/test_memlimit.c | 16 +++++++++++++++-
tests/test_vli.c | 13 +++++++++++++
6 files changed, 56 insertions(+), 9 deletions(-)
commit 7dcabeec63d46b436fa5f043c3d1f09d0e15be16
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-05 16:20:47 +0300
Tests: Include mythread.h in the tests that use MYTHREAD_ENABLED.
tests/test_check.c | 1 +
tests/test_hardware.c | 1 +
tests/test_memlimit.c | 1 +
3 files changed, 3 insertions(+)
commit 14af758a770c7781af18fb66d6d21ee5b1c27f04
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-10-05 20:57:16 +0800
liblzma: Fix a compilation issue when encoders are disabled.
When encoders were disabled and threading enabled, outqueue.c and
outqueue.h were not compiled. The multi threaded decoder required
these files, so compilation failed.
src/liblzma/common/Makefile.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 6ca5c354bd4620aa7f81da68870eef1b1f26288f
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-10-05 16:41:38 +0800
Tests: Fix compilation error when threading support has been disabled.
Now tests that require threading are skipped when threading
support has been disabled.
Thanks to Sebastian Andrzej Siewior.
tests/test_check.c | 4 ++++
tests/test_hardware.c | 4 ++++
tests/test_memlimit.c | 4 ++++
3 files changed, 12 insertions(+)
commit fae37ad2affd8fe8871f4ff93d5cab5ec14d5e58
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-10-05 14:26:00 +0300
tuklib_integer: Add 64-bit endianness-converting reads and writes.
Also update the comment in liblzma's memcmplen.h.
Thanks to Michał Górny for the original patch for the reads.
m4/tuklib_integer.m4 | 8 ++++----
src/common/tuklib_integer.h | 46 ++++++++++++++++++++++++++++++++++++++++--
src/liblzma/common/memcmplen.h | 9 +++------
3 files changed, 51 insertions(+), 12 deletions(-)
commit 508a44372c5b0dede8863fd0d358d4a9d8645c95
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-30 12:06:13 +0300
liblzma: Add API doc note about the .xz decoder LZMA_MEMLIMIT_ERROR bug.
The bug was fixed in 660739f99ab211edec4071de98889fb32ed04e98.
src/liblzma/api/lzma/base.h | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 8cc9874a7974cd575aee44f218836f7acdbeb0ed
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-09-21 16:15:50 +0800
liblzma: Add dest and src NULL checks to lzma_index_cat.
The documentation states LZMA_PROG_ERROR can be returned from
lzma_index_cat. Previously, lzma_index_cat could not return
LZMA_PROG_ERROR. Now, the validation is similar to
lzma_index_append, which does a NULL check on the index
parameter.
src/liblzma/common/index.c | 3 +++
1 file changed, 3 insertions(+)
commit afd5a8bf5374eba82804a999e1ea7af680784086
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-09-21 20:29:28 +0800
Tests: Create a test for the lzma_index_cat bug.
tests/test_index.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
commit 3d5a99ca373a4e86faf671226ca6487febb9eeac
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-09-21 19:28:53 +0800
liblzma: Fix copying of check type statistics in lzma_index_cat().
The check type of the last Stream in dest was never copied to
dest->checks (the code tried to copy it but it was done too late).
This meant that the value returned by lzma_index_checks() would
only include the check type of the last Stream when multiple
lzma_indexes had been concatenated.
In xz --list this meant that the summary would only list the
check type of the last Stream, so in this sense this was only
a visual bug. However, it's possible that some applications
use this information for purposes other than merely showing
it to the users in an informational message. I'm not aware of
such applications though and it's quite possible that such
applications don't exist.
Regular streamed decompression in xz or any other application
doesn't use lzma_index_cat() and so this bug cannot affect them.
src/liblzma/common/index.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit a61d32172789735350a941e23baf6b587c49e5d9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-28 12:20:41 +0300
tuklib_physmem: Fix Unicode builds on Windows.
Thanks to ArSaCiA Game.
src/common/tuklib_physmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5a4d3548ab214fdca364d5c734baf1d1fab47308
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-28 11:12:07 +0300
Tests: Add test_memlimit.c to test restarting after LZMA_MEMLIMIT_ERROR.
tests/Makefile.am | 2 +
tests/test_memlimit.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 153 insertions(+)
commit 660739f99ab211edec4071de98889fb32ed04e98
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-28 11:05:15 +0300
liblzma: Stream decoder: Fix restarting after LZMA_MEMLIMIT_ERROR.
If lzma_code() returns LZMA_MEMLIMIT_ERROR it is now possible
to use lzma_memlimit_set() to increase the limit and continue
decoding. This was supposed to work from the beginning but
there was a bug. With other decoders (.lzma or threaded .xz)
this already worked correctly.
src/liblzma/common/stream_decoder.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
commit 7e68fda58c74ad9e5b876cc22fcbe80fc0e4747b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-28 11:00:23 +0300
liblzma: Stream decoder: Fix comments.
src/liblzma/common/stream_decoder.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
commit f664cb25841fc1c478b819034a224a558e2ac6e7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-20 16:58:22 +0300
liblzma: ARM64: Add comments.
src/liblzma/simple/arm64.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit b557b4a0eea05470fae8ba5ef4ad5a6dfb36ac41
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-20 16:27:50 +0300
liblzma: ARM64: Fix wrong comment in API doc.
Thanks to Jia Tan.
src/liblzma/api/lzma/bcj.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit d5b0906fa55157f48c200188a3951d80df9cb308
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-19 20:24:26 +0300
xz: Add --experimental-arm64[=width=WIDTH].
It will be renamed to --arm64 once it is stable.
Man page or --long-help weren't updated yet.
src/xz/args.c | 7 +++++++
src/xz/message.c | 7 +++++++
src/xz/options.c | 39 +++++++++++++++++++++++++++++++++++++++
src/xz/options.h | 7 +++++++
4 files changed, 60 insertions(+)
commit ecb966de308c255bb4735a7307ef9901c643a9de
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-19 19:34:56 +0300
liblzma: Add experimental ARM64 BCJ filter with a temporary Filter ID.
That is, the Filter ID will be changed once the design is final.
The current version will be removed. So files created with the
tempoary Filter ID won't be supported in the future.
CMakeLists.txt | 3 +
configure.ac | 4 +-
src/liblzma/api/lzma/bcj.h | 35 +++++-
src/liblzma/common/filter_common.c | 9 ++
src/liblzma/common/filter_decoder.c | 8 ++
src/liblzma/common/filter_encoder.c | 11 ++
src/liblzma/simple/Makefile.inc | 4 +
src/liblzma/simple/arm64.c | 227 ++++++++++++++++++++++++++++++++++++
src/liblzma/simple/simple_coder.h | 9 ++
src/liblzma/simple/simple_decoder.h | 4 +
src/liblzma/simple/simple_encoder.h | 2 +
11 files changed, 313 insertions(+), 3 deletions(-)
commit 177bdc922cb17bd0fd831ab8139dfae912a5c2b8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-17 22:42:18 +0300
liblzma: Simple/BCJ filters: Allow disabling generic BCJ options.
This will be needed for the ARM64 BCJ filter as it will use
its own options struct.
src/liblzma/simple/arm.c | 2 +-
src/liblzma/simple/armthumb.c | 2 +-
src/liblzma/simple/ia64.c | 2 +-
src/liblzma/simple/powerpc.c | 2 +-
src/liblzma/simple/simple_coder.c | 4 ++--
src/liblzma/simple/simple_private.h | 2 +-
src/liblzma/simple/sparc.c | 2 +-
src/liblzma/simple/x86.c | 3 ++-
8 files changed, 10 insertions(+), 9 deletions(-)
commit c3592d0a55114144686ecf960cb516d6b31c98e9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-16 17:08:53 +0300
Tests: Add a test file for lzma_index_append() integer overflow bug.
This test fails before commit 18d7facd3802b55c287581405c4d49c98708c136.
test_files.sh now runs xz -l for bad-3-index-uncomp-overflow.xz
because only then the previously-buggy code path gets tested.
Normal decompression doesn't use lzma_index_append() at all.
Instead, lzma_index_hash functions are used and those already
did the overflow check.
tests/files/README | 10 ++++++++++
tests/files/bad-3-index-uncomp-overflow.xz | Bin 0 -> 132 bytes
tests/test_files.sh | 8 ++++++++
3 files changed, 18 insertions(+)
commit 982b29f828079a2a26253a40e975127a40a7d2bd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-16 15:10:07 +0300
Translations: Add Turkish translation.
po/LINGUAS | 1 +
po/tr.po | 977 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 978 insertions(+)
commit 1fc088d9f6d1697924aaeac8cd1fb9918d1532e2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-16 14:09:07 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 097c7b67ce86ff16a7cef7631b39e5ca4ee3d420
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-16 14:07:03 +0300
xzgrep: Fix compatibility with old shells.
Running the current xzgrep on Slackware 10.1 with GNU bash 3.00.15:
xzgrep: line 231: syntax error near unexpected token `;;'
On SCO OpenServer 5.0.7 with Korn Shell 93r:
syntax error at line 231 : `;;' unexpected
Turns out that some old shells don't like apostrophes (') inside
command substitutions. For example, the following fails:
x=$(echo foo
# asdf'zxcv
echo bar)
printf '%s\n' "$x"
The problem was introduced by commits
69d1b3fc29677af8ade8dc15dba83f0589cb63d6 (2022-03-29),
bd7b290f3fe4faeceb7d3497ed9bf2e6ed5e7dc5 (2022-07-18), and
a648978b20495b7aa4a8b029c5a810b5ad9d08ff (2022-07-19).
5.2.6 is the only stable release that included
this problem.
Thanks to Kevin R. Bulgrien for reporting the problem
on SCO OpenServer 5.0.7 and for providing the fix.
src/scripts/xzgrep.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit f2d084fe3f0d6d71488bfc6987f26542f67bfd99
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-09 14:12:30 +0300
Tests: Silence warnings about unused functions from tuktest.h.
Warnings about unused tuktest_run_test conveniently tell which
test programs haven't been converted to tuktest.h yet but I
silenced that warning too for now anyway.
It is fine to use __attribute__((__unused__)) even when the
function is actually used because the attribute only means
that the function might be unused.
tests/tuktest.h | 10 ++++++++++
1 file changed, 10 insertions(+)
commit f8ee61e74eb40600445fdb601c374d582e1e9c8a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-09 13:51:57 +0300
liblzma: lzma_filters_copy: Keep dest[] unmodified if an error occurs.
lzma_stream_encoder() and lzma_stream_encoder_mt() always assumed
this. Before this patch, failing lzma_filters_copy() could result
in free(invalid_pointer) or invalid memory reads in stream_encoder.c
or stream_encoder_mt.c.
To trigger this, allocating memory for a filter options structure
has to fail. These are tiny allocations so in practice they very
rarely fail.
Certain badness in the filter chain array could also make
lzma_filters_copy() fail but both stream_encoder.c and
stream_encoder_mt.c validate the filter chain before
trying to copy it, so the crash cannot occur this way.
src/liblzma/api/lzma/filter.h | 4 +++-
src/liblzma/common/filter_common.c | 18 ++++++++++++------
2 files changed, 15 insertions(+), 7 deletions(-)
commit 18d7facd3802b55c287581405c4d49c98708c136
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-09-02 20:18:55 +0800
liblzma: lzma_index_append: Add missing integer overflow check.
The documentation in src/liblzma/api/lzma/index.h suggests that
both the unpadded (compressed) size and the uncompressed size
are checked for overflow, but only the unpadded size was checked.
The uncompressed check is done first since that is more likely to
occur than the unpadded or index field size overflows.
src/liblzma/common/index.c | 4 ++++
1 file changed, 4 insertions(+)
commit 9ac06cb5b85274d18f9f70d82cf2d8c9c1151bd4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-08 15:11:08 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit ba3e4ba2de034ae93a513f9c3a0823b80cdb66dc
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-09-08 15:07:00 +0300
CMake: Clarify a comment about Windows symlinks without file extension.
CMakeLists.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 17485e884ce5c74315f29a8a1507bc706cd5cd1d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-08 15:02:41 +0300
CMake: Update for liblzma_*.map files and fix wrong common_w32res.rc dep.
The previous commit split liblzma.map into liblzma_linux.map and
liblzma_generic.map. This commit updates the CMake build for those.
common_w32res.rc dependency was listed under Linux/FreeBSD while
obviously it belongs to Windows when building a DLL.
CMakeLists.txt | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
commit 913ddc5572b9455fa0cf299be2e35c708840e922
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-09-04 23:23:00 +0300
liblzma: Vaccinate against an ill patch from RHEL/CentOS 7.
RHEL/CentOS 7 shipped with 5.1.2alpha, including the threaded
encoder that is behind #ifdef LZMA_UNSTABLE in the API headers.
In 5.1.2alpha these symbols are under XZ_5.1.2alpha in liblzma.map.
API/ABI compatibility tracking isn't done between development
releases so newer releases didn't have XZ_5.1.2alpha anymore.
Later RHEL/CentOS 7 updated xz to 5.2.2 but they wanted to keep
the exported symbols compatible with 5.1.2alpha. After checking
the ABI changes it turned out that >= 5.2.0 ABI is backward
compatible with the threaded encoder functions from 5.1.2alpha
(but not vice versa as fixes and extensions to these functions
were made between 5.1.2alpha and 5.2.0).
In RHEL/CentOS 7, XZ Utils 5.2.2 was patched with
xz-5.2.2-compat-libs.patch to modify liblzma.map:
- XZ_5.1.2alpha was added with lzma_stream_encoder_mt and
lzma_stream_encoder_mt_memusage. This matched XZ Utils 5.1.2alpha.
- XZ_5.2 was replaced with XZ_5.2.2. It is clear that this was
an error; the intention was to keep using XZ_5.2 (XZ_5.2.2
has never been used in XZ Utils). So XZ_5.2.2 lists all
symbols that were listed under XZ_5.2 before the patch.
lzma_stream_encoder_mt and _mt_memusage are included too so
they are listed both here and under XZ_5.1.2alpha.
The patch didn't add any __asm__(".symver ...") lines to the .c
files. Thus the resulting liblzma.so exports the threaded encoder
functions under XZ_5.1.2alpha only. Listing the two functions
also under XZ_5.2.2 in liblzma.map has no effect without
matching .symver lines.
The lack of XZ_5.2 in RHEL/CentOS 7 means that binaries linked
against unpatched XZ Utils 5.2.x won't run on RHEL/CentOS 7.
This is unfortunate but this alone isn't too bad as the problem
is contained within RHEL/CentOS 7 and doesn't affect users
of other distributions. It could also be fixed internally in
RHEL/CentOS 7.
The second problem is more serious: In XZ Utils 5.2.2 the API
headers don't have #ifdef LZMA_UNSTABLE for obvious reasons.
This is true in RHEL/CentOS 7 version too. Thus now programs
using new APIs can be compiled without an extra #define. However,
the programs end up depending on symbol version XZ_5.1.2alpha
(and possibly also XZ_5.2.2) instead of XZ_5.2 as they would
with an unpatched XZ Utils 5.2.2. This means that such binaries
won't run on other distributions shipping XZ Utils >= 5.2.0 as
they don't provide XZ_5.1.2alpha or XZ_5.2.2; they only provide
XZ_5.2 (and XZ_5.0). (This includes RHEL/CentOS 8 as the patch
luckily isn't included there anymore with XZ Utils 5.2.4.)
Binaries built by RHEL/CentOS 7 users get distributed and then
people wonder why they don't run on some other distribution.
Seems that people have found out about the patch and been copying
it to some build scripts, seemingly curing the symptoms but
actually spreading the illness further and outside RHEL/CentOS 7.
The ill patch seems to be from late 2016 (RHEL 7.3) and in 2017 it
had spread at least to EasyBuild. I heard about the events only
recently. :-(
This commit splits liblzma.map into two versions: one for
GNU/Linux and another for other OSes that can use symbol versioning
(FreeBSD, Solaris, maybe others). The Linux-specific file and the
matching additions to .c files add full compatibility with binaries
that have been built against a RHEL/CentOS-patched liblzma. Builds
for OSes other than GNU/Linux won't get the vaccine as they should
be immune to the problem (I really hope that no build script uses
the RHEL/CentOS 7 patch outside GNU/Linux).
The RHEL/CentOS compatibility symbols XZ_5.1.2alpha and XZ_5.2.2
are intentionally put *after* XZ_5.2 in liblzma_linux.map. This way
if one forgets to #define HAVE_SYMBOL_VERSIONS_LINUX when building,
the resulting liblzma.so.5 will have lzma_stream_encoder_mt@@XZ_5.2
since XZ_5.2 {...} is the first one that lists that function.
Without HAVE_SYMBOL_VERSIONS_LINUX @XZ_5.1.2alpha and @XZ_5.2.2
will be missing but that's still a minor problem compared to
only having lzma_stream_encoder_mt@@XZ_5.1.2alpha!
The "local: *;" line was moved to XZ_5.0 so that it doesn't need
to be moved around. It doesn't matter where it is put.
Having two similar liblzma_*.map files is a bit silly as it is,
at least for now, easily possible to generate the generic one
from the Linux-specific file. But that adds extra steps and
increases the risk of mistakes when supporting more than one
build system. So I rather maintain two files in parallel and let
validate_map.sh check that they are in sync when "make mydist"
is run.
This adds .symver lines for lzma_stream_encoder_mt@XZ_5.2.2 and
lzma_stream_encoder_mt_memusage@XZ_5.2.2 even though these
weren't exported by RHEL/CentOS 7 (only @@XZ_5.1.2alpha was
for these two). I added these anyway because someone might
misunderstand the RHEL/CentOS 7 patch and think that @XZ_5.2.2
(@@XZ_5.2.2) versions were exported too.
At glance one could suggest using __typeof__ to copy the function
prototypes when making aliases. However, this doesn't work trivially
because __typeof__ won't copy attributes (lzma_nothrow, lzma_pure)
and it won't change symbol visibility from hidden to default (done
by LZMA_API()). Attributes could be copied with __copy__ attribute
but that needs GCC 9 and a fallback method would be needed anyway.
This uses __symver__ attribute with GCC >= 10 and
__asm__(".symver ...") with everything else. The attribute method
is required for LTO (-flto) support with GCC. Using -flto with
GCC older than 10 is now broken on GNU/Linux and will not be fixed
(can silently result in a broken liblzma build that has dangerously
incorrect symbol versions). LTO builds with Clang seem to work
with the traditional __asm__(".symver ...") method.
Thanks to Boud Roukema for reporting the problem and discussing
the details and testing the fix.
configure.ac | 23 +++-
src/liblzma/Makefile.am | 10 +-
src/liblzma/common/block_buffer_encoder.c | 18 ++++
src/liblzma/common/common.c | 14 +++
src/liblzma/common/common.h | 28 +++++
src/liblzma/common/hardware_cputhreads.c | 12 +++
src/liblzma/common/stream_encoder_mt.c | 42 ++++++++
src/liblzma/{liblzma.map => liblzma_generic.map} | 6 +-
src/liblzma/liblzma_linux.map | 131 +++++++++++++++++++++++
src/liblzma/validate_map.sh | 113 +++++++++++++++++--
10 files changed, 382 insertions(+), 15 deletions(-)
commit 80a1a8bb838842a2be343bd88ad1462c21c5e2c9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-31 16:42:04 +0300
CMake: Add xz symlinks.
These are a minor thing especially since the xz build has
some real problems still like lack of large file support
on 32-bit systems but I'll commit this since the code exists.
Thanks to Jia Tan.
CMakeLists.txt | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
commit a4193bb6d85d7765b1b87faeab3e50106d3ab2e9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-31 16:29:38 +0300
CMake: Put xz man page install under if(UNIX) like is for xzdec.
Thanks to Jia Tan.
CMakeLists.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit c1555b1a221a1427d4d650647531016d754bc4da
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-22 18:16:40 +0300
Bump version number for 5.3.3alpha.
src/liblzma/api/lzma/version.h | 2 +-
src/liblzma/liblzma.map | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 44fedddc11c3f6ec2f7fe35a3e38f15ca93f90eb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-22 18:13:56 +0300
Add NEWS for 5.3.3alpha.
NEWS | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 119 insertions(+)
commit a93e235d7ca764cc19f8f9f9063b40ff361c3cfa
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-12 17:59:41 +0300
Translations: Add Portuguese translation.
Jia Tan made white-space changes and also changed "Language: pt_BR\n"
to pt. The translator wasn't reached so I'm hoping these changes
are OK and will commit it without translator's approval.
Thanks to Pedro Albuquerque and Jia Tan.
po/LINGUAS | 1 +
po/pt.po | 1001 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 1002 insertions(+)
commit e7cf5a946f25e40d77f45e41f0dee7d42a04e9ae
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-10 21:16:40 +0300
Translations: Add Serbian translation.
Quite a few white-space changes were made by Jia Tan to make
this look good. Contacting the translator didn't succeed so
I'm committing this without getting translator's approval.
Thanks to Мирослав Николић (Miroslav Nikolic) and Jia Tan.
po/LINGUAS | 1 +
po/sr.po | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 988 insertions(+)
commit cc8617ab53b1f2a4da212fa76c92fe538269c5de
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-04 23:51:36 +0300
Translations: Add Swedish translation.
Thanks to Sebastian Rasmussen and Jia Tan.
po/LINGUAS | 1 +
po/sv.po | 983 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 984 insertions(+)
commit c613598c358b640682d0ca2aed38fa7df763e8c7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-04 23:40:27 +0300
Translations: Add Esperanto translation.
Thanks to Keith Bowes and Jia Tan.
po/LINGUAS | 1 +
po/eo.po | 984 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 985 insertions(+)
commit 659a587d678f21e98e91d2751c31d4ce050c081a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-01 00:22:33 +0300
Translations: Add Catalan translation.
Thanks to Jordi Mas and Jia Tan.
po/LINGUAS | 1 +
po/ca.po | 1076 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 1077 insertions(+)
commit 739fd8c9bdf1d85f57d56642aad87148d4779530
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-30 17:47:08 +0300
Translations: Add Ukrainian translation.
Thanks to Yuri Chornoivan and Jia Tan.
po/LINGUAS | 1 +
po/uk.po | 996 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 997 insertions(+)
commit 73280550b111930c62a667e56add8fd574f80bc8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-30 17:45:26 +0300
Translators: Add Romanian translation.
Thanks to Remus-Gabriel Chelu and Jia Tan.
po/LINGUAS | 1 +
po/ro.po | 1016 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 1017 insertions(+)
commit 2465f5b825152714b2c357d96c2422c31109d320
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-29 18:33:32 +0300
Translations: Update Brazilian Portuguese translation.
One msgstr was changed. The diff is long due to changes
in the source code line numbers in the comments.
Thanks to Rafael Fontenelle.
po/pt_BR.po | 186 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 92 insertions(+), 94 deletions(-)
commit 434e1ffd3e62719d509da10b646216f5ef53fe4d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-29 18:04:44 +0300
Translations: Add Croatian translation.
Thanks to Božidar Putanec and Jia Tan.
po/LINGUAS | 1 +
po/hr.po | 987 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 988 insertions(+)
commit 0732d0f7065c9bd48bfe4f5983144ae970c4a499
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-29 17:58:48 +0300
Translations: Add Spanish translation.
Thanks to Cristian Othón Martínez Vera and Jia Tan.
po/LINGUAS | 1 +
po/es.po | 984 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 985 insertions(+)
commit 9899b0f82bc130998d1f1f618a6ab805b73f2696
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-29 17:49:43 +0300
Translations: Add Korean translation.
Thanks to Seong-ho Cho and Jia Tan.
po/LINGUAS | 1 +
po/ko.po | 972 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 973 insertions(+)
commit 65217eaf6bd195f3ef027d4ac55d57b7d133d69f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-16 21:57:21 +0200
Translations: Rebuild cs.po to avoid incorrect fuzzy strings.
"make dist" updates the .po files and the fuzzy strings would
result in multiple very wrong translations.
po/cs.po | 592 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 322 insertions(+), 270 deletions(-)
commit e56ff423ee7af9e648e16b132f0d835d2cb4db26
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-16 17:30:39 +0200
Translations: Add partial Danish translation.
I made a few minor white space changes without getting them
approved by the Danish translation team.
po/LINGUAS | 1 +
po/da.po | 896 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 897 insertions(+)
commit 43e09c62e77cb8807d932c81de4decbdb956e184
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 22:37:54 +0200
Translations: Add hu, zh_CN, and zh_TW.
I made a few white space changes to these without getting them
approved by the translation teams. (I tried to contact the hu and
zh_TW teams but didn't succeed. I didn't contact the zh_CN team.)
po/LINGUAS | 3 +
po/hu.po | 985 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_CN.po | 963 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_TW.po | 956 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 2907 insertions(+)
commit 982b6b198ae1ffe6093236dd8a3d03d1415b912b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 14:33:30 +0200
Translations: Update vi.po to match the file from the TP.
The translated strings haven't been updated but word wrapping
is different.
po/vi.po | 407 ++++++++++++++++++++++++++++-----------------------------------
1 file changed, 179 insertions(+), 228 deletions(-)
commit 801f39691fc4abc6dd33d7653d498781b593f3eb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 14:18:03 +0200
Translations: Add fi and pt_BR, and update de, fr, it, and pl.
The German translation isn't identical to the file in
the Translation Project but the changes (white space changes
only) were approved by the translator Mario Blättermann.
po/LINGUAS | 2 +
po/de.po | 476 ++++++++++++++--------------
po/fi.po | 974 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/fr.po | 272 ++++++++--------
po/it.po | 479 ++++++++++++----------------
po/pl.po | 239 +++++++-------
po/pt_BR.po | 1001 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 2697 insertions(+), 746 deletions(-)
commit 311e4f85ede5d2f0bb71f3ad70b5b7db1b5adf33
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-22 17:27:19 +0300
xz: Try to clarify --memlimit-mt-decompress vs. --memlimit-compress.
src/xz/xz.1 | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
commit df23c31000283c00e5ef1ca32a0bc3bb757bd707
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-22 16:46:18 +0300
CMake: Add liblzma tests.
Thanks to Jia Tan for the patch.
CMakeLists.txt | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
commit 02a777f9c422d3b5ec895078530bb1a2b6f7bdf5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-19 23:32:22 +0300
xz: Revise --info-memory output.
The strings could be more descriptive but it's good
to have some version of this committed now.
--robot mode wasn't changed yet.
src/xz/hardware.c | 32 ++++++++++++++++++++++++++------
src/xz/xz.1 | 1 +
2 files changed, 27 insertions(+), 6 deletions(-)
commit f864f6d42eab57ea8ed82cc2dd19a03b51377442
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-19 23:12:02 +0300
xz: Update the man page for threaded decompression and memlimits.
This documents the changes made in commits
6c6da57ae2aa962aabde6892442227063d87e88c,
cad299008cf73ec566f0662a9cf2b94f86a99659, and
898faa97287a756231c663a3ed5165672b417207.
The --info-memory bit hasn't been finished yet
even though it's already mentioned in this commit
under --memlimit-mt-decompress and --threads.
src/xz/xz.1 | 148 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 121 insertions(+), 27 deletions(-)
commit d13bfcc0056617dd648f655a01653932fad7067f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-18 17:49:16 +0300
Build: Include the CMake files in the distribution.
This was supposed to be done in 2020 with 5.2.5 release
already but it was noticed only today. 5.2.5 and 5.2.6
even mention experiemental CMake support in the NEWS entries.
Thanks to Olivier B. for reporting the problem.
Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit e66787bcfefdb93f19c974f895f65969a77937b0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-18 17:38:05 +0300
Windows: Fix broken liblzma.dll build with Visual Studio project files.
The bug was introduced in 352ba2d69af2136bc814aa1df1a132559d445616
"Windows: Fix building of resource files when config.h isn't used."
That commit fixed liblzma.dll build with CMake while keeping it
working with Autotools on Windows but the VS project files were
forgotten.
I haven't tested these changes.
Thanks to Olivier B. for reporting the bug and for the initial patch.
windows/vs2013/liblzma_dll.vcxproj | 6 ++++++
windows/vs2017/liblzma_dll.vcxproj | 6 ++++++
windows/vs2019/liblzma_dll.vcxproj | 6 ++++++
3 files changed, 18 insertions(+)
commit c4e8e5fb311225b8b48d34157891a640b2535e0c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-18 17:16:49 +0300
liblzma: Threaded decoder: Improve LZMA_FAIL_FAST when LZMA_FINISH is used.
It will now return LZMA_DATA_ERROR (not LZMA_OK or LZMA_BUF_ERROR)
if LZMA_FINISH is used and there isn't enough input to finish
decoding the Block Header or the Block. The use of LZMA_DATA_ERROR
is simpler and the less risky than LZMA_BUF_ERROR but this might
be changed before 5.4.0.
src/liblzma/api/lzma/container.h | 6 +++++
src/liblzma/common/stream_decoder_mt.c | 42 ++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
commit 6dcf606e7efa2b259f0262f9e2f61e00116842d3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-12 18:31:47 +0300
Add NEWS for 5.2.6.
NEWS | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 121 insertions(+)
commit 413b86fcf8934fae5a004f378a9483d37d8fcaab
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-08-12 14:28:41 +0300
Add Jia Tan to AUTHORS.
AUTHORS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 352672732c346c546ff3c26d0605bc0ed1c8b7c7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-25 19:28:26 +0300
Build: Start the generated ChangeLog from around 5.2.0 instead of 5.0.0.
This makes ChangeLog smaller.
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6f6d11225d6016be2bbb55d845b66f6b04d048df
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-25 19:11:05 +0300
Translations: Change the copyright comment string to use with po4a.
This affects the second line in po4a/xz-man.pot. The man pages of
xzdiff, xzgrep, and xzmore are from GNU gzip and under GNU GPLv2+
while the rest of the man pages are in the public domain.
po4a/update-po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 61f8ec804abdb4c5dac01e8ae9b90c7be58a5c24
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-07-25 18:30:05 +0300
liblzma: Refactor lzma_mf_is_supported() to use a switch-statement.
src/liblzma/lz/lz_encoder.c | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
commit 4d80b463a1251aa22eabc87d2732fec13b1adda6
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-07-25 18:20:01 +0300
Build: Don't allow empty LIST in --enable-match-finders=LIST.
It's enforced only when a match finder is needed, that is,
when LZMA1 or LZMA2 encoder is enabled.
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
commit 9cc721af5436908f2d5a828aebbc4050a32a3487
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-24 13:27:48 +0300
xz: Update the man page that change to --keep will be in 5.2.6.
src/xz/xz.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit b81bf0c7d1873e52a4086a9abb494471d652cb55
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-19 23:23:54 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 340cf1ec3927767046b8293a49da3db4e393f426
Author: Nicholas Jackson <nickajacks1@gmail.com>
Date: 2022-07-17 17:39:23 -0700
CMake: Add missing source file to liblzma build
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
commit d796b6d7fdb8b7238b277056cf9146cce25db604
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-19 23:19:49 +0300
xzgrep man page: Document exit statuses.
src/scripts/xzgrep.1 | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit 923bf96b55e5216a6c8df9d8331934f54784390e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-19 23:13:24 +0300
xzgrep: Improve error handling, especially signals.
xzgrep wouldn't exit on SIGPIPE or SIGQUIT when it clearly
should have. It's quite possible that it's not perfect still
but at least it's much better.
If multiple exit statuses compete, now it tries to pick
the largest of value.
Some comments were added.
The exit status handling of signals is still broken if the shell
uses values larger than 255 in $? to indicate that a process
died due to a signal ***and*** their "exit" command doesn't take
this into account. This seems to work well with the ksh and yash
versions I tried. However, there is a report in gzip/zgrep that
OpenSolaris 5.11 (not 5.10) has a problem with "exit" truncating
the argument to 8 bits:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22900#25
Such a bug would break xzgrep but I didn't add a workaround
at least for now. 5.11 is old and I don't know if the problem
exists in modern descendants, or if the problem exists in other
ksh implementations in use.
src/scripts/xzgrep.in | 72 +++++++++++++++++++++++++++++++++++++--------------
1 file changed, 53 insertions(+), 19 deletions(-)
commit a648978b20495b7aa4a8b029c5a810b5ad9d08ff
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-19 00:10:55 +0300
xzgrep: Make the fix for ZDI-CAN-16587 more robust.
I don't know if this can make a difference in the real world
but it looked kind of suspicious (what happens with sed
implementations that cannot process very long lines?).
At least this commit shouldn't make it worse.
src/scripts/xzgrep.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit bd7b290f3fe4faeceb7d3497ed9bf2e6ed5e7dc5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-18 21:52:31 +0300
xzgrep: Use grep -H --label when available (GNU, *BSDs).
It avoids the use of sed for prefixing filenames to output lines.
Using sed for that is slower and prone to security bugs so now
the sed method is only used as a fallback.
This also fixes an actual bug: When grepping a binary file,
GNU grep nowadays prints its diagnostics to stderr instead of
stdout and thus the sed-method for prefixing the filename doesn't
work. So with this commit grepping binary files gives reasonable
output with GNU grep now.
This was inspired by zgrep but the implementation is different.
src/scripts/xzgrep.in | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit b56729af9f1a596e57aeefd7570d8d7dce5c9f52
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-18 21:10:25 +0300
xzgrep: Use -e to specify the pattern to grep.
Now we don't need the separate test for adding the -q option
as it can be added directly in the two places where it's needed.
src/scripts/xzgrep.in | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
commit bad61b5997e6647911974022bfb72f3d4818a594
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-18 19:18:48 +0300
Scripts: Use printf instead of echo in a few places.
It's a good habbit as echo has some portability corner cases
when the string contents can be anything.
src/scripts/xzdiff.in | 6 +++---
src/scripts/xzgrep.in | 4 ++--
src/scripts/xzless.in | 4 ++--
src/scripts/xzmore.in | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
commit 6a4a4a7d2667837dc824c26fcb19ed6ca5aff645
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-17 21:36:25 +0300
xzgrep: Add more LC_ALL=C to avoid bugs with multibyte characters.
Also replace one use of expr with printf.
The rationale for LC_ALL=C was already mentioned in
69d1b3fc29677af8ade8dc15dba83f0589cb63d6 that fixed a security
issue. However, unrelated uses weren't changed in that commit yet.
POSIX says that with sed and such tools one should use LC_ALL=C
to ensure predictable behavior when strings contain byte sequences
that aren't valid multibyte characters in the current locale. See
under "Application usage" in here:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html
With GNU sed invalid multibyte strings would work without this;
it's documented in its Texinfo manual. Some other implementations
aren't so forgiving.
src/scripts/xzgrep.in | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
commit b48f9d615f2c2e8d2f6e253d0e48ee66d0652b68
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-17 20:55:16 +0300
xzgrep: Fix parsing of certain options.
Fix handling of "xzgrep -25 foo" (in GNU grep "grep -25 foo" is
an alias for "grep -C25 foo"). xzgrep would treat "foo" as filename
instead of as a pattern. This bug was fixed in zgrep in gzip in 2012.
Add -E, -F, -G, and -P to the "no argument required" list.
Add -X to "argument required" list. It is an
intentionally-undocumented GNU grep option so this isn't
an important option for xzgrep but it seems that other grep
implementations (well, those that I checked) don't support -X
so I hope this change is an improvement still.
grep -d (grep --directories=ACTION) requires an argument. In
contrast to zgrep, I kept -d in the "no argument required" list
because it's not supported in xzgrep (or zgrep). This way
"xzgrep -d" gives an error about option being unsupported instead
of telling that it requires an argument. Both zgrep and xzgrep
tell that it's unsupported if an argument is specified.
Add comments.
src/scripts/xzgrep.in | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
commit 2d2201bc6315deda4d43625aa510972467bd51d4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-14 20:33:05 +0300
Tests: Add the .lzma files to test_files.sh.
tests/test_files.sh | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
commit ce5549a591bf126300618879f5b24023351baff6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-14 19:37:42 +0300
Tests: Add .lzma test files.
tests/files/README | 63 ++++++++++++++++-----
tests/files/bad-too_big_size-with_eopm.lzma | Bin 0 -> 37 bytes
tests/files/bad-too_small_size-without_eopm-1.lzma | Bin 0 -> 31 bytes
tests/files/bad-too_small_size-without_eopm-2.lzma | Bin 0 -> 31 bytes
tests/files/bad-too_small_size-without_eopm-3.lzma | Bin 0 -> 36 bytes
tests/files/bad-unknown_size-without_eopm.lzma | Bin 0 -> 31 bytes
tests/files/good-known_size-with_eopm.lzma | Bin 0 -> 37 bytes
tests/files/good-known_size-without_eopm.lzma | Bin 0 -> 31 bytes
tests/files/good-unknown_size-with_eopm.lzma | Bin 0 -> 37 bytes
9 files changed, 50 insertions(+), 13 deletions(-)
commit 107c93ee5cad51a6ea0cee471209bfe8d76deaa3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-14 18:12:38 +0300
liblzma: Rename a variable and improve a comment.
src/liblzma/lzma/lzma_decoder.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
commit 511feb5eadb988d641b025d597f4fac7502003b8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-13 22:24:41 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 9595a3119b9faf0ce01375329cad8bbf85c35ea2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-13 22:24:07 +0300
liblzma: Add optional autodetection of LZMA end marker.
Turns out that this is needed for .lzma files as the spec in
LZMA SDK says that end marker may be present even if the size
is stored in the header. Such files are rare but exist in the
real world. The code in liblzma is so old that the spec didn't
exist in LZMA SDK back then and I had understood that such
files weren't possible (the lzma tool in LZMA SDK didn't
create such files).
This modifies the internal API so that LZMA decoder can be told
if EOPM is allowed even when the uncompressed size is known.
It's allowed with .lzma and not with other uses.
Thanks to Karl Beldan for reporting the problem.
doc/lzma-file-format.txt | 11 +++-
src/liblzma/common/alone_decoder.c | 2 +-
src/liblzma/common/microlzma_decoder.c | 2 +-
src/liblzma/lz/lz_decoder.c | 10 +++-
src/liblzma/lz/lz_decoder.h | 8 +--
src/liblzma/lzma/lzma2_decoder.c | 2 +-
src/liblzma/lzma/lzma_decoder.c | 99 ++++++++++++++++++++++++----------
7 files changed, 95 insertions(+), 39 deletions(-)
commit 0c0f8e9761eb6eaf199082cf144db7ac5f9d8cb2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-07-12 18:53:04 +0300
xz: Document the special memlimit case of 2000 MiB on MIPS32.
See commit fc3d3a7296ef58bb799a73943636b8bfd95339f7.
src/xz/xz.1 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit d1bfa3dc703325ecd974167e864a8712fdfe936e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-07-01 21:19:26 +0800
Created script to generate code coverage reports.
The script uses lcov and genhtml after running the tests
to show the code coverage statistics. The script will create
a coverage directory where it is run. It can be run both in
and out of the source directory.
.gitignore | 4 +++
tests/code_coverage.sh | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
commit 86a30b0255d8064169fabfd213d907016d2f9f2a
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-06-16 17:32:19 +0300
Tests: Add more tests into test_check.
tests/test_check.c | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++--
tests/tests.h | 23 +++++
2 files changed, 295 insertions(+), 7 deletions(-)
commit 82e30fed66a89706388a8c15dc954d84e63f38fa
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-16 15:02:57 +0300
Tests: Use char[][24] array for enum_strings_lzma_ret.
Array of pointers to short strings is a bit pointless here
and now it's fully const.
tests/tests.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5ba9459e6c4a29f6870ca78ce8ac6e519d59c41e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-16 14:12:14 +0300
Tests: tuktest.h: Add tuktest_error_impl to help with error conditions.
tests/tuktest.h | 72 +++++++++++++++++++++++++--------------------------------
1 file changed, 32 insertions(+), 40 deletions(-)
commit b339892668da20aea22a93668c82b87a38e4a97f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-16 13:29:59 +0300
Tests: tuktest.h: Rename file_from_* and use tuktest_malloc there.
tests/test_bcj_exact_size.c | 4 +---
tests/tuktest.h | 52 +++++++++++++++++++++------------------------
2 files changed, 25 insertions(+), 31 deletions(-)
commit d8b63a0ad68d1c461eb373466679ebc41fbc207d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-16 13:08:19 +0300
Tests: tuktest.h: Add malloc wrapper with automatic freeing.
tests/tuktest.h | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 124 insertions(+)
commit 1d51536a4b19a8fae768f8eb462fc2238cb36d53
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-16 11:47:37 +0300
Tests: tuktest.h: Move a function.
tests/tuktest.h | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
commit 70c7555f6403553ee35539e869de0025592d8564
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-14 22:21:15 +0300
Tests: test_vli: Remove an invalid test-assertion.
lzma_vli is unsigned so trying a signed value results in
a compiler warning from -Wsign-conversion. (lzma_vli)-1
equals to LZMA_VLI_UNKNOWN anyway which is the next assertion.
tests/test_vli.c | 2 --
1 file changed, 2 deletions(-)
commit 154b73c5a1092c3f785e01666b564ad7ff1be555
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-14 22:10:10 +0300
Tests: test_vli: Add const where appropriate.
tests/test_vli.c | 53 ++++++++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 25 deletions(-)
commit 0354d6cce3ff98ea6f927107baf216253f6ce2bb
Author: Jia Tan <jiat75@gmail.com>
Date: 2022-06-13 20:27:03 +0800
Added vli tests to .gitignore
.gitignore | 1 +
1 file changed, 1 insertion(+)
commit a08f5ccf6bdc20ef70e41f6f3321618ef146f96e
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-06-12 11:31:40 +0800
Created tests for all functions exported in vli.h
Achieved 100% code coverage vli_encoder.c, vli_decoder.c, and vli_size.c
tests/Makefile.am | 4 +-
tests/test_vli.c | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 311 insertions(+), 1 deletion(-)
commit 1e3eb61815a91c0a1bfbb802e2d95593f523491f
Author: jiat75 <jiat0218@gmail.com>
Date: 2022-06-03 21:24:54 +0800
Added parallel test artifacts to .gitignore
.gitignore | 2 ++
1 file changed, 2 insertions(+)
commit 00e3613f1212eaa84e721585fdb4de6967cf2476
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-14 21:29:21 +0300
Tests: Use good-1-empty-bcj-lzma2.xz in test_bcj_exact_size.
It's much nicer this way so that the test data isn't a hardcoded
table inside the C file.
tests/test_bcj_exact_size.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
commit 86bab755be252bfd3e0a9aee8e7b83a9bbb23ed0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-14 21:26:13 +0300
Tests: Add file reading helpers to tuktest.h.
tests/tuktest.h | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 176 insertions(+), 7 deletions(-)
commit 83d2337b72dbf391c6f3b41889eea99e51679105
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-14 18:21:57 +0300
Tests: tuktest.h: Move a printf from a macro to a helper function.
tests/tuktest.h | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
commit f9e8176ea7d520797a2db2d49a5a632c285674a8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-14 17:20:49 +0300
Tests: Add test file good-1-empty-bcj-lzma2.xz.
This is from test_bcj_exact_size.c.
It's good to have it as a standalone file.
tests/files/README | 5 +++++
tests/files/good-1-empty-bcj-lzma2.xz | Bin 0 -> 52 bytes
2 files changed, 5 insertions(+)
commit aa75c5563a760aea3aa23d997d519e702e82726b
Author: Jia Tan <jiat0218@gmail.com>
Date: 2022-06-10 21:35:18 +0800
Tests: Created tests for hardware functions.
Created tests for all API functions exported in
src/liblzma/api/lzma/hardware.h. The tests are fairly trivial
but are helpful because they will inform users if their machines
cannot support these functions. They also improve the code
coverage metrics.
.gitignore | 1 +
tests/Makefile.am | 2 ++
tests/test_hardware.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)
commit 5c8ffdca20813939818843476fb212dfae8838a3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-02 21:01:45 +0300
Tests: Convert test_check to tuktest.
Thanks to Jia Tan for help with all the tests.
tests/test_check.c | 67 +++++++++++++++++++++++++++---------------------------
1 file changed, 33 insertions(+), 34 deletions(-)
commit faf5ff8899d539b4dcd2a7e5280cb820a4746c86
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-02 20:31:03 +0300
Tests: Convert test_block_header to tuktest.
tests/test_block_header.c | 89 +++++++++++++++++++++++++++--------------------
1 file changed, 52 insertions(+), 37 deletions(-)
commit 754d39fbebee3782258d42f154a223d3c5770ec7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-02 20:28:23 +0300
Tests: Convert test_bcj_exact_size to tuktest.
The compress() and decompress() functions were merged because
the later depends on the former so they need to be a single
test case.
tests/test_bcj_exact_size.c | 75 +++++++++++++++++++++++++--------------------
1 file changed, 41 insertions(+), 34 deletions(-)
commit 96da21470f9570cd08286906a050a7c22631775b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-02 20:27:00 +0300
Tests: Include tuktest.h in tests.h.
This breaks -Werror because none of the tests so far use
tuktest.h and thus there are warnings about unused variables
and functions.
tests/tests.h | 47 +++++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 24 deletions(-)
commit df71ba1c991f60c3269aaadd398247e632714626
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-06-02 20:25:21 +0300
Tests: Add tuktest.h mini-test-framework.
tests/Makefile.am | 1 +
tests/tuktest.h | 752 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 753 insertions(+)
commit 4773608554d1b684a05ff9c1d879cf5c42266d33
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-05-23 21:31:36 +0300
Build: Enable Automake's parallel test harness.
It has been the default for quite some time already and
the old serial harness isn't discouraged. The downside is
that with parallel tests one cannot print progress info or
other diagnostics to the terminal; all output from the tests
will be in the log files only. But now that the compression
tests are separated the parallel tests will speed things up.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9a6dd6d46f7f256a5573e5d874c1052033ed7b05
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-05-23 21:17:47 +0300
Tests: Split test_compress.sh into separate test unit for each file.
test_compress.sh now takes one command line argument:
a filename to be tested. If it begins with "compress_generated_"
the file will be created with create_compress_files.
This will allow parallel execution of the slow tests.
tests/Makefile.am | 11 +++-
tests/test_compress.sh | 91 +++++++++++++++++++---------------
tests/test_compress_generated_abc | 3 ++
tests/test_compress_generated_random | 3 ++
tests/test_compress_generated_text | 3 ++
tests/test_compress_prepared_bcj_sparc | 3 ++
tests/test_compress_prepared_bcj_x86 | 3 ++
7 files changed, 77 insertions(+), 40 deletions(-)
commit c7758ac9c734707514dd34f254173ebac5eea7f8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-05-23 20:32:49 +0300
Test: Make create_compress_files.c a little more flexible.
If a command line argument is given, then only the test file
of that type is created. It's quite dumb in sense that unknown
names don't give an error but it's good enough here.
Also use EXIT_FAILURE instead of 1 as exit status for errors.
tests/create_compress_files.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
commit 4a8e4a7b0ad4b03c0ac6862716c3457452cdaf8c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-05-23 20:17:42 +0300
Tests: Remove unneeded commented lines from test_compress.sh.
tests/test_compress.sh | 13 -------------
1 file changed, 13 deletions(-)
commit 2ee50d150ee009f36135540b459e6ff328549725
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-05-23 20:16:00 +0300
Tests: Remove progress indicator from test_compress.sh.
It will be useless with Automake's parallel tests.
tests/test_compress.sh | 9 ---------
1 file changed, 9 deletions(-)
commit 2ce4f36f179a81d0c6e182a409f363df759d1ad0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-05-23 19:37:18 +0300
liblzma: Silence a warning.
The actual initialization is done via mythread_sync and seems
that GCC doesn't necessarily see that it gets initialized there.
src/liblzma/common/stream_decoder_mt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5d8f3764ef43c35910e6d7003c0900a961ef6544
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-14 20:53:16 +0300
xz: Fix build with --disable-threads.
src/xz/hardware.c | 4 ++++
1 file changed, 4 insertions(+)
commit 1d592897278b172d8549aa29c3a1f3a4f432a9b9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-14 14:50:17 +0300
xz: Change the cap of the default -T0 memlimit for 32-bit xz.
The SIZE_MAX / 3 was 1365 MiB. 1400 MiB gives little more room
and it looks like a round (artificial) number in --info-memory
once --info-memory is made to display it.
Also, using #if avoids useless code on 64-bit builds.
src/xz/hardware.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit c77fe55ddb7752ed0fec46967c5ec9a72632ea0c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-14 14:20:46 +0300
xz: Add a default soft memory usage limit for --threads=0.
This is a soft limit in sense that it only affects the number of
threads. It never makes xz fail and it never makes xz change
settings that would affect the compressed output.
The idea is to make -T0 have more reasonable behavior when
the system has very many cores or when a memory-hungry
compression options are used. This also helps with 32-bit xz,
preventing it from running out of address space.
The downside of this commit is that now the number of threads
might become too low compared to what the user expected. I
hope this to be an acceptable compromise as the old behavior
has been a source of well-argued complaints for a long time.
src/xz/coder.c | 28 ++++++++++++++++++++++++++--
src/xz/hardware.c | 38 +++++++++++++++++++++++++++++---------
src/xz/hardware.h | 27 +++++++++++++++++++++++++++
3 files changed, 82 insertions(+), 11 deletions(-)
commit 0adc13bfe32c14f3e4c6ce9f2d4fdf4112ab53f4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-14 12:59:09 +0300
xz: Make -T0 use multithreaded mode on single-core systems.
The main problem withi the old behavior is that the compressed
output is different on single-core systems vs. multicore systems.
This commit fixes it by making -T0 one thread in multithreaded mode
on single-core systems.
The downside of this is that it uses more memory. However, if
--memlimit-compress is used, xz can (thanks to the previous commit)
drop to the single-threaded mode still.
src/xz/coder.c | 18 +++++++++---------
src/xz/hardware.c | 14 ++++++++++++++
src/xz/hardware.h | 4 ++++
3 files changed, 27 insertions(+), 9 deletions(-)
commit 898faa97287a756231c663a3ed5165672b417207
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-14 12:38:00 +0300
xz: Changes to --memlimit-compress and --no-adjust.
In single-threaded mode, --memlimit-compress can make xz scale down
the LZMA2 dictionary size to meet the memory usage limit. This
obviously affects the compressed output. However, if xz was in
threaded mode, --memlimit-compress could make xz reduce the number
of threads but it wouldn't make xz switch from multithreaded mode
to single-threaded mode or scale down the LZMA2 dictionary size.
This seemed illogical and there was even a "FIXME?" about it.
Now --memlimit-compress can make xz switch to single-threaded
mode if one thread in multithreaded mode uses too much memory.
If memory usage is still too high, then the LZMA2 dictionary
size can be scaled down too.
The option --no-adjust was also changed so that it no longer
prevents xz from scaling down the number of threads as that
doesn't affect compressed output (only performance). After
this commit --no-adjust only prevents adjustments that affect
compressed output, that is, with --no-adjust xz won't switch
from multithreaded mode to single-threaded mode and won't
scale down the LZMA2 dictionary size.
The man page wasn't updated yet.
src/xz/coder.c | 63 +++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 43 insertions(+), 20 deletions(-)
commit cad299008cf73ec566f0662a9cf2b94f86a99659
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-11 22:20:49 +0300
xz: Add --memlimit-mt-decompress along with a default limit value.
--memlimit-mt-decompress allows specifying the limit for
multithreaded decompression. This matches memlimit_threading in
liblzma. This limit can only affect the number of threads being
used; it will never prevent xz from decompressing a file. The
old --memlimit-decompress option is still used at the same time.
If the value of --memlimit-decompress (the default value or
one specified by the user) is less than the value of
--memlimit-mt-decompress , then --memlimit-mt-decompress is
reduced to match --memlimit-decompress.
Man page wasn't updated yet.
src/xz/args.c | 24 +++++++++++++++-------
src/xz/coder.c | 34 ++++++++++---------------------
src/xz/hardware.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
src/xz/hardware.h | 17 ++++++++++------
src/xz/message.c | 4 +++-
5 files changed, 97 insertions(+), 42 deletions(-)
commit fe87b4cd5364f5bbb6a75a0299f1500c852d7c9a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-06 23:11:59 +0300
liblzma: Threaded decoder: Improve setting of pending_error.
It doesn't need to be done conditionally. The comments try
to explain it.
src/liblzma/common/stream_decoder_mt.c | 51 +++++++++++++++++++++++-----------
1 file changed, 35 insertions(+), 16 deletions(-)
commit 90621da7f6e1bfd6d91d60415eae04b2bca274c2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-06 12:39:49 +0300
liblzma: Add a new flag LZMA_FAIL_FAST for threaded decoder.
In most cases if the input file is corrupt the application won't
care about the uncompressed content at all. With this new flag
the threaded decoder will return an error as soon as any thread
has detected an error; it won't wait to copy out the data before
the location of the error.
I don't plan to use this in xz to keep the behavior consistent
between single-threaded and multi-threaded modes.
src/liblzma/api/lzma/container.h | 25 ++++++++++++++++-
src/liblzma/common/common.h | 7 +++--
src/liblzma/common/stream_decoder_mt.c | 50 +++++++++++++++++++---------------
3 files changed, 56 insertions(+), 26 deletions(-)
commit 64b6d496dc815a176d8307f418f6834a26783484
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-05 12:24:57 +0300
liblzma: Threaded decoder: Always wait for output if LZMA_FINISH is used.
This makes the behavior consistent with the single-threaded
decoder when handling truncated .xz files.
Thanks to Jia Tan for finding this issue.
src/liblzma/common/stream_decoder_mt.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
commit e671bc8828b9c0c5406c3a22c541301d0eb54518
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-04-02 21:49:59 +0300
liblzma: Threaded decoder: Support zpipe.c-style decoding loop.
This makes it possible to call lzma_code() in a loop that only
reads new input when lzma_code() didn't fill the output buffer
completely. That isn't the calling style suggested by the
liblzma example program 02_decompress.c so perhaps the usefulness
of this feature is limited.
Also, it is possible to write such a loop so that it works
with the single-threaded decoder but not with the threaded
decoder even after this commit, or so that it works only if
lzma_mt.timeout = 0.
The zlib tutorial <https://zlib.net/zlib_how.html> is a well-known
example of a loop where more input is read only when output isn't
full. Porting this as is to liblzma would work with the
single-threaded decoder (if LZMA_CONCATENATED isn't used) but it
wouldn't work with threaded decoder even after this commit because
the loop assumes that no more output is possible when it cannot
read more input ("if (strm.avail_in == 0) break;"). This cannot
be fixed at liblzma side; the loop has to be modified at least
a little.
I'm adding this in any case because the actual code is simple
and short and should have no harmful side-effects in other
situations.
src/liblzma/common/stream_decoder_mt.c | 77 +++++++++++++++++++++++++++++-----
1 file changed, 67 insertions(+), 10 deletions(-)
commit 2ba8173e27be4793edb46497e499ac2ae753a316
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-31 00:05:07 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 69d1b3fc29677af8ade8dc15dba83f0589cb63d6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-29 19:19:12 +0300
xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587).
Malicious filenames can make xzgrep to write to arbitrary files
or (with a GNU sed extension) lead to arbitrary code execution.
xzgrep from XZ Utils versions up to and including 5.2.5 are
affected. 5.3.1alpha and 5.3.2alpha are affected as well.
This patch works for all of them.
This bug was inherited from gzip's zgrep. gzip 1.12 includes
a fix for zgrep.
The issue with the old sed script is that with multiple newlines,
the N-command will read the second line of input, then the
s-commands will be skipped because it's not the end of the
file yet, then a new sed cycle starts and the pattern space
is printed and emptied. So only the last line or two get escaped.
One way to fix this would be to read all lines into the pattern
space first. However, the included fix is even simpler: All lines
except the last line get a backslash appended at the end. To ensure
that shell command substitution doesn't eat a possible trailing
newline, a colon is appended to the filename before escaping.
The colon is later used to separate the filename from the grep
output so it is fine to add it here instead of a few lines later.
The old code also wasn't POSIX compliant as it used \n in the
replacement section of the s-command. Using \<newline> is the
POSIX compatible method.
LC_ALL=C was added to the two critical sed commands. POSIX sed
manual recommends it when using sed to manipulate pathnames
because in other locales invalid multibyte sequences might
cause issues with some sed implementations. In case of GNU sed,
these particular sed scripts wouldn't have such problems but some
other scripts could have, see:
info '(sed)Locale Considerations'
This vulnerability was discovered by:
cleemy desu wayo working with Trend Micro Zero Day Initiative
Thanks to Jim Meyering and Paul Eggert discussing the different
ways to fix this and for coordinating the patch release schedule
with gzip.
src/scripts/xzgrep.in | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
commit bd93b776c1bd15e90661033c918cdeb354dbcc38
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-26 01:02:44 +0200
liblzma: Fix a deadlock in threaded decoder.
If a worker thread has consumed all input so far and it's
waiting on thr->cond and then the main thread enables
partial update for that thread, the code used to deadlock.
This commit allows one dummy decoding pass to occur in this
situation which then also does the partial update.
As part of the fix, this moves thr->progress_* updates to
avoid the second thr->mutex locking.
Thanks to Jia Tan for finding, debugging, and reporting the bug.
src/liblzma/common/stream_decoder_mt.c | 71 +++++++++++++++++++++++++---------
1 file changed, 52 insertions(+), 19 deletions(-)
commit e0394e94230f208682ac1e1f4c41f22f9ad79916
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-23 16:34:00 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 487c77d48760564b1949c5067630b675b87be4de
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-23 16:28:55 +0200
liblzma: Threaded decoder: Don't stop threads on LZMA_TIMED_OUT.
LZMA_TIMED_OUT is not an error and thus stopping threads on
LZMA_TIMED_OUT breaks the decoder badly.
Thanks to Jia Tan for finding the bug and for the patch.
src/liblzma/common/stream_decoder_mt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6c6da57ae2aa962aabde6892442227063d87e88c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-07 00:36:16 +0200
xz: Add initial support for threaded decompression.
If threading support is enabled at build time, this will
use lzma_stream_decoder_mt() even for single-threaded mode.
With memlimit_threading=0 the behavior should be identical.
This needs some work like adding --memlimit-threading=LIMIT.
The original patch from Sebastian Andrzej Siewior included
a method to get currently available RAM on Linux. It might
be one way to go but as it is Linux-only, the available-RAM
approach needs work for portability or using a fallback method
on other OSes.
The man page wasn't updated yet.
src/xz/coder.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
commit 4cce3e27f529af33e0e7749a8cbcec59954946b5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-06 23:36:20 +0200
liblzma: Add threaded .xz decompressor.
I realize that this is about a decade late.
Big thanks to Sebastian Andrzej Siewior for the original patch.
I made a bunch of smaller changes but after a while quite a few
things got rewritten. So any bugs in the commit were created by me.
src/liblzma/api/lzma/container.h | 90 +-
src/liblzma/common/Makefile.inc | 5 +
src/liblzma/common/common.h | 4 +
src/liblzma/common/stream_decoder_mt.c | 1814 ++++++++++++++++++++++++++++++++
src/liblzma/liblzma.map | 1 +
5 files changed, 1907 insertions(+), 7 deletions(-)
commit 717631b9788dc9c100ee0c87d3c14a2782638ff4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-06 16:54:23 +0200
liblzma: Fix docs: lzma_block_decoder() cannot return LZMA_UNSUPPORTED_CHECK.
If Check is unsupported, it will be silently ignored.
It's the caller's job to handle it.
src/liblzma/api/lzma/block.h | 3 ---
1 file changed, 3 deletions(-)
commit 1a4bb97a00936535e30ac61945aeee38882b5d1a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-06 16:41:19 +0200
liblzma: Add new output queue (lzma_outq) features.
Add lzma_outq_clear_cache2() which may leave one buffer allocated
in the cache.
Add lzma_outq_outbuf_memusage() to get the memory needed for
a single lzma_outbuf. This is now used internally in outqueue.c too.
Track both the total amount of memory allocated and the amount of
memory that is in active use (not in cache).
In lzma_outbuf, allow storing the current input position that
matches the current output position. This way the main thread
can notice when no more output is possible without first providing
more input.
Allow specifying return code for lzma_outq_read() in a finished
lzma_outbuf.
src/liblzma/common/outqueue.c | 43 +++++++++++++++++++++++++++++++++++-------
src/liblzma/common/outqueue.h | 44 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 79 insertions(+), 8 deletions(-)
commit ddbc6f58c2de388eed24cd7ea91b523d397da5f4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-03-06 15:18:58 +0200
liblzma: Index hash: Change return value type of hash_append() to void.
src/liblzma/common/index_hash.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
commit 20e7a33e2d59c6a814447d3991f21e2702174b20
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-22 03:42:57 +0200
liblzma: Minor addition to lzma_vli_size() API doc.
Thanks to Jia Tan.
src/liblzma/api/lzma/vli.h | 2 ++
1 file changed, 2 insertions(+)
commit 4f78f5fcf63592f2d77e921cfe0d5de300867374
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-22 02:04:18 +0200
liblzma: Check the return value of lzma_index_append() in threaded encoder.
If lzma_index_append() failed (most likely memory allocation failure)
it could have gone unnoticed and the resulting .xz file would have
an incorrect Index. Decompressing such a file would produce the
correct uncompressed data but then an error would occur when
verifying the Index field.
src/liblzma/common/stream_encoder_mt.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 5313ad66b40aab822ddca3e9905254cb99a4080d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-22 01:37:39 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 865e0a3689a25a7ee8eecae1a34c1775e3aa676e
Author: Ed Maste <emaste@FreeBSD.org>
Date: 2022-02-11 15:25:46 +0000
liblzma: Use non-executable stack on FreeBSD as on Linux
src/liblzma/check/crc32_x86.S | 4 ++--
src/liblzma/check/crc64_x86.S | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 1c9a5786d206b4abc8e427326651c8174baea753
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-20 20:36:27 +0200
liblzma: Make Block decoder catch certain types of errors better.
Now it limits the input and output buffer sizes that are
passed to a raw decoder. This way there's no need to check
if the sizes can grow too big or overflow when updating
Compressed Size and Uncompressed Size counts. This also means
that a corrupt file cannot cause the raw decoder to process
useless extra input or output that would exceed the size info
in Block Header (and thus cause LZMA_DATA_ERROR anyway).
More importantly, now the size information is verified more
carefully in case raw decoder returns LZMA_OK. This doesn't
really matter with the current single-threaded .xz decoder
as the errors would be detected slightly later anyway. But
this helps avoiding corner cases in the upcoming threaded
decompressor, and it might help other Block decoder uses
outside liblzma too.
The test files bad-1-lzma2-{9,10,11}.xz test these conditions.
With the single-threaded .xz decoder the only difference is
that LZMA_DATA_ERROR is detected in a difference place now.
src/liblzma/common/block_decoder.c | 79 ++++++++++++++++++++++++++------------
1 file changed, 54 insertions(+), 25 deletions(-)
commit 555de11873eb00c9b94a8be70645db502e5a9dbd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-20 19:38:55 +0200
Tests: Add bad-1-lzma2-11.xz.
tests/files/README | 5 +++++
tests/files/bad-1-lzma2-11.xz | Bin 0 -> 64 bytes
2 files changed, 5 insertions(+)
commit f0da507f22e7f4e3edb75b45b74d344244ca03fb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-18 18:51:10 +0200
Translations: Fix po4a failure with the French man page translations.
Thanks to Mario Blättermann for the patch.
po4a/fr_FR.po | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit f7711d228c3c32395460c82498c60a9f730d0239
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-07 01:14:37 +0200
Translations: Add French translation of man pages.
This matches xz-utils 5.2.5-2 in Debian.
The translation was done by "bubu", proofread by the debian-l10n-french
mailing list contributors, and submitted to me on the xz-devel mailing
list by Jean-Pierre Giraud. Thanks to everyone!
po4a/fr_FR.po | 3541 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po4a/po4a.conf | 2 +-
2 files changed, 3542 insertions(+), 1 deletion(-)
commit 6468f7e41a8e9c611e4ba8d34e2175c5dacdbeb4
Author: jiat75 <jiat0218@gmail.com>
Date: 2022-01-28 20:47:55 +0800
liblzma: Add NULL checks to LZMA and LZMA2 properties encoders.
Previously lzma_lzma_props_encode() and lzma_lzma2_props_encode()
assumed that the options pointers must be non-NULL because the
with these filters the API says it must never be NULL. It is
good to do these checks anyway.
src/liblzma/lzma/lzma2_encoder.c | 3 +++
src/liblzma/lzma/lzma_encoder.c | 3 +++
2 files changed, 6 insertions(+)
commit 2523c30705f49eabd27b854aa656ae87cc224808
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2022-02-06 23:19:32 +0200
liblzma: Fix uint64_t vs. size_t confusion.
This broke 32-bit builds due to a pointer type mismatch.
This bug was introduced with the output-size-limited encoding
in 625f4c7c99b2fcc4db9e7ab2deb4884790e2e17c.
Thanks to huangqinjin for the bug report.
src/liblzma/rangecoder/range_encoder.h | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit 2bd36c91d03e03b31a4f12fd0afc100ae32d66e2
Author: huangqinjin <huangqinjin@gmail.com>
Date: 2021-12-13 20:49:21 +0800
CMake: Keep compatible with Windows 95 for 32-bit build.
CMakeLists.txt | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
commit 2024fbf2794885277d05378d40b2b8015a7c3b40
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-11-13 21:04:05 +0200
xzgrep: Update man page timestamp.
src/scripts/xzgrep.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 400e7a239a53282cedaad927a41f3463d7f542e5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-11-13 18:23:24 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 3a512c7787b2642ca946f4adc6e9a0a5d9b0d5a0
Author: Ville Skyttä <ville.skytta@iki.fi>
Date: 2021-11-13 10:11:57 +0200
xzgrep: use `grep -E/-F` instead of `egrep` and `fgrep`
`egrep` and `fgrep` have been deprecated in GNU grep since 2007, and in
current post 3.7 Git they have been made to emit obsolescence warnings:
https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d480e3142fd959bccd1c9372d1
src/scripts/xzgrep.1 | 8 ++++----
src/scripts/xzgrep.in | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
commit edf525e2b1840dcaf377df472c67d8f11f8ace1b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-10-28 23:02:11 +0300
Bump the version number for 5.3.2alpha.
src/liblzma/api/lzma/version.h | 2 +-
src/liblzma/liblzma.map | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit ea8c948655a86290524efe59cff067e06a886709
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-10-28 22:59:52 +0300
Add NEWS for 5.3.2alpha.
NEWS | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
commit 52435f302f4724157ec50b4210cbe42b285c3cbc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-10-27 23:27:48 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit f2aea1d5a504b2021bf47a238390e4f12bdd518d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-10-27 23:23:11 +0300
xz: Change the coding style of the previous commit.
It isn't any better now but it's consistent with
the rest of the code base.
src/xz/file_io.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
commit 892b16cc282f5b4e1c49871b326f4db25c5b4d81
Author: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: 2021-10-05 23:33:16 +0200
xz: Avoid fchown(2) failure.
OpenBSD does not allow to change the group of a file if the user
does not belong to this group. In contrast to Linux, OpenBSD also
fails if the new group is the same as the old one. Do not call
fchown(2) in this case, it would change nothing anyway.
This fixes an issue with Perl Alien::Build module.
https://github.com/PerlAlien/Alien-Build/issues/62
src/xz/file_io.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 2b509c868cae3988bf21cd693fbf9021cdc85628
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-09-17 17:31:11 +0300
liblzma: Fix liblzma.map for the lzma_microlzma_* symbols.
This should have been part of d267d109c370a40b502e73f8664b154b15e4f253.
Thanks to Gao Xiang.
src/liblzma/liblzma.map | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit cacb06a954b58255dfc084a0bc9708f43a0fd6d6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-09-09 22:21:07 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 6928aac9da6ba612780b9f72ba1d6ecbe1e8b54e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-09-09 21:41:51 +0300
liblzma: Use _MSVC_LANG to detect when "noexcept" can be used with MSVC.
By default, MSVC always sets __cplusplus to 199711L. The real
C++ standard version is available in _MSVC_LANG (or one could
use /Zc:__cplusplus to set __cplusplus correctly).
Fixes <https://sourceforge.net/p/lzmautils/discussion/708858/thread/f6bc3b108a/>.
Thanks to Dan Weiss.
src/liblzma/api/lzma.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit d267d109c370a40b502e73f8664b154b15e4f253
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-09-05 20:38:12 +0300
liblzma: Rename EROFS LZMA to MicroLZMA.
It still exists primarily for EROFS but MicroLZMA is
a more generic name (that hopefully doesn't clash with
something that already exists).
src/liblzma/api/lzma/container.h | 33 +++++++++++++---------
src/liblzma/common/Makefile.inc | 4 +--
.../{erofs_decoder.c => microlzma_decoder.c} | 32 ++++++++++-----------
.../{erofs_encoder.c => microlzma_encoder.c} | 30 ++++++++++----------
4 files changed, 52 insertions(+), 47 deletions(-)
commit 3247e95115acb95bc27f41e8cf4501db5b0b4309
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-06-04 19:02:38 +0300
xzdiff: Update the man page about the exit status.
This was forgotten from 194029ffaf74282a81f0c299c07f73caca3232ca.
src/scripts/xzdiff.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 96f5a28a46fc93ac4e296808ac0f8631d05498bc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-06-04 18:52:48 +0300
xzless: Fix less(1) version detection when it contains a dot.
Sometimes the version number from "less -V" contains a dot,
sometimes not. xzless failed detect the version number when
it does contain a dot. This fixes it.
Thanks to nick87720z for reporting this. Apparently it had been
reported here <https://bugs.gentoo.org/489362> in 2013.
src/scripts/xzless.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5fb5212d816addbc523d0798cb482fdd0484f8fa
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-04-11 19:58:10 +0300
Update THANKS.
THANKS | 2 ++
1 file changed, 2 insertions(+)
commit fc3d3a7296ef58bb799a73943636b8bfd95339f7
Author: Ivan A. Melnikov <iv@altlinux.org>
Date: 2021-04-09 11:45:10 +0300
Reduce maximum possible memory limit on MIPS32
Due to architectural limitations, address space available to a single
userspace process on MIPS32 is limited to 2 GiB, not 4, even on systems
that have more physical RAM -- e.g. 64-bit systems with 32-bit
userspace, or systems that use XPA (an extension similar to x86's PAE).
So, for MIPS32, we have to impose stronger memory limits. I've chosen
2000MiB to give the process some headroom.
src/xz/hardware.c | 6 ++++++
1 file changed, 6 insertions(+)
commit e7da44d5151e21f153925781ad29334ae0786101
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-02-13 23:31:27 +0200
CMake: Use interface library for better FindLibLZMA compatibility.
https://www.mail-archive.com/xz-devel@tukaani.org/msg00446.html
Thanks to Markus Rickert.
CMakeLists.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
commit a61dd82ada39030f41b4ffca9ea551714908bedc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-30 18:36:04 +0200
CMake: Try to improve compatibility with the FindLibLZMA module.
The naming conflict with FindLibLZMA module gets worse.
Not avoiding it in the first place was stupid.
Normally find_package(LibLZMA) will use the module and
find_package(liblzma 5.2.5 REQUIRED CONFIG) will use the config
file even with a case insensitive file system. However, if
CMAKE_FIND_PACKAGE_PREFER_CONFIG is TRUE and the file system
is case insensitive, find_package(LibLZMA) will find our liblzma
config file instead of using FindLibLZMA module.
One big problem with this is that FindLibLZMA uses
LibLZMA::LibLZMA and we use liblzma::liblzma as the target
name. With target names CMake happens to be case sensitive.
To workaround this, this commit adds
add_library(LibLZMA::LibLZMA ALIAS liblzma::liblzma)
to the config file. Then both spellings work.
To make the behavior consistent between case sensitive and
insensitive file systems, the config and related files are
renamed from liblzmaConfig.cmake to liblzma-config.cmake style.
With this style CMake looks for lowercase version of the package
name so find_package(LiBLzmA 5.2.5 REQUIRED CONFIG) will work
to find our config file.
There are other differences between our config file and
FindLibLZMA so it's still possible that things break for
reasons other than the spelling of the target name. Hopefully
those situations aren't too common.
When the config file is available, it should always give as good or
better results as FindLibLZMA so this commit doesn't affect the
recommendation to use find_package(liblzma 5.2.5 REQUIRED CONFIG)
which explicitly avoids FindLibLZMA.
Thanks to Markus Rickert.
CMakeLists.txt | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
commit 5b7bc1b8ae766a76710ca1b99f909cf52c697f05
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-29 21:19:43 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 6c6f0db340dcb8bb424411cedba713405d55f6b8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-29 21:19:08 +0200
liblzma: Fix unitialized variable.
This was introduced two weeks ago in the commit
625f4c7c99b2fcc4db9e7ab2deb4884790e2e17c.
Thanks to Nathan Moinvaziri.
src/liblzma/lzma/lzma_encoder.c | 1 +
1 file changed, 1 insertion(+)
commit bb1d5c1fdd30550d4221ecd336e0be1206132a5c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-24 22:32:41 +0200
Tests: Add bad-1-lzma2-10.xz and also modify -9.xz.
tests/files/README | 11 +++++++++--
tests/files/bad-1-lzma2-10.xz | Bin 0 -> 60 bytes
tests/files/bad-1-lzma2-9.xz | Bin 72 -> 72 bytes
3 files changed, 9 insertions(+), 2 deletions(-)
commit 6b8abc84a5469792e0355d0bfc0784d41cfdfef7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-24 19:22:35 +0200
liblzma: Fix a wrong comment in stream_encoder_mt.c.
src/liblzma/common/stream_encoder_mt.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
commit 939fc5ed654aac25fe0c8684b2df8dbeadb2de1e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-24 18:51:51 +0200
Tests: Add bad-1-lzma2-9.xz.
tests/files/README | 4 ++++
tests/files/bad-1-lzma2-9.xz | Bin 0 -> 72 bytes
2 files changed, 4 insertions(+)
commit fdd30032f8531ac89519b48c21d810ecf06825f6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-24 17:02:00 +0200
Tests: Add bad-1-check-crc32-2.xz.
tests/files/README | 7 +++++++
tests/files/bad-1-check-crc32-2.xz | Bin 0 -> 72 bytes
2 files changed, 7 insertions(+)
commit db465419ae26ec7fb9b9472183911ff521620c77
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-17 19:20:50 +0200
liblzma: In EROFS LZMA decoder, verify that comp_size matches at the end.
When the uncompressed size is known to be exact, after decompressing
the stream exactly comp_size bytes of input must have been consumed.
This is a minor improvement to error detection.
src/liblzma/common/erofs_decoder.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 774cc0118ba2496581cb2621505a04bb6598cc75
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-17 18:53:34 +0200
liblzma: Make EROFS LZMA decoder work when exact uncomp_size isn't known.
The caller must still not specify an uncompressed size bigger
than the actual uncompressed size.
As a downside, this now needs the exact compressed size.
src/liblzma/api/lzma/container.h | 23 ++++++++---
src/liblzma/common/erofs_decoder.c | 80 ++++++++++++++++++++++++++++++++++----
2 files changed, 91 insertions(+), 12 deletions(-)
commit 421b0aa352da244075db10205cf33712f91b9835
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-14 20:57:11 +0200
liblzma: Fix missing normalization in rc_encode_dummy().
Without this fix it could attempt to create too much output.
src/liblzma/rangecoder/range_encoder.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 601ec0311e769fc704daaaa7dac0ca840aff080e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-14 20:07:01 +0200
liblzma: Add EROFS LZMA encoder and decoder.
Right now this is just a planned extra-compact format for use
in the EROFS file system in Linux. At this point it's possible
that the format will either change or be abandoned and removed
completely.
The special thing about the encoder is that it uses the
output-size-limited encoding added in the previous commit.
EROFS uses fixed-sized blocks (e.g. 4 KiB) to hold compressed
data so the compressors must be able to create valid streams
that fill the given block size.
src/liblzma/api/lzma/container.h | 76 +++++++++++++++++++
src/liblzma/common/Makefile.inc | 2 +
src/liblzma/common/erofs_decoder.c | 148 +++++++++++++++++++++++++++++++++++++
src/liblzma/common/erofs_encoder.c | 139 ++++++++++++++++++++++++++++++++++
src/liblzma/liblzma.map | 2 +
5 files changed, 367 insertions(+)
commit 625f4c7c99b2fcc4db9e7ab2deb4884790e2e17c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-13 19:16:32 +0200
liblzma: Add rough support for output-size-limited encoding in LZMA1.
With this it is possible to encode LZMA1 data without EOPM so that
the encoder will encode as much input as it can without exceeding
the specified output size limit. The resulting LZMA1 stream will
be a normal LZMA1 stream without EOPM. The actual uncompressed size
will be available to the caller via the uncomp_size pointer.
One missing thing is that the LZMA layer doesn't inform the LZ layer
when the encoding is finished and thus the LZ may read more input
when it won't be used. However, this doesn't matter if encoding is
done with a single call (which is the planned use case for now).
For proper multi-call encoding this should be improved.
This commit only adds the functionality for internal use.
Nothing uses it yet.
src/liblzma/common/common.h | 11 +++
src/liblzma/lz/lz_encoder.c | 16 ++++
src/liblzma/lz/lz_encoder.h | 4 +
src/liblzma/lzma/lzma_encoder.c | 127 +++++++++++++++++++++++---------
src/liblzma/lzma/lzma_encoder_private.h | 12 +++
src/liblzma/rangecoder/range_encoder.h | 111 ++++++++++++++++++++++++++++
6 files changed, 246 insertions(+), 35 deletions(-)
commit 9cdabbeea891e8f1e7741b076f7db6ac05ae392a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-11 23:57:11 +0200
Scripts: Add zstd support to xzdiff.
src/scripts/xzdiff.1 | 6 ++++--
src/scripts/xzdiff.in | 16 +++++++++++-----
2 files changed, 15 insertions(+), 7 deletions(-)
commit d9ec3add97cf4c999a7f594c6529680227b6c274
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-11 23:41:30 +0200
Update THANKS.
THANKS | 2 ++
1 file changed, 2 insertions(+)
commit 074259f4f3966aeac6edb205fecbc1a8d2b58bb2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-11 23:41:16 +0200
xz: Make --keep accept symlinks, hardlinks, and setuid/setgid/sticky.
Previously this required using --force but that has other
effects too which might be undesirable. Changing the behavior
of --keep has a small risk of breaking existing scripts but
since this is a fairly special corner case I expect the
likehood of breakage to be low enough.
I think the new behavior is more logical. The only reason for
the old behavior was to be consistent with gzip and bzip2.
Thanks to Vincent Lefevre and Sebastian Andrzej Siewior.
src/xz/file_io.c | 9 +++++----
src/xz/xz.1 | 16 +++++++++++++++-
2 files changed, 20 insertions(+), 5 deletions(-)
commit 73c555b3077c19dda29b6f4592ced2af876f8333
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-11 23:28:52 +0200
Scripts: Fix exit status of xzgrep.
Omit the -q option from xz, gzip, and bzip2. With xz this shouldn't
matter. With gzip it's important because -q makes gzip replace SIGPIPE
with exit status 2. With bzip2 it's important because with -q bzip2
is completely silent if input is corrupt while other decompressors
still give an error message.
Avoiding exit status 2 from gzip is important because bzip2 uses
exit status 2 to indicate corrupt input. Before this commit xzgrep
didn't recognize corrupt .bz2 files because xzgrep was treating
exit status 2 as SIGPIPE for gzip compatibility.
zstd still needs -q because otherwise it is noisy in normal
operation.
The code to detect real SIGPIPE didn't check if the exit status
was due to a signal (>= 128) and so could ignore some other exit
status too.
src/scripts/xzgrep.in | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
commit 194029ffaf74282a81f0c299c07f73caca3232ca
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-11 22:01:51 +0200
Scripts: Fix exit status of xzdiff/xzcmp.
This is a minor fix since this affects only the situation when
the files differ and the exit status is something else than 0.
In such case there could be SIGPIPE from a decompression tool
and that would result in exit status of 2 from xzdiff/xzcmp
while the correct behavior would be to return 1 or whatever
else diff or cmp may have returned.
This commit omits the -q option from xz/gzip/bzip2/lzop arguments.
I'm not sure why the -q was used in the first place, perhaps it
hides warnings in some situation that I cannot see at the moment.
Hopefully the removal won't introduce a new bug.
With gzip the -q option was harmful because it made gzip return 2
instead of >= 128 with SIGPIPE. Ignoring exit status 2 (warning
from gzip) isn't practical because bzip2 uses exit status 2 to
indicate corrupt input file. It's better if SIGPIPE results in
exit status >= 128.
With bzip2 the removal of -q seems to be good because with -q
it prints nothing if input is corrupt. The other tools aren't
silent in this situation even with -q. On the other hand, if
zstd support is added, it will need -q since otherwise it's
noisy in normal situations.
Thanks to Étienne Mollier and Sebastian Andrzej Siewior.
src/scripts/xzdiff.in | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
commit f7fa309e1f7178d04c7bedc03b73077639371e97
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2021-01-09 21:14:36 +0200
liblzma: Make lzma_outq usable for threaded decompression too.
Before this commit all output queue buffers were allocated as
a single big allocation. Now each buffer is allocated separately
when needed. Used buffers are cached to avoid reallocation
overhead but the cache will keep only one buffer size at a time.
This should make things work OK in the decompression where most
of the time the buffer sizes will be the same but with some less
common files the buffer sizes may vary.
While this should work fine, it's still a bit preliminary
and may even get reverted if it turns out to be useless for
decompression.
src/liblzma/common/outqueue.c | 268 +++++++++++++++++++++------------
src/liblzma/common/outqueue.h | 138 ++++++++++++-----
src/liblzma/common/stream_encoder_mt.c | 52 ++++---
3 files changed, 301 insertions(+), 157 deletions(-)
commit a35a69d693ce37d4ba7c1855bda7d9cfa13d1778
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-12-23 17:15:49 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 4fd79b90c52396d70e0b1206ceb1a873a0ad2589
Author: H.J. Lu <hjl.tools@gmail.com>
Date: 2020-12-23 06:49:04 -0800
liblzma: Enable Intel CET in x86 CRC assembly codes
When Intel CET is enabled, we need to include <cet.h> in assembly codes
to mark Intel CET support and add _CET_ENDBR to indirect jump targets.
Tested on Intel Tiger Lake under CET enabled Linux.
src/liblzma/check/crc32_x86.S | 9 +++++++++
src/liblzma/check/crc64_x86.S | 9 +++++++++
2 files changed, 18 insertions(+)
commit bb3b8c6a23e25db79f862b1de325c56052e0354b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-12-16 18:33:29 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 21588ca34af98738954fc12ded1b89d7294ef646
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-12-16 18:30:14 +0200
Build: Don't build bundles on Apple OSes.
Thanks to Daniel Packard.
CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
commit d05b0c42dd8b38d8c6b8193c8af50e9bd3d16f28
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-12-05 22:44:03 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 1890351f3423627ba5c4c495402f32d7e9ed90b7
Author: Adam Borowski <kilobyte@angband.pl>
Date: 2020-09-25 03:35:18 +0200
Scripts: Add zstd support to xzgrep.
Thanks to Adam Borowski.
src/scripts/xzgrep.1 | 9 ++++++---
src/scripts/xzgrep.in | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
commit 2f108abb3d82e4e2313b438dae9c0c7c7a6366f2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-11-17 20:51:48 +0200
CMake: Fix compatibility with CMake 3.13.
The syntax "if(DEFINED CACHE{FOO})" requires CMake 3.14.
In some other places the code treats the cache variables
like normal variables already (${FOO} or if(FOO) is used,
not ${CACHE{FOO}).
Thanks to ygrek for reporting the bug on IRC.
CMakeLists.txt | 2 +-
cmake/tuklib_cpucores.cmake | 4 ++--
cmake/tuklib_physmem.cmake | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
commit 5af726a79273fafa5de5745b117e567f21c90e49
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-11-01 22:56:43 +0200
Update THANKS.
THANKS | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 4575d9d365c756ec189899f9f743e0b3515ce72d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-11-01 22:34:25 +0200
xz: Avoid unneeded \f escapes on the man page.
I don't want to use \c in macro arguments but groff_man(7)
suggests that \f has better portability. \f would be needed
for the .TP strings for portability reasons anyway.
Thanks to Bjarni Ingi Gislason.
src/xz/xz.1 | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
commit 620b32f5339f86710cb4435e01ecdac972ccac73
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-11-01 19:09:53 +0200
xz: Use non-breaking spaces when intentionally using more than one space.
This silences some style checker warnings. Seems that spaces
in the beginning of a line don't need this treatment.
Thanks to Bjarni Ingi Gislason.
src/xz/xz.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cb1f34988c8a4130485091b2f8b641303d8f701b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-11-01 18:49:37 +0200
xz: Protect the ellipsis (...) on the man page with \&.
This does it only when ... appears outside macro calls.
Thanks to Bjarni Ingi Gislason.
src/xz/xz.1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5d224da3da87400f2fab313abbd7c710e7169ef9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-11-01 18:41:21 +0200
xz: Avoid the abbreviation "e.g." on the man page.
A few are simply omitted, most are converted to "for example"
and surrounded with commas. Sounds like that this is better
style, for example, man-pages(7) recommends avoiding such
abbreviations except in parenthesis.
Thanks to Bjarni Ingi Gislason.
src/xz/xz.1 | 66 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
commit 90457dbe3e5717660f5b81f8c604860fc5137c0c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-07-12 23:10:03 +0300
xz man page: Change \- (minus) to \(en (en-dash) for a numeric range.
Docs of ancient troff/nroff mention \(em (em-dash) but not \(en
and \- was used for both minus and en-dash. I don't know how
portable \(en is nowadays but it can be changed back if someone
complains. At least GNU groff and OpenBSD's mandoc support it.
Thanks to Bjarni Ingi Gislason for the patch.
src/xz/xz.1 | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit 352ba2d69af2136bc814aa1df1a132559d445616
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-07-12 20:46:24 +0300
Windows: Fix building of resource files when config.h isn't used.
Now CMake + Visual Studio works for building liblzma.dll.
Thanks to Markus Rickert.
src/common/common_w32res.rc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit a9e2a87f1d61dcf684d809bf08c8ebea93f8a480
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-04-06 19:31:50 +0300
src/scripts/xzgrep.1: Filenames to xzgrep are optional.
xzgrep --help was correct already.
src/scripts/xzgrep.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a7ba275d9b855d186abb29eb7a4f4cb6d9ca6fe0
Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Date: 2020-03-26 22:17:31 +0000
src/script/xzgrep.1: Remove superfluous '.RB'
Output is from: test-groff -b -e -mandoc -T utf8 -rF0 -t -w w -z
[ "test-groff" is a developmental version of "groff" ]
Input file is ./src/scripts/xzgrep.1
<src/scripts/xzgrep.1>:20 (macro RB): only 1 argument, but more are expected
<src/scripts/xzgrep.1>:23 (macro RB): only 1 argument, but more are expected
<src/scripts/xzgrep.1>:26 (macro RB): only 1 argument, but more are expected
<src/scripts/xzgrep.1>:29 (macro RB): only 1 argument, but more are expected
<src/scripts/xzgrep.1>:32 (macro RB): only 1 argument, but more are expected
"abc..." does not mean the same as "abc ...".
The output from nroff and troff is unchanged except for the space
between "file" and "...".
Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
src/scripts/xzgrep.1 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit 133d498db0f4b14f066d192d64dbcade45deae6b
Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Date: 2020-03-30 21:56:36 +0000
xzgrep.1: Delete superfluous '.PP'
Summary:
mandoc -T lint xzgrep.1 :
mandoc: xzgrep.1:79:2: WARNING: skipping paragraph macro: PP empty
There is no change in the output of "nroff" and "troff".
Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
src/scripts/xzgrep.1 | 1 -
1 file changed, 1 deletion(-)
commit 057839ca982f886387b66746bffe749cb14fd8cd
Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Date: 2020-03-26 21:16:18 +0000
src/xz/xz.1: Correct misused two-fonts macros
Output is from: test-groff -b -e -mandoc -T utf8 -rF0 -t -w w -z
[ "test-groff" is a developmental version of "groff" ]
Input file is ./src/xz/xz.1
<src/xz/xz.1>:408 (macro BR): only 1 argument, but more are expected
<src/xz/xz.1>:1009 (macro BR): only 1 argument, but more are expected
<src/xz/xz.1>:1743 (macro BR): only 1 argument, but more are expected
<src/xz/xz.1>:1920 (macro BR): only 1 argument, but more are expected
<src/xz/xz.1>:2213 (macro BR): only 1 argument, but more are expected
Output from nroff and troff is unchanged, except for a font change of a
full stop (.).
Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
src/xz/xz.1 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit b8e12f5ab4c9fd3cb09a4330b2861f6b979ababd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-23 18:07:50 +0200
Typo fixes from fossies.org.
https://fossies.org/linux/misc/xz-5.2.5.tar.xz/codespell.html
Makefile.am | 2 +-
doc/examples/01_compress_easy.c | 2 +-
src/liblzma/api/lzma/base.h | 2 +-
src/liblzma/check/crc32_x86.S | 2 +-
src/liblzma/common/index.c | 2 +-
src/xz/xz.1 | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
commit 869b9d1b4edd6df07f819d360d306251f8147353
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-17 16:24:28 +0200
Update NEWS for 5.2.5.
NEWS | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
commit a048e3a92d238c65f050a765174d9c75417231d4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-16 20:01:37 +0200
README: Update outdated sections.
README | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
commit 29aed815ad4f98f3e4d355faa76a244ecd8ce716
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-16 19:39:45 +0200
README: Mention that man pages can be translated.
README | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 7fa7653940cc9dcfcbce2fbc5166ea343ad4e3c1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-16 16:43:29 +0200
Update INSTALL.generic from Automake 1.16.1.
INSTALL.generic | 321 ++++++++++++++++++++++++++++----------------------------
1 file changed, 162 insertions(+), 159 deletions(-)
commit 9bd317ef03ab9b3e6a927c27c2e9c4ac041182f0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-15 15:27:22 +0200
Update INSTALL for Windows and DOS and add preliminary info for z/OS.
INSTALL | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 41 insertions(+), 10 deletions(-)
commit a3148c0446dc7fa96363752df414d22539c9007b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-15 15:26:20 +0200
Build: Update m4/ax_pthread.m4 from Autoconf Archive (again).
m4/ax_pthread.m4 | 219 +++++++++++++++++++++++++++++--------------------------
1 file changed, 117 insertions(+), 102 deletions(-)
commit 7812002dd3ed319e42a14662a8531802cca8ca67
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 21:15:35 +0200
xz: Never use thousand separators in DJGPP builds.
DJGPP 2.05 added support for thousands separators but it's
broken at least under WinXP with Finnish locale that uses
a non-breaking space as the thousands separator. Workaround
by disabling thousands separators for DJGPP builds.
src/xz/util.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
commit 7c8f688bf7fccd65d396e0130cbf4ea5dff5c56f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 19:38:08 +0200
DOS: Update dos/Makefile for DJGPP 2.05.
It doesn't need -fgnu89-inline like 2.04beta did.
dos/Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit 319ca928d73de87940c54e30bffe69f9fa65efdf
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 19:36:07 +0200
DOS: Update instructions in dos/INSTALL.txt.
dos/INSTALL.txt | 59 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 30 deletions(-)
commit cb6b227ce39932824812ccd8a0647bd968de27d2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-11 17:58:51 +0200
DOS: Update config.h.
The added defines assume GCC >= 4.8.
dos/config.h | 8 ++++++++
1 file changed, 8 insertions(+)
commit 4572d53e16e87eee375bc5624de2fd59bb0ae9cd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-03-02 13:54:33 +0200
liblzma: Fix a comment and RC_SYMBOLS_MAX.
The comment didn't match the value of RC_SYMBOLS_MAX and the value
itself was slightly larger than actually needed. The only harm
about this was that memory usage was a few bytes larger.
src/liblzma/rangecoder/range_encoder.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 265daa873c0d871f5f23f9b56e133a6f20045a0a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-27 20:58:52 +0200
Build: Make CMake build fail if tuklib_cpucores or tuklib_physmem fails.
CMakeLists.txt | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 7c8b904527cdbe61248c80edcc2e20d840c4fef9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-27 20:24:27 +0200
Build: Add support for --no-po4a option to autogen.sh.
Normally, if po4a isn't available, autogen.sh will return
with non-zero exit status. The option --no-po4a can be useful
when one knows that po4a isn't available but wants autogen.sh
to still return with zero exit status.
autogen.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit 292a5c0f9c9b3a66f5a5c652dc46381836d4537f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-25 21:35:14 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 474320e9908786ba2021035f9013191e16cde08a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-25 20:42:31 +0200
Build: Fix bugs in the CMake files.
Seems that the phrase "add more quotes" from sh/bash scripting
applies to CMake as well. E.g. passing an unquoted list ${FOO}
to a function that expects one argument results in only the
first element of the list being passed as an argument and
the rest get ignored. Adding quotes helps ("${FOO}").
list(INSERT ...) is weird. Inserting an empty string to an empty
variable results in empty list, but inserting it to a non-empty
variable does insert an empty element to the list.
Since INSERT requires at least one element,
"${CMAKE_THREAD_LIBS_INIT}" needs to be quoted in CMakeLists.txt.
It might result in an empty element in the list. It seems to not
matter as empty elements consistently get ignored in that variable.
In fact, calling cmake_check_push_state() and cmake_check_pop_state()
will strip the empty elements from CMAKE_REQUIRED_LIBRARIES!
In addition to quoting fixes, this fixes checks for the cache
variables in tuklib_cpucores.cmake and tuklib_physmem.cmake.
Thanks to Martin Matuška for testing and reporting the problems.
These fixes aren't tested yet but hopefully they soon will be.
CMakeLists.txt | 52 ++++++++++++++++++++++-----------------------
cmake/tuklib_common.cmake | 8 ++++---
cmake/tuklib_cpucores.cmake | 30 ++++++++++++++------------
cmake/tuklib_integer.cmake | 34 +++++++++++++++--------------
cmake/tuklib_mbstr.cmake | 6 +++---
cmake/tuklib_physmem.cmake | 29 +++++++++++++------------
cmake/tuklib_progname.cmake | 4 ++--
7 files changed, 85 insertions(+), 78 deletions(-)
commit 7e3493d40eac0c3fa3d5124097745a70e15c41f6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-24 23:38:16 +0200
Build: Add very limited experimental CMake support.
This does *NOT* replace the Autotools-based build system in
the foreseeable future. See the comment in the beginning
of CMakeLists.txt.
So far this has been tested only on GNU/Linux but I commit
it anyway to make it easier for others to test. Since I
haven't played much with CMake before, it's likely that
there are things that have been done in a silly or wrong
way and need to be fixed.
CMakeLists.txt | 643 ++++++++++++++++++++++++++++++++++++++++++++
cmake/tuklib_common.cmake | 47 ++++
cmake/tuklib_cpucores.cmake | 173 ++++++++++++
cmake/tuklib_integer.cmake | 100 +++++++
cmake/tuklib_mbstr.cmake | 20 ++
cmake/tuklib_physmem.cmake | 149 ++++++++++
cmake/tuklib_progname.cmake | 19 ++
7 files changed, 1151 insertions(+)
commit 21bd4701fca3e9002ce78bc135debca369ed8545
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-24 23:37:07 +0200
Update m4/.gitignore.
m4/.gitignore | 1 +
1 file changed, 1 insertion(+)
commit e094d1d0f196a91ec703e8d0055948feef349ae8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-24 23:29:35 +0200
tuklib: Omit an unneeded <sys/types.h> from a tests.
tuklib_cpucores.c and tuklib_physmem.c don't include <sys/types.h>
even via other files in this package, so clearly that header isn't
needed in the tests either (no one has reported build problems due
to a missing header in a .c file).
m4/tuklib_cpucores.m4 | 1 -
m4/tuklib_physmem.m4 | 1 -
2 files changed, 2 deletions(-)
commit b3ed19a55fe99a45bd77614e149d39d18498075c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-24 23:01:00 +0200
liblzma: Remove unneeded <sys/types.h> from fastpos_tablegen.c.
This file only generates fastpos_table.c.
It isn't built as a part of liblzma.
src/liblzma/lzma/fastpos_tablegen.c | 1 -
1 file changed, 1 deletion(-)
commit 7b8982b29179b3c586e0456dc9ecbd4f58dcea59
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-22 14:15:07 +0200
Use defined(__GNUC__) before __GNUC__ in preprocessor lines.
This should silence the equivalent of -Wundef in compilers that
don't define __GNUC__.
src/common/sysdefs.h | 3 ++-
src/liblzma/api/lzma.h | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
commit 43dfe04e6209c691cf4fbe3072d4ee91271748f1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-21 17:40:02 +0200
liblzma: Add more uses of lzma_memcmplen() to the normal mode of LZMA.
This gives a tiny encoder speed improvement. This could have been done
in 2014 after the commit 544aaa3d13554e8640f9caf7db717a96360ec0f6 but
it was forgotten.
src/liblzma/lzma/lzma_encoder_optimum_normal.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
commit 59e6eb4840b9f52fa3a61544974017279b448216
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-21 17:01:15 +0200
Build: Add visibility.m4 from gnulib.
Appears that this file used to get included as a side effect of
gettext. After the change to gettext version requirements this file
no longer got copied to the package and so the build was broken.
m4/.gitignore | 1 -
m4/visibility.m4 | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+), 1 deletion(-)
commit 7fe3ef2eaa53d439cec043727ea1998f4ff0e22a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-21 16:10:44 +0200
xz: Silence a warning when sig_atomic_t is long int.
It can be true at least on z/OS.
src/xz/signals.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b0a2a77d10940c42b449d47a005bfc2e50ab5db8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-21 15:59:26 +0200
xz: Avoid unneeded access of a volatile variable.
src/xz/signals.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 524c2f12c762032b819757aeda8af7c47c4cabce
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-21 01:24:18 +0200
tuklib_integer.m4: Optimize the check order.
The __builtin byteswapping is the preferred one so check for it first.
m4/tuklib_integer.m4 | 56 +++++++++++++++++++++++++++-------------------------
1 file changed, 29 insertions(+), 27 deletions(-)
commit 57360bb4fd79b358b36d2877db26ac828d1fdfcb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-20 18:54:04 +0200
tuklib_exit: Add missing header.
strerror() needs <string.h> which happened to be included via
tuklib_common.h -> tuklib_config.h -> sysdefs.h if HAVE_CONFIG_H
was defined. This wasn't tested without config.h before so it
had worked fine.
src/common/tuklib_exit.c | 1 +
1 file changed, 1 insertion(+)
commit fddd31175e74a538997a939d930462fde17d2dd4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-18 19:12:35 +0200
Revert the previous commit and add a comment.
The previous commit broke crc32_tablegen.c.
If the whole package is built without config.h (with defines
set on the compiler command line) this should still work fine
as long as these headers conform to C99 well enough.
src/common/tuklib_config.h | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
commit 4e4e9fbb7e66d45319525ac224bff48fbdd0cf6e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-17 23:37:20 +0200
Do not check for HAVE_CONFIG_H in tuklib_config.h.
In XZ Utils sysdefs.h takes care of it and the required headers.
src/common/tuklib_config.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
commit 2d4cef954feba82073951358466a1d614141cf33
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-16 11:18:28 +0200
sysdefs.h: Omit the conditionals around string.h and limits.h.
string.h is used unconditionally elsewhere in the project and
configure has always stopped if limits.h is missing, so these
headers must have been always available even on the weirdest
systems.
src/common/sysdefs.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
commit feb9c1969bc3eb33d4ecb72cfa897f92dae84939
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-15 15:07:11 +0200
Build: Bump Autoconf and Libtool version requirements.
There is no specific reason for this other than blocking
the most ancient versions. These are still old:
Autoconf 2.69 (2012)
Automake 1.12 (2012)
gettext 0.19.6 (2015)
Libtool 2.4 (2010)
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3d576cf92158d62790017ad7f2dd6dc1dd6b42bb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-15 03:08:32 +0200
Build: Use AM_GNU_GETTEXT_REQUIRE_VERSION and require 0.19.6.
This bumps the version requirement from 0.19 (from 2014) to
0.19.6 (2015).
Using only the old AM_GNU_GETTEXT_VERSION results in old
gettext infrastructure being placed in the package. By using
both macros we get the latest gettext files while the other
programs in the Autotools family can still see the old macro.
configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit fa792b8befaf7cb3960b655e0a9410da866d756f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-14 20:42:06 +0200
Translations: Add German translation of the man pages.
Thanks to Mario Blättermann.
po4a/de.po | 5532 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po4a/po4a.conf | 2 +-
2 files changed, 5533 insertions(+), 1 deletion(-)
commit 6f7211b6bb47a895b47f533282dba9ee9a1b0c8b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-07 15:32:21 +0200
Build: Add support for translated man pages using po4a.
The dependency on po4a is optional. It's never required to install
the translated man pages when xz is built from a release tarball.
If po4a is missing when building from xz.git, the translated man
pages won't be generated but otherwise the build will work normally.
The translations are only updated automatically by autogen.sh and
by "make mydist". This makes it easy to keep po4a as an optional
dependency and ensures that I won't forget to put updated
translations to a release tarball.
The translated man pages aren't installed if --disable-nls is used.
The installation of translated man pages abuses Automake internals
by calling "install-man" with redefined dist_man_MANS and man_MANS.
This makes the hairy script code slightly less hairy. If it breaks
some day, this code needs to be fixed; don't blame Automake developers.
Also, this adds more quotes to the existing shell script code in
the Makefile.am "-hook"s.
Makefile.am | 4 ++++
autogen.sh | 8 ++++---
po4a/.gitignore | 2 ++
po4a/po4a.conf | 14 +++++++++++
po4a/update-po | 45 ++++++++++++++++++++++++++++++++++
src/scripts/Makefile.am | 64 +++++++++++++++++++++++++++++++++++++------------
src/xz/Makefile.am | 50 +++++++++++++++++++++++++++-----------
src/xzdec/Makefile.am | 55 ++++++++++++++++++++++++++++++++----------
8 files changed, 197 insertions(+), 45 deletions(-)
commit 426f9e5819ff7710a5ff573a96c02940be65d52f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-06 17:31:38 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit e3a4481d020e4de89efa037f335cf50f3ca55592
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-05 22:35:06 +0200
Update tests/.gitignore.
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit 07208de92f2d5bca764f6d0ebe9d9866051dc4ef
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-05 22:28:51 +0200
Update m4/.gitignore.
m4/.gitignore | 1 +
1 file changed, 1 insertion(+)
commit c91fbf223db46c3b3cb9df769863a1a60cd9c908
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-05 20:47:38 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 15a133b6d1a3eab4faf6eb52a71fdc56bd65846f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-05 20:40:14 +0200
xz: Make it a fatal error if enabling the sandbox fails.
Perhaps it's too drastic but on the other hand it will let me
learn about possible problems if people report the errors.
This won't be backported to the v5.2 branch.
src/xz/file_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit af0fb386ef55db66654ae39e2deec6e04190c4ff
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-05 20:33:50 +0200
xz: Comment out annoying sandboxing messages.
src/xz/file_io.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
commit 986d8c9b52b824474088e5bb3b6940651660f0e2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-05 19:33:37 +0200
Build: Workaround a POSIX shell detection problem on Solaris.
I don't know if the problem is in gnulib's gl_POSIX_SHELL macro
or if xzgrep does something that isn't in POSIX. The workaround
adds a special case for Solaris: if /usr/xpg4/bin/sh exists and
gl_cv_posix_shell wasn't overriden on the configure command line,
use that shell for xzgrep and other scripts. That shell is known
to work and exists on most Solaris systems.
configure.ac | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 6629ed929cc7d45a11e385f357ab58ec15e7e4ad
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-03 22:03:50 +0200
Build: Update m4/ax_pthread.m4 from Autoconf Archive.
m4/ax_pthread.m4 | 398 ++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 279 insertions(+), 119 deletions(-)
commit 353970510895f6a80adfe60cf71b70a95adfa8bc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-02-01 19:56:18 +0200
xz: Limit --memlimit-compress to at most 4020 MiB for 32-bit xz.
See the code comment for reasoning. It's far from perfect but
hopefully good enough for certain cases while hopefully doing
nothing bad in other situations.
At presets -5 ... -9, 4020 MiB vs. 4096 MiB makes no difference
on how xz scales down the number of threads.
The limit has to be a few MiB below 4096 MiB because otherwise
things like "xz --lzma2=dict=500MiB" won't scale down the dict
size enough and xz cannot allocate enough memory. With
"ulimit -v $((4096 * 1024))" on x86-64, the limit in xz had
to be no more than 4085 MiB. Some safety margin is good though.
This is hack but it should be useful when running 32-bit xz on
a 64-bit kernel that gives full 4 GiB address space to xz.
Hopefully this is enough to solve this:
https://bugzilla.redhat.com/show_bug.cgi?id=1196786
FreeBSD has a patch that limits the result in tuklib_physmem()
to SIZE_MAX on 32-bit systems. While I think it's not the way
to do it, the results on --memlimit-compress have been good. This
commit should achieve practically identical results for compression
while leaving decompression and tuklib_physmem() and thus
lzma_physmem() unaffected.
src/xz/hardware.c | 32 +++++++++++++++++++++++++++++++-
src/xz/xz.1 | 21 ++++++++++++++++++++-
2 files changed, 51 insertions(+), 2 deletions(-)
commit ba76d67585f88677af9f48b48e7bdc3bb7687def
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 20:53:25 +0200
xz: Set the --flush-timeout deadline when the first input byte arrives.
xz --flush-timeout=2000, old version:
1. xz is started. The next flush will happen after two seconds.
2. No input for one second.
3. A burst of a few kilobytes of input.
4. No input for one second.
5. Two seconds have passed and flushing starts.
The first second counted towards the flush-timeout even though
there was no pending data. This can cause flushing to occur more
often than needed.
xz --flush-timeout=2000, after this commit:
1. xz is started.
2. No input for one second.
3. A burst of a few kilobytes of input. The next flush will
happen after two seconds counted from the time when the
first bytes of the burst were read.
4. No input for one second.
5. No input for another second.
6. Two seconds have passed and flushing starts.
src/xz/coder.c | 6 +-----
src/xz/file_io.c | 6 +++++-
src/xz/mytime.c | 1 -
3 files changed, 6 insertions(+), 7 deletions(-)
commit fd47fd62bbb1bfd13ab63869137971d8b390025f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 20:19:19 +0200
xz: Move flush_needed from mytime.h to file_pair struct in file_io.h.
src/xz/coder.c | 3 ++-
src/xz/file_io.c | 3 ++-
src/xz/file_io.h | 3 +++
src/xz/mytime.c | 3 ---
src/xz/mytime.h | 4 ----
5 files changed, 7 insertions(+), 9 deletions(-)
commit 815035681063d5774d3640fc20b8ede783dd574e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 14:49:22 +0200
xz: coder.c: Make writing output a separate function.
The same code sequence repeats so it's nicer as a separate function.
Note that in one case there was no test for opt_mode != MODE_TEST,
but that was only because that condition would always be true, so
this commit doesn't change the behavior there.
src/xz/coder.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
commit 5a49e081a098455bcdbd95cefb90e9b18780fe58
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 14:13:42 +0200
xz: Fix semi-busy-waiting in xz --flush-timeout.
When input blocked, xz --flush-timeout=1 would wake up every
millisecond and initiate flushing which would have nothing to
flush and thus would just waste CPU time. The fix disables the
timeout when no input has been seen since the previous flush.
src/xz/coder.c | 4 ++++
src/xz/file_io.c | 15 +++++++++++----
src/xz/file_io.h | 4 ++++
3 files changed, 19 insertions(+), 4 deletions(-)
commit dcca70fe9fa3c4bec56cf9c79e966166c9a9cf6a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 13:47:31 +0200
xz: Refactor io_read() a bit.
src/xz/file_io.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
commit 4ae9ab70cd3214395756435d13d8d000368ca2cb
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 13:37:08 +0200
xz: Update a comment in file_io.h.
src/xz/file_io.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 3333ba4a6795a55cf0375329ba08152bd7fcbd46
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-26 13:27:51 +0200
xz: Move the setting of flush_needed in file_io.c to a nicer location.
src/xz/file_io.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit cf2df0f05ac98c1158c6e48145900b773223605d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2020-01-19 21:54:33 +0200
Use $(LIB_FUZZING_ENGINE) in tests/ossfuzz/Makefile.
https://github.com/google/oss-fuzz/pull/3219#issuecomment-573751048
Thanks to Bhargava Shastry for sending the patch.
tests/ossfuzz/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7136f1735c60ac6967c4b8e277fcde53d485234f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-12-31 00:41:28 +0200
Rename unaligned_read32ne to read32ne, and similarly for the others.
src/common/tuklib_integer.h | 64 +++++++++++++++----------------
src/liblzma/common/alone_encoder.c | 2 +-
src/liblzma/common/block_header_decoder.c | 2 +-
src/liblzma/common/block_header_encoder.c | 2 +-
src/liblzma/common/memcmplen.h | 9 ++---
src/liblzma/common/stream_flags_decoder.c | 6 +--
src/liblzma/common/stream_flags_encoder.c | 8 ++--
src/liblzma/lz/lz_encoder_hash.h | 2 +-
src/liblzma/lzma/lzma_decoder.c | 2 +-
src/liblzma/lzma/lzma_encoder.c | 2 +-
src/liblzma/lzma/lzma_encoder_private.h | 3 +-
src/liblzma/simple/simple_decoder.c | 2 +-
src/liblzma/simple/simple_encoder.c | 2 +-
tests/test_block_header.c | 4 +-
tests/test_stream_flags.c | 6 +--
15 files changed, 54 insertions(+), 62 deletions(-)
commit 5e78fcbf2eb21936022c9c5c3625d4da76f4b241
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-12-31 00:29:48 +0200
Rename read32ne to aligned_read32ne, and similarly for the others.
Using the aligned methods requires more care to ensure that
the address really is aligned, so it's nicer if the aligned
methods are prefixed. The next commit will remove the unaligned_
prefix from the unaligned methods which in liblzma are used in
more places than the aligned ones.
src/common/tuklib_integer.h | 56 +++++++++++++++++++++---------------------
src/liblzma/check/crc32_fast.c | 4 +--
src/liblzma/check/crc64_fast.c | 4 +--
3 files changed, 32 insertions(+), 32 deletions(-)
commit 77bc5bc6dd67056cfd5888520ac930cfc57b4516
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-12-31 00:18:24 +0200
Revise tuklib_integer.h and .m4.
Add a configure option --enable-unsafe-type-punning to get the
old non-conforming memory access methods. It can be useful with
old compilers or in some other less typical situations but
shouldn't normally be used.
Omit the packed struct trick for unaligned access. While it's
best in some cases, this is simpler. If the memcpy trick doesn't
work, one can request unsafe type punning from configure.
Because CRC32/CRC64 code needs fast aligned reads, if no very
safe way to do it is found, type punning is used as a fallback.
This sucks but since it currently works in practice, it seems to
be the least bad option. It's never needed with GCC >= 4.7 or
Clang >= 3.6 since these support __builtin_assume_aligned and
thus fast aligned access can be done with the memcpy trick.
Other things:
- Support GCC/Clang __builtin_bswapXX
- Cleaner bswap fallback macros
- Minor cleanups
m4/tuklib_integer.m4 | 46 ++++-
src/common/tuklib_integer.h | 488 ++++++++++++++++++++++++--------------------
2 files changed, 316 insertions(+), 218 deletions(-)
commit 8b72950a6b2e2a36c2d8fdc8857564b57191b088
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-12-29 22:51:58 +0200
Tests: Hopefully fix test_check.c to work on EBCDIC systems.
Thanks to Daniel Richard G.
tests/test_check.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 43ce4ea7c762238d3df9717b34126d3e0d7cd51c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-09-24 23:02:40 +0300
Scripts: Put /usr/xpg4/bin to the beginning of PATH on Solaris.
This adds a configure option --enable-path-for-scripts=PREFIX
which defaults to empty except on Solaris it is /usr/xpg4/bin
to make POSIX grep and others available. The Solaris case had
been documented in INSTALL with a manual fix but it's better
to do this automatically since it is needed on most Solaris
systems anyway.
Thanks to Daniel Richard G.
INSTALL | 43 +++++++++++++++++++++++++++++++++++--------
configure.ac | 26 ++++++++++++++++++++++++++
src/scripts/xzdiff.in | 1 +
src/scripts/xzgrep.in | 1 +
src/scripts/xzless.in | 1 +
src/scripts/xzmore.in | 1 +
6 files changed, 65 insertions(+), 8 deletions(-)
commit 6a89e656ebedd53a10cd1a063a32a9e4ade0da1f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-07-12 18:57:43 +0300
Fix comment typos in tuklib_mbstr* files.
src/common/tuklib_mbstr.h | 2 +-
src/common/tuklib_mbstr_fw.c | 2 +-
src/common/tuklib_mbstr_width.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit ac0b4212656a48ef0c187c0c941d40ac9489ae36
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-07-12 18:30:46 +0300
Add missing include to tuklib_mbstr_width.c.
It didn't matter in XZ Utils because sysdefs.h
includes string.h anyway.
src/common/tuklib_mbstr_width.c | 1 +
1 file changed, 1 insertion(+)
commit 72a443281fb0b91aebf8cdff2ab1f7c07b081240
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-07-12 18:10:57 +0300
Update tuklib base headers to include stdbool.h.
src/common/tuklib_common.h | 2 +-
src/common/tuklib_config.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit de1f47b2b40e960b7bc3acba754f66dd19705921
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-28 00:54:31 +0300
xz: Automatically align the strings in --info-memory.
This makes it easier to translate the strings.
Also, the string for amount of RAM was shortened.
src/xz/hardware.c | 45 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 34 insertions(+), 11 deletions(-)
commit 8ce679125dbd0e2058d8f886e738d7f19a45cab5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-25 23:15:21 +0300
liblzma: Fix a buggy comment.
src/liblzma/lz/lz_encoder_mf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fc77929e92e869f6869bf88931066103fd75f376
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-25 00:16:06 +0300
configure.ac: Fix a typo in a comment.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e873902641794210ad7db59743f98e3e1cd6139f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-25 00:08:13 +0300
Tests: Silence warnings from clang -Wassign-enum.
Also changed 999 to 99 so it fits even if lzma_check happened
to be 8 bits wide.
tests/test_block_header.c | 3 ++-
tests/test_stream_flags.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
commit d499e467d99efeaae688564eedc4548837c1416a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 23:52:17 +0300
liblzma: Add a comment.
src/liblzma/common/stream_encoder_mt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a12b13c5f0d54c684fa8446f93fdac08ab2a716b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 23:45:21 +0300
liblzma: Silence clang -Wmissing-variable-declarations.
src/liblzma/check/crc32_table.c | 3 +++
src/liblzma/check/crc64_table.c | 3 +++
2 files changed, 6 insertions(+)
commit 1b4675cebf7471f7cc9b7072c950e3de97147063
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 23:25:41 +0300
Add LZMA_RET_INTERNAL1..8 to lzma_ret and use one for LZMA_TIMED_OUT.
LZMA_TIMED_OUT is *internally* used as a value for lzma_ret
enumeration. Previously it was #defined to 32 and cast to lzma_ret.
That way it wasn't visible in the public API, but this was hackish.
Now the public API has eight LZMA_RET_INTERNALx members and
LZMA_TIMED_OUT is #defined to LZMA_RET_INTERNAL1. This way
the code is cleaner overall although the public API has a few
extra mysterious enum members.
src/liblzma/api/lzma/base.h | 15 ++++++++++++++-
src/liblzma/common/common.c | 4 +---
src/liblzma/common/common.h | 5 ++---
src/xz/message.c | 8 ++++++++
4 files changed, 25 insertions(+), 7 deletions(-)
commit 159c43875eb25deea626ed651274464bae3e32ef
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 22:57:43 +0300
xz: Silence a warning from clang -Wsign-conversion in main.c.
src/xz/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 466cfcd3e52f6750ce28a635997f3dd84fb18515
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 22:52:20 +0300
xz: Make "headings" static in list.c.
Caught by clang -Wmissing-variable-declarations.
src/xz/list.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 608517b9b76c41fac6613dbda1193d6f41338e19
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 22:47:39 +0300
liblzma: Remove incorrect uses of lzma_attribute((__unused__)).
Caught by clang -Wused-but-marked-unused.
src/liblzma/common/alone_decoder.c | 3 +--
src/liblzma/common/alone_encoder.c | 3 +--
src/liblzma/lz/lz_decoder.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
commit c2d2ab6a9d41a2b55d047c5b710aacf80d219255
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 20:53:55 +0300
Tests: Silence a warning from -Wsign-conversion.
tests/create_compress_files.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 2402f7873dcae719d0ebddd23bb579074519ac52
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 20:45:49 +0300
xz: Fix an integer overflow with 32-bit off_t.
Or any off_t which isn't very big (like signed 64 bit integer
that most system have). A small off_t could overflow if the
file being decompressed had long enough run of zero bytes,
which would result in corrupt output.
src/xz/file_io.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
commit 4fd3a8dd0b60f029e1c66a0ee634f9e9fda3caa9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 01:24:17 +0300
xz: Cleanup io_seek_src() a bit.
lseek() returns -1 on error and checking for -1 is nicer.
src/xz/file_io.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit dfda7cf6afa486e10df035327d68753896dfb48a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 00:57:23 +0300
Tests: Remove a duplicate branch from tests/tests.h.
The duplication was introduced about eleven years ago and
should have been cleaned up back then already.
This was caught by -Wduplicated-branches.
tests/tests.h | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
commit 1d4a904d8fb634bd5a04f7fbdd17d3739f3d8866
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 00:40:45 +0300
xz: Change io_seek_src and io_pread arguments from off_t to uint64_t.
This helps fixing warnings from -Wsign-conversion and makes the
code look better too.
src/xz/file_io.c | 16 ++++++++++++----
src/xz/file_io.h | 4 ++--
src/xz/list.c | 9 ++++-----
3 files changed, 18 insertions(+), 11 deletions(-)
commit 50120deb0159fcb53ee1a6caffb2bb81a1ecd990
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-24 00:12:38 +0300
xz: list.c: Fix some warnings from -Wsign-conversion.
src/xz/list.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit d0a78751eb54fb1572002746c533936a118e4e42
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-23 23:22:45 +0300
tuklib_mbstr_width: Fix a warning from -Wsign-conversion.
src/common/tuklib_mbstr_width.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7883d73530b4b2a701ddd7d50c35676cbc158039
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-23 23:19:34 +0300
xz: Fix some of the warnings from -Wsign-conversion.
src/xz/args.c | 4 ++--
src/xz/coder.c | 4 ++--
src/xz/file_io.c | 5 +++--
src/xz/message.c | 4 ++--
src/xz/mytime.c | 4 ++--
src/xz/options.c | 2 +-
src/xz/util.c | 4 ++--
7 files changed, 14 insertions(+), 13 deletions(-)
commit c2b994fe3d35e9e575c28869a2f7f534f2495d05
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-23 22:27:45 +0300
tuklib_cpucores: Silence warnings from -Wsign-conversion.
src/common/tuklib_cpucores.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 07c4fa9e1a195e0543f271380c8de22a3ab145ff
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-23 21:40:47 +0300
xzdec: Fix warnings from -Wsign-conversion.
src/xzdec/xzdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit dfac2c9a1d7d4a2b8a5d7c9c6d567dee48318bcf
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-23 21:38:56 +0300
liblzma: Fix warnings from -Wsign-conversion.
Also, more parentheses were added to the literal_subcoder
macro in lzma_comon.h (better style but no functional change
in the current usage).
src/liblzma/common/block_header_decoder.c | 2 +-
src/liblzma/delta/delta_decoder.c | 2 +-
src/liblzma/lzma/fastpos.h | 2 +-
src/liblzma/lzma/lzma2_decoder.c | 8 ++++----
src/liblzma/lzma/lzma_common.h | 3 ++-
src/liblzma/lzma/lzma_decoder.c | 16 ++++++++--------
src/liblzma/simple/arm.c | 6 +++---
src/liblzma/simple/armthumb.c | 8 ++++----
src/liblzma/simple/ia64.c | 2 +-
src/liblzma/simple/powerpc.c | 9 +++++----
src/liblzma/simple/x86.c | 2 +-
11 files changed, 31 insertions(+), 29 deletions(-)
commit 41838dcc26375f6aa393a63e4d81e2f4d223de07
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-23 19:33:55 +0300
tuklib_integer: Silence warnings from -Wsign-conversion.
src/common/tuklib_integer.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 3ce05d235f736d392347a05086b8033416874b87
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-20 19:40:30 +0300
tuklib_integer: Fix usage of conv macros.
Use a temporary variable instead of e.g.
conv32le(unaligned_read32ne(buf)) because the macro can
evaluate its argument multiple times.
src/common/tuklib_integer.h | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
commit b525b0c0ef40cd89b69294c9b8d57f4a8db58e1f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-03 20:44:19 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 039a168e8cf201d5104a25ec41f0cf25eda6cc53
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-03 20:41:54 +0300
liblzma: Fix comments.
Thanks to Bruce Stark.
src/liblzma/common/alone_encoder.c | 4 ++--
src/liblzma/common/block_util.c | 2 +-
src/liblzma/common/common.c | 2 +-
src/liblzma/common/filter_common.h | 2 +-
src/liblzma/common/filter_decoder.h | 2 +-
src/liblzma/common/filter_flags_encoder.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
commit c460f6defebc5a81bbca90adc2476154ca244f69
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-02 00:50:59 +0300
liblzma: Fix one more unaligned read to use unaligned_read16ne().
src/liblzma/lz/lz_encoder_hash.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c81d77c537f0b8c8672868e1dc6cf7290ce4a25b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-01 21:41:55 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 386394fc9fcde2615391f804eaa466749f96f4ef
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-01 21:36:13 +0300
liblzma: memcmplen: Use ctz32() from tuklib_integer.h.
The same compiler-specific #ifdefs are already in tuklib_integer.h
src/liblzma/common/memcmplen.h | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
commit 264ab971ce2994baac41b1579c9c35aba7743fc8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-01 21:30:03 +0300
tuklib_integer: Cleanup MSVC-specific code.
src/common/tuklib_integer.h | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
commit 33773c6f2a8711d4aa6656795db52c59a28580ec
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-01 19:01:21 +0300
liblzma: Use unaligned_readXXne functions instead of type punning.
Now gcc -fsanitize=undefined should be clean.
Thanks to Jeffrey Walton.
src/liblzma/common/memcmplen.h | 12 ++++++------
src/liblzma/lzma/lzma_encoder_private.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
commit e5f13a66567b1987e0aae42c6fdcd277bb5810ba
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-01 18:46:54 +0300
tuklib_integer: Autodetect support for unaligned access on ARM.
The result is used as the default for --enable-unaligned-access.
The test should work with GCC and Clang.
m4/tuklib_integer.m4 | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 3bc112c2d38d5f348bce7bc2422286b1692c7490
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-06-01 18:41:16 +0300
tuklib_integer: Improve unaligned memory access.
Now memcpy() or GNU C packed structs for unaligned access instead
of type punning. See the comment in this commit for details.
Avoiding type punning with unaligned access is needed to
silence gcc -fsanitize=undefined.
New functions: unaliged_readXXne and unaligned_writeXXne where
XX is 16, 32, or 64.
src/common/tuklib_integer.h | 180 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 168 insertions(+), 12 deletions(-)
commit 2a22de439ec63da1927b640eda309296a1e8dce5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-13 20:05:17 +0300
liblzma: Avoid memcpy(NULL, foo, 0) because it is undefined behavior.
I should have always known this but I didn't. Here is an example
as a reminder to myself:
int mycopy(void *dest, void *src, size_t n)
{
memcpy(dest, src, n);
return dest == NULL;
}
In the example, a compiler may assume that dest != NULL because
passing NULL to memcpy() would be undefined behavior. Testing
with GCC 8.2.1, mycopy(NULL, NULL, 0) returns 1 with -O0 and -O1.
With -O2 the return value is 0 because the compiler infers that
dest cannot be NULL because it was already used with memcpy()
and thus the test for NULL gets optimized out.
In liblzma, if a null-pointer was passed to memcpy(), there were
no checks for NULL *after* the memcpy() call, so I cautiously
suspect that it shouldn't have caused bad behavior in practice,
but it's hard to be sure, and the problematic cases had to be
fixed anyway.
Thanks to Jeffrey Walton.
src/liblzma/common/common.c | 6 +++++-
src/liblzma/lz/lz_decoder.c | 12 +++++++++---
src/liblzma/simple/simple_coder.c | 10 +++++++++-
3 files changed, 23 insertions(+), 5 deletions(-)
commit d3fc850cfedc058247d9e334ce59bbc8f2286d8a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-11 20:56:08 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 4adb8288ab61d5f14e212007b8742df0710baf73
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-11 20:54:12 +0300
xz: Update xz man page date.
src/xz/xz.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2fb0ddaa557ce86e38fe06439930fa8665f092fd
Author: Antoine Cœur <antoine.coeur@ef.com>
Date: 2019-05-08 13:30:57 +0800
spelling
Doxyfile.in | 2 +-
NEWS | 2 +-
doc/examples/11_file_info.c | 2 +-
src/liblzma/api/lzma/block.h | 2 +-
src/liblzma/api/lzma/hardware.h | 2 +-
src/liblzma/api/lzma/lzma12.h | 2 +-
src/liblzma/api/lzma/vli.h | 2 +-
src/liblzma/common/file_info.c | 4 ++--
src/liblzma/common/hardware_physmem.c | 2 +-
src/liblzma/common/index.c | 4 ++--
src/liblzma/common/stream_encoder_mt.c | 2 +-
src/liblzma/common/vli_decoder.c | 2 +-
src/liblzma/lz/lz_decoder.c | 2 +-
src/scripts/xzgrep.in | 2 +-
src/xz/args.c | 2 +-
src/xz/coder.c | 4 ++--
src/xz/list.c | 4 ++--
src/xz/main.c | 2 +-
src/xz/mytime.h | 2 +-
src/xz/private.h | 2 +-
src/xz/xz.1 | 2 +-
windows/build.bash | 2 +-
22 files changed, 26 insertions(+), 26 deletions(-)
commit 4ed339606156bd313ed99237485cb8ed0362d64f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-01 18:43:10 +0300
xz: In xz -lvv look at the widths of the check names too.
Now the widths of the check names is used to adjust the width
of the Check column. This way there no longer is a need to restrict
the widths of the check names to be at most ten terminal-columns.
src/xz/list.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
commit 2f4281a1001dcf7fdf1418c0c0d246c16561fb65
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-01 18:33:25 +0300
xz: Fix xz -lvv column alignment to look at the translated strings.
src/xz/list.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 01d01b7c7c0b8eaf7f780a5584ec52c22d10fa4a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-01 16:52:36 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 64030c6b17f7743df03a9948a0ccfcdf40c6b97c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-05-01 16:43:16 +0300
Windows: Update VS version in windows/vs2019/config.h.
windows/vs2019/config.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2dc9117f5fbfab31444a3ca1e55795ccfa8a9f51
Author: Julien Marrec <julien.marrec@gmail.com>
Date: 2019-04-25 17:44:06 +0200
Windows: Upgrade solution itself
windows/vs2019/xz_win.sln | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit ac31413916fa9b11bab17f0f0aa63e2869360f6f
Author: Julien Marrec <julien.marrec@gmail.com>
Date: 2019-04-25 17:40:24 +0200
Windows: Upgrade solution with VS2019
windows/vs2019/liblzma.vcxproj | 15 ++++++++-------
windows/vs2019/liblzma_dll.vcxproj | 15 ++++++++-------
2 files changed, 16 insertions(+), 14 deletions(-)
commit be25a0c37ba92a20c390b4d17fe502457fe96b71
Author: Julien Marrec <julien.marrec@gmail.com>
Date: 2019-04-25 17:39:32 +0200
Windows: Duplicate windows/vs2017 before upgrading
windows/vs2019/config.h | 148 ++++++++++++++
windows/vs2019/liblzma.vcxproj | 356 ++++++++++++++++++++++++++++++++++
windows/vs2019/liblzma_dll.vcxproj | 385 +++++++++++++++++++++++++++++++++++++
windows/vs2019/xz_win.sln | 48 +++++
4 files changed, 937 insertions(+)
commit d0e58b3a51e8e616f3dc26ec7b7e4aa0fa6991ad
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-03-04 22:49:04 +0200
README: Update translation instructions.
XZ Utils is now part of the Translation Project
<https://translationproject.org/>.
README | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
commit a750c35a7d45a16c11c1d40fecee8443c32a9996
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-03-04 21:20:39 +0200
xz: Automatically align column headings in xz -lvv.
src/xz/list.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 212 insertions(+), 51 deletions(-)
commit 6cb42e8aa1dc37bf403a9f5acbd07e86036b7e77
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-03-04 01:07:59 +0200
xz: Automatically align strings ending in a colon in --list output.
This should avoid alignment errors in translations with these
strings.
src/xz/list.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 102 insertions(+), 12 deletions(-)
commit 1e3f29b62f2c03e50fc9ebea7b83c1497dd35484
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2019-01-13 17:29:23 +0200
Windows/VS2017: Omit WindowsTargetPlatformVersion from project files.
I understood that if a WTPV is specified, it's often wrong
because different VS installations have different SDK version
installed. Omitting the WTPV tag makes VS2017 default to
Windows SDK 8.1 which often is also missing, so in any case
people may need to specify the WTPV before building. But some
day in the future a missing WTPV tag will start to default to
the latest installed SDK which sounds reasonable:
https://developercommunity.visualstudio.com/content/problem/140294/windowstargetplatformversion-makes-it-impossible-t.html
Thanks to "dom".
windows/INSTALL-MSVC.txt | 4 ++++
windows/vs2017/liblzma.vcxproj | 1 -
windows/vs2017/liblzma_dll.vcxproj | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
commit 4d86076332aece6314063d3712a5f364172bbb0f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-12-20 20:42:29 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit b55d79461d1f6aeaac03c7dae84481e5eb8bea4c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-12-14 20:34:30 +0200
xz: Fix a crash in progress indicator when in passthru mode.
"xz -dcfv not_an_xz_file" crashed (all four options are
required to trigger it). It caused xz to call
lzma_get_progress(&strm, ...) when no coder was initialized
in strm. In this situation strm.internal is NULL which leads
to a crash in lzma_get_progress().
The bug was introduced when xz started using lzma_get_progress()
to get progress info for multi-threaded compression, so the
bug is present in versions 5.1.3alpha and higher.
Thanks to Filip Palian <Filip.Palian@pjwstk.edu.pl> for
the bug report.
src/xz/coder.c | 11 +++++++----
src/xz/message.c | 18 ++++++++++++++++--
src/xz/message.h | 3 ++-
3 files changed, 25 insertions(+), 7 deletions(-)
commit 4ae5526de013efd1021686fa80bdd10cf1cb9c56
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-11-22 17:20:31 +0200
xz: Update man page timestamp.
src/xz/xz.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6a36d0d5f49e0080ff64dd9ef250abd489bea2ad
Author: Pavel Raiskup <praiskup@redhat.com>
Date: 2018-11-22 15:14:34 +0100
'have have' typos
src/xz/signals.c | 2 +-
src/xz/xz.1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 9eca51ef805ed8002a851df1b4995d71826c8b6e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-11-02 20:40:48 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 106d1a663d4ba42b63231caa289f531548df81c1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-11-02 20:18:45 +0200
Tests: Add a fuzz test program and a config file for OSS-Fuzz.
Thanks to Bhargava Shastry and Github user pdknsk.
tests/Makefile.am | 1 +
tests/ossfuzz/Makefile | 7 ++++
tests/ossfuzz/config/fuzz.dict | 2 +
tests/ossfuzz/config/fuzz.options | 2 +
tests/ossfuzz/fuzz.c | 82 +++++++++++++++++++++++++++++++++++++++
5 files changed, 94 insertions(+)
commit a18ae42a79a19b1394b41eb3e238139fd28012ec
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-10-26 22:49:10 +0300
liblzma: Don't verify header CRC32s if building for fuzz testing.
FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION is #defined when liblzma
is being built for fuzz testing.
Most fuzzed inputs would normally get rejected because of incorrect
CRC32 and the actual header decoding code wouldn't get fuzzed.
Disabling CRC32 checks avoids this problem. The fuzzer program
must still use LZMA_IGNORE_CHECK flag to disable verification of
integrity checks of uncompressed data.
src/liblzma/common/block_header_decoder.c | 5 ++++-
src/liblzma/common/index_decoder.c | 5 ++++-
src/liblzma/common/index_hash.c | 5 ++++-
src/liblzma/common/stream_flags_decoder.c | 10 ++++++++--
4 files changed, 20 insertions(+), 5 deletions(-)
commit f76f7516d6a1c832f61810c82e92d151cc80966c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-07-27 18:10:44 +0300
xzless: Rename unused variables to silence static analysers.
In this particular case I don't see this affecting readability
of the code.
Thanks to Pavel Raiskup.
src/scripts/xzless.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3cbcaeb07eb7543735befd6f507fdb5fa4363cff
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-07-27 16:02:58 +0300
liblzma: Remove an always-true condition from lzma_index_cat().
This should help static analysis tools to see that newg
isn't leaked.
Thanks to Pavel Raiskup.
src/liblzma/common/index.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 76762ae6098ec55c326f4b4b4a42e8c1918ee81f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-05-19 21:23:25 +0300
liblzma: Improve lzma_properties_decode() API documentation.
src/liblzma/api/lzma/filter.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 2267f5b0d20a5d24e93fcd9f72ea7eeb0d89708c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-04-29 18:58:19 +0300
Bump the version number to 5.3.1alpha.
src/liblzma/api/lzma/version.h | 2 +-
src/liblzma/liblzma.map | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit cee3021d30704858e4bdd22240e7d28e570d7451
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-04-29 18:48:00 +0300
extra/scanlzma: Fix compiler warnings.
extra/scanlzma/scanlzma.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit c5c7ceb08a011b97d261798033e2c39613a69eb7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-04-29 18:44:47 +0300
DOS: Add file_info.c to the list of files to build.
dos/Makefile | 1 +
1 file changed, 1 insertion(+)
commit 114cab97af766b21e0fc8620479202fb1e7a5e41
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-04-29 18:33:10 +0300
Update NEWS for 5.3.1alpha.
NEWS | 11 +++++++++++
1 file changed, 11 insertions(+)
commit b8139e11c512bbf32bf58ab0689f9bb6c52819da
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-04-29 18:15:37 +0300
Add NEWS for 5.2.4.
NEWS | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
commit 47b59d47cfd904a420fbd45629d168ca1973721d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-02-06 19:36:30 +0200
Update THANKS.
THANKS | 2 ++
1 file changed, 2 insertions(+)
commit bc197991690ede24ab143665b5b0f0f9cb35cc46
Author: Ben Boeckel <mathstuf@gmail.com>
Date: 2018-01-29 13:58:18 -0500
nothrow: use noexcept for C++11 and newer
In C++11, the `throw()` specifier is deprecated and `noexcept` is
preffered instead.
src/liblzma/api/lzma.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit fb6d4f83cb6e144734f2a4216bb117bd56dc3cb5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-02-06 18:02:48 +0200
liblzma: Remove incorrect #ifdef from range_common.h.
In most cases it was harmless but it could affect some
custom build systems.
Thanks to Pippijn van Steenhoven.
src/liblzma/rangecoder/range_common.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit bc577d35c2d0ed17f554d2d8107b2a2a9abbac76
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-01-10 22:10:39 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 713bbc1a80f26d34c96ed3dbb9887362204de3a1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2018-01-10 21:54:27 +0200
tuklib_integer: New Intel C compiler needs immintrin.h.
Thanks to Melanie Blower (Intel) for the patch.
src/common/tuklib_integer.h | 11 +++++++++++
1 file changed, 11 insertions(+)
commit a0ee1afbd99da138b559cb27fa2022e7f1ab44f3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-09-24 20:04:24 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit a1e2c568de29c0b57d873eab40a2879b749da429
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-09-16 20:36:20 +0300
Windows: Fix paths in VS project files.
Some paths use slashes instead of backslashes as directory
separators... now it should work (I tested VS2013 version).
windows/vs2013/liblzma.vcxproj | 12 ++++++------
windows/vs2013/liblzma_dll.vcxproj | 24 ++++++++++++------------
windows/vs2017/liblzma.vcxproj | 12 ++++++------
windows/vs2017/liblzma_dll.vcxproj | 24 ++++++++++++------------
4 files changed, 36 insertions(+), 36 deletions(-)
commit cea5cf8d26c9d1dc30a808614d79c0b25640e15e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-09-16 12:56:20 +0300
Windows: Update VS2017 project files to include file info decoder.
windows/vs2017/liblzma.vcxproj | 2 ++
windows/vs2017/liblzma_dll.vcxproj | 2 ++
2 files changed, 4 insertions(+)
commit 95d563db3ee497b223e522b699c4d4c29943eef0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-09-16 12:54:23 +0300
Windows: Add project files for VS2017.
These files match the v5.2 branch (no file info decoder).
windows/vs2017/config.h | 148 ++++++++++++++
windows/vs2017/liblzma.vcxproj | 355 ++++++++++++++++++++++++++++++++++
windows/vs2017/liblzma_dll.vcxproj | 384 +++++++++++++++++++++++++++++++++++++
windows/vs2017/xz_win.sln | 48 +++++
4 files changed, 935 insertions(+)
commit ab72416d62ea8f50ad31d5b8545fcb6a2bf96b73
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-09-16 12:45:50 +0300
Windows: Update VS2013 project files to include file info decoder.
windows/vs2013/liblzma.vcxproj | 2 ++
windows/vs2013/liblzma_dll.vcxproj | 2 ++
2 files changed, 4 insertions(+)
commit 82388980187b0e3794d187762054200bbdcc9a53
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-09-16 12:39:43 +0300
Windows: Move VS2013 files into windows/vs2013 directory.
windows/{ => vs2013}/config.h | 0
windows/{ => vs2013}/liblzma.vcxproj | 278 +++++++++++++++---------------
windows/{ => vs2013}/liblzma_dll.vcxproj | 280 +++++++++++++++----------------
windows/{ => vs2013}/xz_win.sln | 0
4 files changed, 279 insertions(+), 279 deletions(-)
commit 94e3f986aa4e14b4ff01ac24857f499630d6d180
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-08-14 20:08:33 +0300
Fix or hide warnings from GCC 7's -Wimplicit-fallthrough.
src/liblzma/lzma/lzma_decoder.c | 6 ++++++
src/xz/list.c | 2 ++
2 files changed, 8 insertions(+)
commit 0b0e1e6803456aac641a59332200f8e95e2b7ea8
Author: Alexey Tourbin <alexey.tourbin@gmail.com>
Date: 2017-05-16 23:56:35 +0300
Docs: Fix a typo in a comment in doc/examples/02_decompress.c.
doc/examples/02_decompress.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a015cd1f90116e655be4eaf4aad42c4c911c2807
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-05-23 18:34:43 +0300
xz: Fix "xz --list --robot missing_or_bad_file.xz".
It ended up printing an uninitialized char-array when trying to
print the check names (column 7) on the "totals" line.
This also changes the column 12 (minimum xz version) to
50000002 (xz 5.0.0) instead of 0 when there are no valid
input files.
Thanks to kidmin for the bug report.
src/xz/list.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit c2e29f06a7d1e3ba242ac2fafc69f5d6e92f62cd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-24 20:20:11 +0300
Docs: Add doc/examples/11_file_info.c.
doc/examples/11_file_info.c | 206 ++++++++++++++++++++++++++++++++++++++++++++
doc/examples/Makefile | 3 +-
2 files changed, 208 insertions(+), 1 deletion(-)
commit 1520f6ec808896375ac7bf778c449e0f7dea5f46
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-24 19:48:47 +0300
Build: Omit pre-5.0.0 entries from the generated ChangeLog.
It makes ChangeLog significantly smaller.
Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 8269782283806c90a8509c2ac2a308344f70e171
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-24 19:48:23 +0300
xz: Use lzma_file_info_decoder() for --list.
src/xz/list.c | 254 ++++++++++------------------------------------------------
1 file changed, 44 insertions(+), 210 deletions(-)
commit e353d0b1cc0d3997ae5048faa8e6786414953e06
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-24 19:35:50 +0300
liblzma: Add lzma_file_info_decoder().
src/liblzma/api/lzma/index.h | 66 ++++
src/liblzma/common/Makefile.inc | 1 +
src/liblzma/common/file_info.c | 855 ++++++++++++++++++++++++++++++++++++++++
src/liblzma/liblzma.map | 7 +-
4 files changed, 928 insertions(+), 1 deletion(-)
commit 144ef9e19e9496c995b21505dd1e111c442968d1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-24 19:30:22 +0300
Update the Git repository URL to HTTPS in ChangeLog.
ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8c9842c265993d7dd4039f732d3546267fb5ecc4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-21 15:05:16 +0300
liblzma: Rename LZMA_SEEK to LZMA_SEEK_NEEDED and seek_in to seek_pos.
src/liblzma/api/lzma/base.h | 18 +++++++++---------
src/liblzma/common/common.c | 2 +-
src/xz/message.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
commit 662b27c417cab248cb365dd7682121bdec4d5ae7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-19 22:17:35 +0300
Update the home page URLs to HTTPS.
COPYING | 2 +-
README | 2 +-
configure.ac | 2 +-
doc/faq.txt | 4 ++--
dos/config.h | 2 +-
src/common/common_w32res.rc | 2 +-
src/xz/xz.1 | 6 +++---
src/xzdec/xzdec.1 | 4 ++--
windows/README-Windows.txt | 2 +-
windows/config.h | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
commit c28f0b3d00af87b92dda229831548d8eb0067d1d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-04-05 18:47:22 +0300
xz: Add io_seek_src().
src/xz/file_io.c | 20 +++++++++++++++++---
src/xz/file_io.h | 13 +++++++++++++
2 files changed, 30 insertions(+), 3 deletions(-)
commit bba477257d7319c8764890f3669175b866d24944
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-03-30 22:01:54 +0300
xz: Use POSIX_FADV_RANDOM for in "xz --list" mode.
xz --list is random access so POSIX_FADV_SEQUENTIAL was clearly
wrong.
src/xz/file_io.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
commit 310d19816d1652b0c8bb1b82574d46345d924752
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-03-30 20:03:05 +0300
liblzma: Make lzma_index_decoder_init() visible to other liblzma funcs.
This is to allow other functions to use it without going
via the public API (lzma_index_decoder()).
src/liblzma/common/Makefile.inc | 1 +
src/liblzma/common/index_decoder.c | 10 +++++-----
src/liblzma/common/index_decoder.h | 24 ++++++++++++++++++++++++
3 files changed, 30 insertions(+), 5 deletions(-)
commit a27920002dbc469f778a134fc665b7c3ea73701b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-03-30 20:00:09 +0300
liblzma: Add generic support for input seeking (LZMA_SEEK).
Also mention LZMA_SEEK in xz/message.c to silence a warning.
src/liblzma/api/lzma/base.h | 31 ++++++++++++++++++++++++++++++-
src/liblzma/common/common.c | 12 +++++++++++-
src/xz/message.c | 1 +
3 files changed, 42 insertions(+), 2 deletions(-)
commit a0b1dda409bc3e6e2957a2651663fc411d2caf2d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-03-30 19:47:45 +0300
liblzma: Fix lzma_memlimit_set(strm, 0).
The 0 got treated specially in a buggy way and as a result
the function did nothing. The API doc said that 0 was supposed
to return LZMA_PROG_ERROR but it didn't.
Now 0 is treated as if 1 had been specified. This is done because
0 is already used to indicate an error from lzma_memlimit_get()
and lzma_memusage().
In addition, lzma_memlimit_set() no longer checks that the new
limit is at least LZMA_MEMUSAGE_BASE. It's counter-productive
for the Index decoder and was actually needed only by the
auto decoder. Auto decoder has now been modified to check for
LZMA_MEMUSAGE_BASE.
src/liblzma/api/lzma/base.h | 7 ++++++-
src/liblzma/common/auto_decoder.c | 3 +++
src/liblzma/common/common.c | 6 ++++--
3 files changed, 13 insertions(+), 3 deletions(-)
commit 84462afaada61379f5878e46f8f00e25a1cdcf29
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-03-30 19:16:55 +0300
liblzma: Similar memlimit fix for stream_, alone_, and auto_decoder.
src/liblzma/api/lzma/container.h | 21 +++++++++++++++++----
src/liblzma/common/alone_decoder.c | 5 +----
src/liblzma/common/auto_decoder.c | 5 +----
src/liblzma/common/stream_decoder.c | 5 +----
4 files changed, 20 insertions(+), 16 deletions(-)
commit cbc74017939690d13441b8926bb743fb03211b83
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2017-03-30 18:58:18 +0300
liblzma: Fix handling of memlimit == 0 in lzma_index_decoder().
It returned LZMA_PROG_ERROR, which was done to avoid zero as
the limit (because it's a special value elsewhere), but using
LZMA_PROG_ERROR is simply inconvenient and can cause bugs.
The fix/workaround is to treat 0 as if it were 1 byte. It's
effectively the same thing. The only weird consequence is
that then lzma_memlimit_get() will return 1 even when 0 was
specified as the limit.
This fixes a very rare corner case in xz --list where a specific
memory usage limit and a multi-stream file could print the
error message "Internal error (bug)" instead of saying that
the memory usage limit is too low.
src/liblzma/api/lzma/index.h | 18 +++++++++++-------
src/liblzma/common/index_decoder.c | 4 ++--
2 files changed, 13 insertions(+), 9 deletions(-)
commit 78ae13bced912b1b92ae927992c99cbcc463cae7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-12-30 13:25:10 +0200
Update NEWS for 5.2.3.
NEWS | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
commit 0297863fdb453aed1a25eb025f3ba7bacbbb1357
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-12-26 20:55:52 +0200
Document --enable-sandbox configure option in INSTALL.
INSTALL | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
commit d4a0462abe5478193521c14625e1c81fead87f9f
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-11-21 20:24:50 +0200
liblzma: Avoid multiple definitions of lzma_coder structures.
Only one definition was visible in a translation unit.
It avoided a few casts and temp variables but seems that
this hack doesn't work with link-time optimizations in compilers
as it's not C99/C11 compliant.
Fixes:
http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html
src/liblzma/common/alone_decoder.c | 44 +++++----
src/liblzma/common/alone_encoder.c | 34 ++++---
src/liblzma/common/auto_decoder.c | 35 ++++---
src/liblzma/common/block_decoder.c | 41 ++++----
src/liblzma/common/block_encoder.c | 40 ++++----
src/liblzma/common/common.h | 18 ++--
src/liblzma/common/index_decoder.c | 33 ++++---
src/liblzma/common/index_encoder.c | 16 ++--
src/liblzma/common/stream_decoder.c | 50 +++++-----
src/liblzma/common/stream_encoder.c | 56 ++++++-----
src/liblzma/common/stream_encoder_mt.c | 124 ++++++++++++++-----------
src/liblzma/delta/delta_common.c | 25 ++---
src/liblzma/delta/delta_decoder.c | 6 +-
src/liblzma/delta/delta_encoder.c | 12 ++-
src/liblzma/delta/delta_private.h | 4 +-
src/liblzma/lz/lz_decoder.c | 60 ++++++------
src/liblzma/lz/lz_decoder.h | 13 ++-
src/liblzma/lz/lz_encoder.c | 57 +++++++-----
src/liblzma/lz/lz_encoder.h | 9 +-
src/liblzma/lzma/lzma2_decoder.c | 32 ++++---
src/liblzma/lzma/lzma2_encoder.c | 51 +++++-----
src/liblzma/lzma/lzma_decoder.c | 27 +++---
src/liblzma/lzma/lzma_encoder.c | 29 +++---
src/liblzma/lzma/lzma_encoder.h | 9 +-
src/liblzma/lzma/lzma_encoder_optimum_fast.c | 3 +-
src/liblzma/lzma/lzma_encoder_optimum_normal.c | 23 ++---
src/liblzma/lzma/lzma_encoder_private.h | 6 +-
src/liblzma/simple/arm.c | 2 +-
src/liblzma/simple/armthumb.c | 2 +-
src/liblzma/simple/ia64.c | 2 +-
src/liblzma/simple/powerpc.c | 2 +-
src/liblzma/simple/simple_coder.c | 61 ++++++------
src/liblzma/simple/simple_private.h | 12 +--
src/liblzma/simple/sparc.c | 2 +-
src/liblzma/simple/x86.c | 15 +--
35 files changed, 532 insertions(+), 423 deletions(-)
commit a01794c52add98263b49119842c3e7141d1b9ced
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-10-24 18:53:25 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit df8f446e3ad47e5148b8c8d8b6e519d3ce29cb9d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-10-24 18:51:36 +0300
tuklib_cpucores: Add support for sched_getaffinity().
It's available in glibc (GNU/Linux, GNU/kFreeBSD). It's better
than sysconf(_SC_NPROCESSORS_ONLN) because sched_getaffinity()
gives the number of cores available to the process instead of
the total number of cores online.
As a side effect, this commit fixes a bug on GNU/kFreeBSD where
configure would detect the FreeBSD-specific cpuset_getaffinity()
but it wouldn't actually work because on GNU/kFreeBSD it requires
using -lfreebsd-glue when linking. Now the glibc-specific function
will be used instead.
Thanks to Sebastian Andrzej Siewior for the original patch
and testing.
m4/tuklib_cpucores.m4 | 30 +++++++++++++++++++++++++++++-
src/common/tuklib_cpucores.c | 9 +++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
commit 446e4318fa79788e09299d5953b5dd428953d14b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-06-30 20:27:36 +0300
xz: Fix copying of timestamps on Windows.
xz used to call utime() on Windows, but its result gets lost
on close(). Using _futime() seems to work.
Thanks to Martok for reporting the bug:
http://www.mail-archive.com/xz-devel@tukaani.org/msg00261.html
configure.ac | 2 +-
src/xz/file_io.c | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
commit 1b0ac0c53c761263e91e34195cb21dfdcfeac0bd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-06-16 22:46:02 +0300
xz: Silence warnings from -Wlogical-op.
Thanks to Evan Nemerson.
src/xz/file_io.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
commit c83b7a03342c3325ff10400b22ee21edfcd1e026
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-04-10 20:55:49 +0300
Build: Fix = to += for xz_SOURCES in src/xz/Makefile.am.
Thanks to Christian Kujau.
src/xz/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ade31a2bfb95c94d05fbfc0ecbba5d6377f2506e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-04-10 20:54:17 +0300
Build: Bump GNU Gettext version requirement to 0.19.
It silences a few warnings and most people probably have
0.19 even on stable distributions.
Thanks to Christian Kujau.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ac398c3bafa6e4c80e20571373a96947db863b3d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-03-13 20:21:49 +0200
liblzma: Disable external SHA-256 by default.
This is the sane thing to do. The conflict with OpenSSL
on some OSes and especially that the OS-provided versions
can be significantly slower makes it clear that it was
a mistake to have the external SHA-256 support enabled by
default.
Those who want it can now pass --enable-external-sha256 to
configure. INSTALL was updated with notes about OSes where
this can be a bad idea.
The SHA-256 detection code in configure.ac had some bugs that
could lead to a build failure in some situations. These were
fixed, although it doesn't matter that much now that the
external SHA-256 is disabled by default.
MINIX >= 3.2.0 uses NetBSD's libc and thus has SHA256_Init
in libc instead of libutil. Support for the libutil version
was removed.
INSTALL | 36 ++++++++++++++++++++++
configure.ac | 76 +++++++++++++++++++++++------------------------
src/liblzma/check/check.h | 16 ++++------
3 files changed, 79 insertions(+), 49 deletions(-)
commit 6fd5ecb589a9fdd7a576ea48c4850d496bab9ce5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-03-10 20:27:05 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 473ef0dc69a30e64d5fa0d34aca02f7309faa3e9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2016-03-10 20:26:49 +0200
Build: Avoid SHA256_Init on FreeBSD and MINIX 3.
On FreeBSD 10 and older, SHA256_Init from libmd conflicts
with libcrypto from OpenSSL. The OpenSSL version has
different sizeof(SHA256_CTX) and it can cause weird
problems if wrong SHA256_Init gets used.
Looking at the source, MINIX 3 seems to have a similar issue but
I'm not sure. To be safe, I disabled SHA256_Init on MINIX 3 too.
NetBSD has SHA256_Init in libc and they had a similar problem,
but they already fixed it in 2009.
Thanks to Jim Wilcoxson for the bug report that helped
in finding the problem.
configure.ac | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
commit faf302137e54d605b44ecf0373cb51a6403a2de1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-08 20:16:10 +0200
tuklib_physmem: Hopefully silence a warning on Windows.
src/common/tuklib_physmem.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit e52e9151cf8613022d1de4712ff39dbcb666e991
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-04 23:17:43 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 14115f84a38161d55eaa2d070f08739bde37e966
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-04 23:14:00 +0200
liblzma: Make Valgrind happier with optimized (gcc -O2) liblzma.
When optimizing, GCC can reorder code so that an uninitialized
value gets used in a comparison, which makes Valgrind unhappy.
It doesn't happen when compiled with -O0, which I tend to use
when running Valgrind.
Thanks to Rich Prohaska. I remember this being mentioned long
ago by someone else but nothing was done back then.
src/liblzma/lz/lz_encoder.c | 4 ++++
1 file changed, 4 insertions(+)
commit f4c95ba94beb71a608eb6eadbf82b44f53a0260e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 20:55:45 +0200
liblzma: Rename lzma_presets.c back to lzma_encoder_presets.c.
It would be too annoying to update other build systems
just because of this.
src/liblzma/lzma/Makefile.inc | 2 +-
src/liblzma/lzma/{lzma_presets.c => lzma_encoder_presets.c} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit c7bc20a6f3e71920871d48db31a79ab58b5a0a4b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 20:47:07 +0200
Build: Disable xzdec, lzmadec, and lzmainfo when they cannot be built.
They all need decoder support and if that isn't available,
there's no point trying to build them.
configure.ac | 3 +++
1 file changed, 3 insertions(+)
commit 5cbca1205deeb6fb7afe7a864fa68a57466d928a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 20:35:19 +0200
Build: Simplify $enable_{encoders,decoders} usage a bit.
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit af13781886c8e7a0aabebb5141ea282dc364f5c6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 20:31:31 +0200
Windows/MSVC: Update config.h.
windows/config.h | 6 ++++++
1 file changed, 6 insertions(+)
commit 9fa5949330f162c5a2f6653f83025327837e8f39
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 20:29:58 +0200
DOS: Update config.h.
dos/config.h | 6 ++++++
1 file changed, 6 insertions(+)
commit cb3111e3ed84152912b5138d690c8d9f00c6ef02
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 20:29:33 +0200
xz: Make xz buildable even when encoders or decoders are disabled.
The patch is quite long but it's mostly about adding new #ifdefs
to omit code when encoders or decoders have been disabled.
This adds two new #defines to config.h: HAVE_ENCODERS and
HAVE_DECODERS.
configure.ac | 4 ++++
src/xz/Makefile.am | 8 ++++++--
src/xz/args.c | 16 ++++++++++++++++
src/xz/coder.c | 33 +++++++++++++++++++++++++--------
src/xz/main.c | 9 +++++++--
src/xz/private.h | 5 ++++-
6 files changed, 62 insertions(+), 13 deletions(-)
commit 4cc584985c0b7a13901da1b7a64ef9f7cc36e8ab
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 18:06:40 +0200
Build: Build LZMA1/2 presets also when only decoder is wanted.
People shouldn't rely on the presets when decoding raw streams,
but xz uses the presets as the starting point for raw decoder
options anyway.
lzma_encocder_presets.c was renamed to lzma_presets.c to
make it clear it's not used solely by the encoder code.
src/liblzma/lzma/Makefile.inc | 6 +++++-
src/liblzma/lzma/{lzma_encoder_presets.c => lzma_presets.c} | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
commit 23ed1d41489f632155bbc9660f323d57e09da180
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 17:54:48 +0200
Build: Fix configure to handle LZMA1 dependency with LZMA2.
Now it gives an error if LZMA1 encoder/decoder is missing
when LZMA2 encoder/decoder was requested. Even better would
be LZMA2 implicitly enabling LZMA1 but it would need more code.
configure.ac | 5 -----
1 file changed, 5 deletions(-)
commit b0bc3e03852af13419ea2960881824258d451117
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-03 17:41:54 +0200
Build: Don't omit lzma_cputhreads() unless using --disable-threads.
Previously it was omitted if encoders were disabled
with --disable-encoders. It didn't make sense and
it also broke the build.
src/liblzma/common/Makefile.inc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit c6bf438ab39e0fb4a47d3c81725c227919502726
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-02 18:16:51 +0200
liblzma: Fix a build failure related to external SHA-256 support.
If an appropriate header and structure were found by configure,
but a library with a usable SHA-256 functions wasn't, the build
failed.
src/liblzma/check/check.h | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
commit e18adc56f2262aa9394d46681e9e4b9981ed5e97
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-11-02 15:19:10 +0200
xz: Always close the file before trying to delete it.
unlink() can return EBUSY in errno for open files on some
operating systems and file systems.
src/xz/file_io.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
commit 282e768a1484e88c8b7ec35655ee4959954ec87a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-10-12 21:08:42 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 372e402713a1d4337ffce5f56d5c5c9ed99a66d0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-10-12 21:07:41 +0300
Tests: Add tests for the two bugs fixed in index.c.
tests/test_index.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
commit 21515d79d778b8730a434f151b07202d52a04611
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-10-12 20:45:15 +0300
liblzma: Fix lzma_index_dup() for empty Streams.
Stream Flags and Stream Padding weren't copied from
empty Streams.
src/liblzma/common/index.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
commit 09f395b6b360c0b13e8559eece1d179b908ebd3a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-10-12 20:31:44 +0300
liblzma: Add a note to index.c for those using static analyzers.
src/liblzma/common/index.c | 3 +++
1 file changed, 3 insertions(+)
commit 3bf857edfef51374f6f3fffae3d817f57d3264a0
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-10-12 20:29:09 +0300
liblzma: Fix a memory leak in error path of lzma_index_dup().
lzma_index_dup() calls index_dup_stream() which, in case of
an error, calls index_stream_end() to free memory allocated
by index_stream_init(). However, it illogically didn't
actually free the memory. To make it logical, the tree
handling code was modified a bit in addition to changing
index_stream_end().
Thanks to Evan Nemerson for the bug report.
src/liblzma/common/index.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
commit 7f05803979b4b79642d5be4218a79da7a0b12c47
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-09-29 13:57:28 +0300
Update NEWS for 5.2.2.
NEWS | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit 397fcc0946315b55c3c6d80e37e82a2a78bc15c1
Author: Hauke Henningsen <sqrt@entless.org>
Date: 2015-08-17 04:59:54 +0200
Update German translation, mostly wrt orthography
Provide an update of the German translation.
* A lot of compound words were previously written with spaces, while
German orthography is relatively clear in that the components
should not be separated.
* When referring to the actual process of (de)compression rather than the
concept, replace “(De-)Kompression” with “(De-)Komprimierung”.
Previously, both forms were used in this context and are now used in a
manner consistent with “Komprimierung” being more likely to refer to
a process.
* Consistently translate “standard input”/“output”
* Use “Zeichen” instead of false friend “Charakter” for “character”
* Insert commas around relative clauses (as required in German)
* Some other minor corrections
* Capitalize “ß” as “ẞ”
* Consistently start option descriptions in --help with capital letters
Acked-By: Andre Noll <maan@tuebingen.mpg.de>
* Update after msgmerge
po/de.po | 383 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 196 insertions(+), 187 deletions(-)
commit cbc9e39bae715accb44168930a71888480aad569
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-08-11 13:23:04 +0300
Build: Minor Cygwin cleanup.
Some tests used "cygwin*" and some used "cygwin". I changed
them all to use "cygwin". Shouldn't affect anything in practice.
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit bcacd8ce7a031566858e5e03c1009064c3f1c89e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-08-11 13:21:52 +0300
Build: Support building of MSYS2 binaries.
configure.ac | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
commit 0275a5398c01d57b724dec7fea52dec3bd6edc6c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-08-09 21:06:26 +0300
Windows: Define DLL_EXPORT when building liblzma.dll with MSVC.
src/liblzma/common/common.h uses it to set __declspec(dllexport)
for the API symbols.
Thanks to Adam Walling.
windows/liblzma_dll.vcxproj | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit a74525cf9b945fb0b370e64cf406104beb31729b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-08-09 21:02:20 +0300
Windows: Omit unneeded header files from MSVC project files.
windows/liblzma.vcxproj | 5 -----
windows/liblzma_dll.vcxproj | 5 -----
2 files changed, 10 deletions(-)
commit fbbb295a91caf39faf8838c8c39526e4cb4dc121
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-07-12 20:48:19 +0300
liblzma: A MSVC-specific hack isn't needed with MSVC 2013 and newer.
src/liblzma/api/lzma.h | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
commit 713dbe5c230fe00865a54f5c32358ea30f9a1156
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-06-19 20:38:55 +0300
Update THANKS.
THANKS | 2 ++
1 file changed, 2 insertions(+)
commit 3a5d755d055d51f99c523b4c2952727e1e69cfa1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-06-19 20:21:30 +0300
Windows: Update the docs.
INSTALL | 29 ++++++++-----
windows/INSTALL-MSVC.txt | 47 ++++++++++++++++++++++
windows/{INSTALL-Windows.txt => INSTALL-MinGW.txt} | 2 +-
3 files changed, 67 insertions(+), 11 deletions(-)
commit b0798c6aa6184efcefd0bdcca20f96121a13feda
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-06-19 17:25:31 +0300
Windows: Add MSVC project files for building liblzma.
Thanks to Adam Walling for creating these files.
windows/liblzma.vcxproj | 359 ++++++++++++++++++++++++++++++++++++++++
windows/liblzma_dll.vcxproj | 388 ++++++++++++++++++++++++++++++++++++++++++++
windows/xz_win.sln | 48 ++++++
3 files changed, 795 insertions(+)
commit 9b02a4ffdac1b9f066658ec4c95c0834f4cd2fb7
Author: Andre Noll <maan@tuebingen.mpg.de>
Date: 2015-05-28 15:50:00 +0200
Fix typo in German translation.
As pointed out by Robert Pollak, there's a typo in the German
translation of the compression preset option (-0 ... -9) help text.
"The compressor" translates to "der Komprimierer", and the genitive
form is "des Komprimierers". The old word makes no sense at all.
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c7f4041f6b8f4729f88d3bc888b2a4080ae51f72
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-05-13 20:57:55 +0300
Tests: Fix a memory leak in test_bcj_exact_size.
Thanks to Cristian Rodríguez.
tests/test_bcj_exact_size.c | 1 +
1 file changed, 1 insertion(+)
commit 17b29d4f0ae0f780fbd69e15a398dc478d8492f8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-05-12 18:08:24 +0300
Fix NEWS about threading in 5.2.0.
Thanks to Andy Hochhaus.
NEWS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 49c26920d6e2d85e5c6123e34958aed2e77485ad
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-05-11 21:26:16 +0300
xz: Document that threaded decompression hasn't been implemented yet.
src/xz/xz.1 | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 5b2458cb244ed237efe4de1ebcf06e1b3a1f4256
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-04-20 20:20:29 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 6bd0349c58451b13442e8f463e35de83548bf985
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-04-20 19:59:18 +0300
Revert "xz: Use pipe2() if available."
This reverts commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd.
It is a problem when libc has pipe2() but the kernel is too
old to have pipe2() and thus pipe2() fails. In xz it's pointless
to have a fallback for non-functioning pipe2(); it's better to
avoid pipe2() completely.
Thanks to Michael Fox for the bug report.
configure.ac | 4 ++--
src/xz/file_io.c | 9 +--------
2 files changed, 3 insertions(+), 10 deletions(-)
commit fc0df0f8db87dff45543708a711e17d29c37f632
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-04-01 14:45:25 +0300
xz: Fix the Capsicum rights on user_abort_pipe.
src/xz/file_io.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 57393615b31b3788dd77280452d845bcc12d33af
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-31 22:20:11 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 1238381143a9a7ce84839c2582ccd56ff750a440
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-31 22:19:34 +0300
xz: Add support for sandboxing with Capsicum.
The sandboxing is used conditionally as described in main.c.
This isn't optimal but it was much easier to implement than
a full sandboxing solution and it still covers the most common
use cases where xz is writing to standard output. This should
have practically no effect on performance even with small files
as fork() isn't needed.
C and locale libraries can open files as needed. This has been
fine in the past, but it's a problem with things like Capsicum.
io_sandbox_enter() tries to ensure that various locale-related
files have been loaded before cap_enter() is called, but it's
possible that there are other similar problems which haven't
been seen yet.
Currently Capsicum is available on FreeBSD 10 and later
and there is a port to Linux too.
Thanks to Loganaden Velvindron for help.
configure.ac | 41 +++++++++++++++++++++++++++
src/xz/Makefile.am | 2 +-
src/xz/file_io.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xz/file_io.h | 6 ++++
src/xz/main.c | 18 ++++++++++++
src/xz/private.h | 4 +++
6 files changed, 151 insertions(+), 1 deletion(-)
commit 29a087fb5a0c879f0b1bc4c6b989f7b87bacdf9e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-31 21:12:30 +0300
Fix bugs and otherwise improve ax_check_capsicum.m4.
AU_ALIAS was removed because the new version is incompatible
with the old version.
It no longer checks for <sys/capability.h> separately.
It's enough to test for it as part of AC_CHECK_DECL.
The defines HAVE_CAPSICUM_SYS_CAPSICUM_H and
HAVE_CAPSICUM_SYS_CAPABILITY_H were removed as unneeded.
HAVE_SYS_CAPSICUM_H from AC_CHECK_HEADERS is enough.
It no longer does a useless search for the Capsicum library
if the header wasn't found.
Fixed a bug in ACTION-IF-FOUND (the first argument). Specifying
the argument omitted the default action but the given action
wasn't used instead.
AC_DEFINE([HAVE_CAPSICUM]) is now always called when Capsicum
support is found. Previously it was part of the default
ACTION-IF-FOUND which a custom action would override. Now
the default action only prepends ${CAPSICUM_LIB} to LIBS.
The documentation was updated.
Since there as no serial number, "#serial 2" was added.
m4/ax_check_capsicum.m4 | 103 ++++++++++++++++++++++++------------------------
1 file changed, 51 insertions(+), 52 deletions(-)
commit 6e845c6a3eddf2fde9db5a29950421dff60a43ac
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-31 19:20:24 +0300
Add m4/ax_check_capsicum.m4 for detecting Capsicum support.
The file was loaded from this web page:
https://github.com/google/capsicum-test/blob/dev/autoconf/m4/ax_check_capsicum.m4
Thanks to Loganaden Velvindron for pointing it out for me.
m4/ax_check_capsicum.m4 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
commit 3717885f9ef2c06f1bcbad9f4c2ed2d5695f844e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-30 22:44:02 +0300
Bump version to 5.3.0alpha and soname to 5.3.99.
The idea of 99 is that it looks a bit weird in this context.
For new features there's no API/ABI stability in devel versions.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
commit eccd8155e107c5ada03d13e7730675cdf1a44ddc
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-29 22:14:47 +0300
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 25263fd9e7a8a913395cb93d7c104cd48c2b4a00
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-29 22:13:48 +0300
Fix the detection of installed RAM on QNX.
The earlier version compiled but didn't actually work
since sysconf(_SC_PHYS_PAGES) always fails (or so I was told).
Thanks to Ole André Vadla Ravnås for the patch and testing.
m4/tuklib_physmem.m4 | 6 +++---
src/common/tuklib_physmem.c | 14 +++++++++++++-
2 files changed, 16 insertions(+), 4 deletions(-)
commit 4c544d2410903d38402221cb783ed85585b6a007
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-27 22:39:07 +0200
Fix CPU core count detection on QNX.
It tried to use sysctl() on QNX but
- it broke the build because sysctl() needs -lsocket on QNX;
- sysctl() doesn't work for detecting the core count on QNX
even if it compiled.
sysconf() works. An alternative would have been to use
QNX-specific SYSPAGE_ENTRY(num_cpu) from <sys/syspage.h>.
Thanks to Ole André Vadla Ravnås.
m4/tuklib_cpucores.m4 | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
commit e0ea6737b03e83ccaff4514d00e31bb926f8f0f3
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-07 22:05:57 +0200
xz: size_t/uint32_t cleanup in options.c.
src/xz/options.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit 8bcca29a65335fd679c13814b70b35b68fa5daed
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-07 22:04:23 +0200
xz: Fix a comment and silence a warning in message.c.
src/xz/message.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit f243f5f44c6b19a7c289a0ec73a03ee08364cb5b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-07 22:01:00 +0200
liblzma: Silence more uint32_t vs. size_t warnings.
src/liblzma/lz/lz_encoder.c | 2 +-
src/liblzma/lzma/lzma_encoder.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 7f0a4c50f4a374c40acf4b86848f301ad1e82d34
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-07 19:54:00 +0200
xz: Make arg_count an unsigned int to silence a warning.
Actually the value of arg_count cannot exceed INT_MAX
but it's nicer as an unsigned int.
src/xz/args.h | 2 +-
src/xz/main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit f6ec46801588b1be29c07c9db98558b521304002
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-03-07 19:33:17 +0200
liblzma: Fix a warning in index.c.
src/liblzma/common/index.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit a24518971cc621315af142dd3bb7614fab04ad27
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-26 20:46:14 +0200
Build: Fix a CR+LF problem when running autoreconf -fi on OS/2.
build-aux/version.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit dec11497a71518423b5ff0e759100cf8aadf6c7b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-26 16:53:44 +0200
Bump version and soname for 5.2.1.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 29e39c79975ab89ee5dd671e97064534a9f3a649
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-26 13:01:09 +0200
Update NEWS for 5.2.1.
NEWS | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-22 19:38:48 +0200
xz: Use pipe2() if available.
configure.ac | 4 ++--
src/xz/file_io.c | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
commit 117d962685c72682c63edc9bb765367189800202
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-21 23:40:26 +0200
liblzma: Fix a compression-ratio regression in LZMA1/2 in fast mode.
The bug was added in the commit
f48fce093b07aeda95c18850f5e086d9f2383380 and thus
affected 5.1.4beta and 5.2.0. Luckily the bug cannot
cause data corruption or other nasty things.
src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ae984e31c167d3bc52972ec422dd1ebd5f5d5719
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-21 23:00:19 +0200
xz: Fix the fcntl() usage when creating a pipe for the self-pipe trick.
Now it reads the old flags instead of blindly setting O_NONBLOCK.
The old code may have worked correctly, but this is better.
src/xz/file_io.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
commit 2205bb5853098aea36a56df6f5747037175f66b4
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-10 15:29:34 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit d935b0cdf3db440269b9d952b2b281b18f8c7b08
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-10 15:28:30 +0200
tuklib_cpucores: Use cpuset_getaffinity() on FreeBSD if available.
In FreeBSD, cpuset_getaffinity() is the preferred way to get
the number of available cores.
Thanks to Rui Paulo for the patch. I edited it slightly, but
hopefully I didn't break anything.
m4/tuklib_cpucores.m4 | 23 ++++++++++++++++++++++-
src/common/tuklib_cpucores.c | 18 ++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
commit eb61bc58c20769cac4d05f363b9c0e8c9c71a560
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-09 22:08:37 +0200
xzdiff: Make the mktemp usage compatible with FreeBSD's mktemp.
Thanks to Rui Paulo for the fix.
src/scripts/xzdiff.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit b9a5b6b7a29029680af733082b6a46e0fc01623a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-02-03 21:45:53 +0200
Add a few casts to tuklib_integer.h to silence possible warnings.
I heard that Visual Studio 2013 gave warnings without the casts.
Thanks to Gabi Davar.
src/common/tuklib_integer.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
commit c45757135f40e4a0de730ba5fff0100219493982
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-26 21:24:39 +0200
liblzma: Set LZMA_MEMCMPLEN_EXTRA depending on the compare method.
src/liblzma/common/memcmplen.h | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
commit 3c500174ed5485f550972a2a6109c361e875f069
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-26 20:40:16 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit fec88d41e672d9e197c9442aecf02bd0dfa6d516
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-26 20:39:28 +0200
liblzma: Silence harmless Valgrind errors.
Thanks to Torsten Rupp for reporting this. I had
forgotten to run Valgrind before the 5.2.0 release.
src/liblzma/lz/lz_encoder.c | 6 ++++++
1 file changed, 6 insertions(+)
commit a9b45badfec0928d20a27c7176c005fa637f7d1e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-09 21:50:19 +0200
xz: Fix comments.
src/xz/file_io.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
commit 541aee6dd4aa97a809aba281475a21b641bb89e2
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-09 21:35:06 +0200
Update THANKS.
THANKS | 1 +
1 file changed, 1 insertion(+)
commit 4170edc914655310d2363baccf5e615e09b04911
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-09 21:34:06 +0200
xz: Don't fail if stdout doesn't support O_NONBLOCK.
This is similar to the case with stdin.
Thanks to Brad Smith for the bug report and testing
on OpenBSD.
src/xz/file_io.c | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
commit 04bbc0c2843c50c8ad1cba42b937118e38b0508d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-07 19:18:20 +0200
xz: Fix a memory leak in DOS-specific code.
src/xz/file_io.c | 2 ++
1 file changed, 2 insertions(+)
commit f0f1f6c7235ffa901cf76fe18e33749e200b3eea
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-07 19:08:06 +0200
xz: Don't fail if stdin doesn't support O_NONBLOCK.
It's a problem at least on OpenBSD which doesn't support
O_NONBLOCK on e.g. /dev/null. I'm not surprised if it's
a problem on other OSes too since this behavior is allowed
in POSIX-1.2008.
The code relying on this behavior was committed in June 2013
and included in 5.1.3alpha released on 2013-10-26. Clearly
the development releases only get limited testing.
src/xz/file_io.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
commit d2d484647d9d9d679f03c75abb0404f67069271c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2015-01-06 20:30:15 +0200
Tests: Don't hide unexpected error messages in test_files.sh.
Hiding them makes no sense since normally there's no error
when testing the "good" files. With "bad" files errors are
expected and then it makes sense to keep the messages hidden.
tests/test_files.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit aae6a6aeda51cf94a47e39ad624728f9bee75e30
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-30 11:17:16 +0200
Update Solaris notes in INSTALL.
Mention the possible "make check" failure on Solaris in the
Solaris-specific section of INSTALL. It was already in
section 4.5 but it is better mention it in the OS-specific
section too.
INSTALL | 4 ++++
1 file changed, 4 insertions(+)
commit 7815112153178800a3521b9f31960e7cdc26cfba
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-26 12:00:05 +0200
Build: POSIX shell isn't required if scripts are disabled.
INSTALL | 3 ++-
configure.ac | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-21 20:48:37 +0200
DOS: Update Makefile.
dos/Makefile | 1 +
1 file changed, 1 insertion(+)
commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-21 19:50:38 +0200
Windows: Fix bin_i486 to bin_i686 in build.bash.
windows/build.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cbafa710918195dbba3db02c3fab4f0538235206
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-21 18:58:44 +0200
Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-21 18:56:44 +0200
Docs: Update docs/examples/00_README.txt.
doc/examples/00_README.txt | 4 ++++
1 file changed, 4 insertions(+)
commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: 2014-12-21 18:11:17 +0200
Bump version and soname for 5.2.0.
I know that soname != app version, but I skip AGE=1
in -version-info to make the soname match the liblzma
version anyway. It doesn't hurt anything as long as
it doesn't conflict with library versioning rules.
src/liblzma/Makefile.am | 2 +-
src/liblzma/api/lzma/version.h | 6 +++---
src/liblzma/liblzma.map | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
|