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
11757
11758
11759
11760
11761
11762
11763
11764
11765
11766
11767
11768
11769
11770
11771
11772
11773
11774
11775
11776
11777
11778
11779
11780
11781
11782
11783
11784
11785
11786
11787
11788
11789
11790
11791
11792
11793
11794
11795
11796
11797
11798
11799
11800
11801
11802
11803
11804
11805
11806
11807
11808
11809
11810
11811
11812
11813
11814
11815
11816
11817
11818
11819
11820
11821
11822
11823
11824
11825
11826
11827
11828
11829
11830
11831
11832
11833
11834
11835
11836
11837
11838
11839
11840
11841
11842
11843
11844
11845
11846
11847
11848
11849
11850
11851
11852
11853
11854
11855
11856
11857
11858
11859
11860
11861
11862
11863
11864
11865
11866
11867
11868
11869
11870
11871
11872
11873
11874
11875
11876
11877
11878
11879
11880
11881
11882
11883
11884
11885
11886
11887
11888
11889
11890
11891
11892
11893
11894
11895
11896
11897
11898
11899
11900
11901
11902
11903
11904
11905
11906
11907
11908
11909
11910
11911
11912
11913
11914
11915
11916
11917
11918
11919
11920
11921
11922
11923
11924
11925
11926
11927
11928
11929
11930
11931
11932
11933
11934
11935
11936
11937
11938
11939
11940
11941
11942
11943
11944
11945
11946
11947
11948
11949
11950
11951
11952
11953
11954
11955
11956
11957
11958
11959
11960
11961
11962
11963
11964
11965
11966
11967
11968
11969
11970
11971
11972
11973
11974
11975
11976
11977
11978
11979
11980
11981
11982
11983
11984
11985
11986
11987
11988
11989
11990
11991
11992
11993
11994
11995
11996
11997
11998
11999
12000
12001
12002
12003
12004
12005
12006
12007
12008
12009
12010
12011
12012
12013
12014
12015
12016
12017
12018
12019
12020
12021
12022
12023
12024
12025
12026
12027
12028
12029
12030
12031
12032
12033
12034
12035
12036
12037
12038
12039
12040
12041
12042
12043
12044
12045
12046
12047
12048
12049
12050
12051
12052
12053
12054
12055
12056
12057
12058
12059
12060
12061
12062
12063
12064
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
12081
12082
12083
12084
12085
12086
12087
12088
12089
12090
12091
12092
12093
12094
12095
12096
12097
12098
12099
12100
12101
12102
12103
12104
12105
12106
12107
12108
12109
12110
12111
12112
12113
12114
12115
12116
12117
12118
12119
12120
12121
12122
12123
12124
12125
12126
12127
12128
12129
12130
12131
12132
12133
12134
12135
12136
12137
12138
12139
12140
12141
12142
12143
12144
12145
12146
12147
12148
12149
12150
12151
12152
12153
12154
12155
12156
12157
12158
12159
12160
12161
12162
12163
12164
12165
12166
12167
12168
12169
12170
12171
12172
12173
12174
12175
12176
12177
12178
12179
12180
12181
12182
12183
12184
12185
12186
12187
12188
12189
12190
12191
12192
12193
12194
12195
12196
12197
12198
12199
12200
12201
12202
12203
12204
12205
12206
12207
12208
12209
12210
12211
12212
12213
12214
12215
12216
12217
12218
12219
12220
12221
12222
12223
12224
12225
12226
12227
12228
12229
12230
12231
12232
12233
12234
12235
12236
12237
12238
12239
12240
12241
12242
12243
12244
12245
12246
12247
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
12258
12259
12260
12261
12262
12263
12264
12265
12266
12267
12268
12269
12270
12271
12272
12273
12274
12275
12276
12277
12278
12279
12280
12281
12282
12283
12284
12285
12286
12287
12288
12289
12290
12291
12292
12293
12294
12295
12296
12297
12298
12299
12300
12301
12302
12303
12304
12305
12306
12307
12308
12309
12310
12311
12312
12313
12314
12315
12316
12317
12318
12319
12320
12321
12322
12323
12324
12325
12326
12327
12328
12329
12330
12331
12332
12333
12334
12335
12336
12337
12338
12339
12340
12341
12342
12343
12344
12345
12346
12347
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
12361
12362
12363
12364
12365
12366
12367
12368
12369
12370
12371
12372
12373
12374
12375
12376
12377
12378
12379
12380
12381
12382
12383
12384
12385
12386
12387
12388
12389
12390
12391
12392
12393
12394
12395
12396
12397
12398
12399
12400
12401
12402
12403
12404
12405
12406
12407
12408
12409
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
12423
12424
12425
12426
12427
12428
12429
12430
12431
12432
12433
12434
12435
12436
12437
12438
12439
12440
12441
12442
12443
12444
12445
12446
12447
12448
12449
12450
12451
12452
12453
12454
12455
12456
12457
12458
12459
12460
12461
12462
12463
12464
12465
12466
12467
12468
12469
12470
12471
12472
12473
12474
12475
12476
12477
12478
12479
12480
12481
12482
12483
12484
12485
12486
12487
12488
12489
12490
12491
12492
12493
12494
12495
12496
12497
12498
12499
12500
12501
12502
12503
12504
12505
12506
12507
12508
12509
12510
12511
12512
12513
12514
12515
12516
12517
12518
12519
12520
12521
12522
12523
12524
12525
12526
12527
12528
12529
12530
12531
12532
12533
12534
12535
12536
12537
12538
12539
12540
12541
12542
12543
12544
12545
12546
12547
12548
12549
12550
12551
12552
12553
12554
12555
12556
12557
12558
12559
12560
12561
12562
12563
12564
12565
12566
12567
12568
12569
12570
12571
12572
12573
12574
12575
12576
12577
12578
12579
12580
12581
12582
12583
12584
12585
12586
12587
12588
12589
12590
12591
12592
12593
12594
12595
12596
12597
12598
12599
12600
12601
12602
12603
12604
12605
12606
12607
12608
12609
12610
12611
12612
12613
12614
12615
12616
12617
12618
12619
12620
12621
12622
12623
12624
12625
12626
12627
12628
12629
12630
12631
12632
12633
12634
12635
12636
12637
12638
12639
12640
12641
12642
12643
12644
12645
12646
12647
12648
12649
12650
12651
12652
12653
12654
12655
12656
12657
12658
12659
12660
12661
12662
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
12686
12687
12688
12689
12690
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
12703
12704
12705
12706
12707
12708
12709
12710
12711
12712
12713
12714
12715
12716
12717
12718
12719
12720
12721
12722
12723
12724
12725
12726
12727
12728
12729
12730
12731
12732
12733
12734
12735
12736
12737
12738
12739
12740
12741
12742
12743
12744
12745
12746
12747
12748
12749
12750
12751
12752
12753
12754
12755
12756
12757
12758
12759
12760
12761
12762
12763
12764
12765
12766
12767
12768
12769
12770
12771
12772
12773
12774
12775
12776
12777
12778
12779
12780
12781
12782
12783
12784
12785
12786
12787
12788
12789
12790
12791
12792
12793
12794
12795
12796
12797
12798
12799
12800
12801
12802
12803
12804
12805
12806
12807
12808
12809
12810
12811
12812
12813
12814
12815
12816
12817
12818
12819
12820
12821
12822
12823
12824
12825
12826
12827
12828
12829
12830
12831
12832
12833
12834
12835
12836
12837
12838
12839
12840
12841
12842
12843
12844
12845
12846
12847
12848
12849
12850
12851
12852
12853
12854
12855
12856
12857
12858
12859
12860
12861
12862
12863
12864
12865
12866
12867
12868
12869
12870
12871
12872
12873
12874
12875
12876
12877
12878
12879
12880
12881
12882
12883
12884
12885
12886
12887
12888
12889
12890
12891
12892
12893
12894
12895
12896
12897
12898
12899
12900
12901
12902
12903
12904
12905
12906
12907
12908
12909
12910
12911
12912
12913
12914
12915
12916
12917
12918
12919
12920
12921
12922
12923
12924
12925
12926
12927
12928
12929
12930
12931
12932
12933
12934
12935
12936
12937
12938
12939
12940
12941
12942
12943
12944
12945
12946
12947
12948
12949
12950
12951
12952
12953
12954
12955
12956
12957
12958
12959
12960
12961
12962
12963
12964
12965
12966
12967
12968
12969
12970
12971
12972
12973
12974
12975
12976
12977
12978
12979
12980
12981
12982
12983
12984
12985
12986
12987
12988
12989
12990
12991
12992
12993
12994
12995
12996
12997
12998
12999
13000
13001
13002
13003
13004
13005
13006
13007
13008
13009
13010
13011
13012
13013
13014
13015
13016
13017
13018
13019
13020
13021
13022
13023
13024
13025
13026
13027
13028
13029
13030
13031
13032
13033
13034
13035
13036
13037
13038
13039
13040
13041
13042
13043
13044
13045
13046
13047
13048
13049
13050
13051
13052
13053
13054
13055
13056
13057
13058
13059
13060
13061
13062
13063
13064
13065
13066
13067
13068
13069
13070
13071
13072
13073
13074
13075
13076
13077
13078
13079
13080
13081
13082
13083
13084
13085
13086
13087
13088
13089
13090
13091
13092
13093
13094
13095
13096
13097
13098
13099
13100
13101
13102
13103
13104
13105
13106
13107
13108
13109
13110
13111
13112
13113
13114
13115
13116
13117
13118
13119
13120
13121
13122
13123
13124
13125
13126
13127
13128
13129
13130
13131
13132
13133
13134
13135
13136
13137
13138
13139
13140
13141
13142
13143
13144
13145
13146
13147
13148
13149
13150
13151
13152
13153
13154
13155
13156
13157
13158
13159
13160
13161
13162
13163
13164
13165
13166
13167
13168
13169
13170
13171
13172
13173
13174
13175
13176
13177
13178
13179
13180
13181
13182
13183
13184
|
Mon Dec 9 00:49:22 GMT 2013 Colin Watson <cjwatson@debian.org>
* .bzrignore: Move to ...
* .gitignore: ... here, adjusting for differences between bzr and
git.
* Makefile.am (EXTRA_DIST): Replace .bzrignore with .gitignore.
* gnulib: Add --no-vc-files.
Wed Nov 27 11:54:17 GMT 2013 Colin Watson <cjwatson@debian.org>
* configure.ac: Only call AC_PROG_AR if it is defined, to restore
compatibility with Automake 1.10.
* NEWS: Document this.
Wed Nov 27 11:48:29 GMT 2013 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.14 and Gnulib 20130805.
Sat Nov 9 16:21:05 GMT 2013 Colin Watson <cjwatson@debian.org>
* src/tests/man-4: Remove non-portable uses of "echo -n". Reported
by TheSin.
Mon Jul 8 03:00:20 BST 2013 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (gripe_rwopen_failed, update_db_time):
Downgrade EAGAIN/EWOULDBLOCK errors from attempts to open a
database read-write to debug messages (Debian bug #684235).
Mon Jul 8 02:26:07 BST 2013 Colin Watson <cjwatson@debian.org>
* man/man1/whatis.man1 (NAME): Clarify that whatis displays one-line
descriptions, rather than e.g. the contents of DESCRIPTION
sections (Debian bug #713992).
Mon Jul 8 02:15:52 BST 2013 Colin Watson <cjwatson@debian.org>
Reimplement 'apropos --and' in a way that works with the
optimisations introduced in 2.6.2 (Debian bug #678670).
* src/whatis.c (any_set, all_set): New functions.
(parse_name, parse_whatis): Take an additional found_here
parameter and set its elements. Return void.
(do_apropos): Combine results from parse_name and parse_whatis
properly according to whether --and is set, rather than relying on
counters that will only ever coincidentally match the number of
search keywords.
(main): Remove apropos_seen hash table.
* NEWS: Document this.
Mon Jul 8 01:30:56 BST 2013 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display): Simplify using xasprintf.
* src/whatis.c (do_apropos): Likewise.
Mon Jul 8 00:29:00 BST 2013 Colin Watson <cjwatson@debian.org>
* man/po4a/po/zh_CN.po: Fix po4a syntax errors.
Sun Jul 7 22:53:02 BST 2013 Wylmer Wang <wantinghard@gmail.com>
* man/po4a/po/zh_CN.po: Update from Translation Project.
Fri Jun 28 06:13:17 BST 2013 Colin Watson <cjwatson@debian.org>
* lib/encodings.c (find_charset_locale): Attempt fallback locales
even if /usr/share/i18n/SUPPORTED exists. (It may exist but none
of the UTF-8 locales mentioned it in may be present; nevertheless,
C.UTF-8 may be available.)
Thu Jun 27 11:38:56 BST 2013 Colin Watson <cjwatson@debian.org>
* Version: 2.6.5.
Thu Jun 27 11:34:40 BST 2013 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Allocate buf on the heap, as 32768 bytes may
be too large for some stacks. Reported by Coverity via Peter
Schiffer.
Thu Jun 27 10:47:13 BST 2013 Colin Watson <cjwatson@debian.org>
* docs/HACKING: Mention that xasprintf may be more readable than
appendstr.
* include/manconfig.h.in (mkdbname): Rephrase using xasprintf.
* lib/decompress.c (decompress_open): Likewise.
* lib/pathsearch.c (pathsearch): Likewise.
* lib/tempfile.c (create_tempdir): Likewise.
* lib/util.c (remove_directory): Likewise.
* src/check_mandirs.c (add_dir_entries, mkcatdirs): Likewise.
* src/compression.c (comp_file): Likewise.
* src/convert_name.c (convert_name): Likewise.
* src/globbing.c (make_pattern, match_in_directory, look_for_file):
Likewise.
* src/man.c (parse_opt, display_filesystem, display_database,
do_global_apropos_section): Likewise.
* src/manconv_client.c (add_manconv): Likewise.
* src/mandb.c (mandb, process_manpath, purge_catsubdirs,
purge_catdirs, main): Likewise.
* src/manp.c (pathappend, get_nls_manpath, get_manpath,
read_config_file, has_mandir): Likewise.
* src/ult_src.c (ult_hardlink): Likewise.
* src/whatis.c (simple_convert, use_grep, display, main): Likewise.
* src/zsoelim.l (zsoelim_open_file): Likewise.
* src/accessdb.c (parse_opt): Use mkdbname to construct default
database path.
Thu Jun 27 09:43:35 BST 2013 Peter Schiffer <pschiffe@redhat.com>
* lib/encodings.c (get_locale_charset): Free saved_locale.
* src/check_mandirs.c (testmandirs): Close directory handle on
early-return paths.
* src/man.c (local_man_loop): Free locale_manpath's argument after
call.
(main): Likewise. Free cwd, internal_locale, and program_name
before calling gripe_no_name. Free database before exiting.
(format_display) [TROFF_IS_GROFF]: Free old_cwd.
(display) [TROFF_IS_GROFF]: Free page_lang.
(display): Free formatted_encoding.
(find_cat_file): Free cat_dir.
(try_section): Free info and info_buffer if they weren't added to
the candidates.
(display_filesystem): Free title and filename.
(try_db): Free database before setting it.
(man): Free each candidate using free_candidate, not free.
* src/manp.c (get_nls_manpath): Free manpathlist_copy.
(add_nls_manpaths): Free locales_copy.
(add_to_dirlist): Free buf before returning.
* src/whatis.c (suitable_manpath): Free locale_manpath's argument
after call.
(do_whatis): Free page on early-continue path.
Thu Jun 27 09:38:35 BST 2013 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_nls_manpaths): Duplicate manpathlist in the case
where locales is NULL or empty, allowing the manpathlist parameter
to be made const.
* src/manp.h (add_nls_manpaths): Update prototype.
* src/man.c (locale_manpath): Make manpath parameter const.
* src/whatis.c (locale_manpath): Likewise.
Thu Jun 27 09:25:19 BST 2013 Colin Watson <cjwatson@debian.org>
* src/man.c (get_preprocessors_from_file): Return a non-const string
rather than keeping a static copy.
(get_preprocessors): Return a non-const string.
(make_roff_command): Free the return value of get_preprocessors
before returning.
Thu Jun 27 08:39:26 BST 2013 Colin Watson <cjwatson@debian.org>
* src/manconv_client.c (add_manconv): Don't allocate codes until
after checking for the UTF-8/UTF-8 early-return case.
Thu Jun 27 00:09:48 BST 2013 Colin Watson <cjwatson@debian.org>
* lib/encodings.c (find_charset_locale): Fix memory leaks.
Thu Jun 27 00:07:09 BST 2013 Peter Schiffer <pschiffe@redhat.com>
* src/check_mandirs.c (testmandirs): Check return value of chdir.
Wed Jun 26 22:41:22 BST 2013 Peter Schiffer <pschiffe@redhat.com>
* lib/encodings.c (find_charset_locale): Fall back to C.UTF-8 then
en_US.UTF-8 if /usr/share/i18n/SUPPORTED does not exist, the
requested character set is UTF-8, and the current LC_CTYPE locale
is not UTF-8 (Fedora bug #657409).
* src/tests/man-6: New file.
* src/tests/Makefile.am (ALL_TESTS): Add man-6.
* NEWS: Document this.
Wed Jun 26 22:33:00 BST 2013 Colin Watson <cjwatson@debian.org>
* configure.ac: Move check for whether nroff supports warning
control down below check for whether troff is groff, otherwise it
always returns false. Reported by Niels Thykier.
* NEWS: Document this.
Sun Jun 23 22:50:24 BST 2013 Colin Watson <cjwatson@debian.org>
* Version: 2.6.4.
Sun Jun 23 22:44:19 BST 2013 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20130623.
Sun Jun 23 21:21:13 BST 2013 Peter Schiffer <pschiffe@redhat.com>
Colin Watson <cjwatson@debian.org>
Search the full manpath when expanding manual pages that consist
only of a .so directive (Fedora bug #693458).
* src/ult_src.c (find_include): New function, handling manpath
search where necessary.
(ult_src): Call it when a .so directive is found.
* src/Makefile.am (lexgrog_SOURCES): Add globbing.c and globbing.h.
* src/tests/man-5: New file.
* src/tests/Makefile.am (ALL_TESTS): Add man-5.
* NEWS: Document this.
Sun Jun 23 21:15:45 BST 2013 Colin Watson <cjwatson@debian.org>
* src/tests/mandb-3: Don't rely on ".so test.1" not working.
Sun Jun 23 14:35:51 BST 2013 Colin Watson <cjwatson@debian.org>
* src/manp.c (def_path): Expand wildcards in MANDATORY_MANPATH.
Sun Jun 23 14:29:34 BST 2013 Colin Watson <cjwatson@debian.org>
* src/manp.c (guess_manpath): Honour MAN_TEST_DISABLE_PATH
environment variable, allowing the test suite to disable PATH
handling. (May change without notice.)
(read_config_file): Honour MAN_TEST_DISABLE_SYSTEM_CONFIG
environment variable, allowing the test suite to disable reading
the system configuration file. (May change without notice.)
* src/tests/testlib.sh: Set MAN_TEST_DISABLE_SYSTEM_CONFIG=1.
* src/tests/man-4: Set MAN_TEST_DISABLE_PATH=1.
Sun Jun 23 12:28:19 BST 2013 Colin Watson <cjwatson@debian.org>
* src/ult_src.c (test_for_include): Return NULL immediately if
buffer is NULL.
(ult_src): Use this to remove a level of indentation.
Sun Jun 23 11:14:27 BST 2013 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.13.3.
Fri Jun 14 09:53:47 BST 2013 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
Tue Jun 11 12:44:24 BST 2013 Colin Watson <cjwatson@debian.org>
* man/po4a/po/zh_CN.po: New from Translation Project (thanks, Wylmer
Wang).
* configure.ac (AC_CONFIG_FILES): Add man/zh_CN/Makefile.
* man/LINGUAS.po4a: Add zh_CN.
* man/Makefile.am (DIST_SUBDIRS): Add zh_CN.
* man/zh_CN/Makefile.am, man/zh_CN/translator.add: New files.
* man/po4a/Makefile.am (POFILES): Add po/zh_CN.po.
* man/po4a/po4a.cfg (po4a_langs): Add zh_CN.
* man/THANKS: Add translator credit.
* .bzrignore: Add man/zh_CN/man1, man/zh_CN/man5, and
man/zh_CN/man8.
Thu Jun 6 12:24:27 BST 2013 Colin Watson <cjwatson@debian.org>
* configure.ac: Check whether tbl supports the 'x' format character
(e.g. versions of groff before 1.20), and substitute TBL_X_FORMAT
accordingly.
* man/replace.sin.in: Replace "l lx." with "l l." if tbl does not
support the 'x' format character.
Thu Jun 6 12:03:59 BST 2013 Colin Watson <cjwatson@debian.org>
* configure.ac: Add a check for whether 'nroff -wmac' works.
* src/man.c (default_roff_warnings, roff_warnings): Define if
NROFF_WARNINGS is defined, rather than TROFF_IS_GROFF.
(options): Hide the --warnings option unless NROFF_WARNINGS is
defined.
(parse_opt, make_roff_command): Handle the --warnings option if
NROFF_WARNINGS is defined, rather than TROFF_IS_GROFF.
Thu Jun 6 11:11:36 BST 2013 Colin Watson <cjwatson@debian.org>
* configure.ac: Set MANDIR_LAYOUT using AC_SUBST as well as
AC_DEFINE/AC_DEFINE_UNQUOTED.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Export MANDIR_LAYOUT.
* src/tests/testlib.sh (skip): New function.
* src/tests/man-3: Skip unless the GNU layout is in use.
Thu Jun 6 10:57:17 BST 2013 Colin Watson <cjwatson@debian.org>
* src/tests/man-1, src/tests/man-2, src/tests/man-3,
src/tests/man-4, src/tests/mandb-1, src/tests/mandb-2,
src/tests/mandb-3, src/tests/mandb-4, src/tests/mandb-5,
src/tests/mandb-6, src/tests/whatis-1, src/tests/zsoelim-1: Export
MANPATH separately rather than trying to set it just for the 'run'
function. The latter approach does not seem to work reliably in
FreeBSD's /bin/sh.
* src/tests/testlib.sh: Stop exporting MANPATH here.
Thu Jun 6 09:37:46 BST 2013 Colin Watson <cjwatson@debian.org>
* configure.ac: Use BSD layout on *-*bsd* (e.g. FreeBSD), not just
*-bsd*.
Test for Berkeley DB in libc, as is the case on FreeBSD.
Thu Jun 6 09:36:09 BST 2013 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (purge_missing) [NDBM]: Check for the
existence of DATABASE.dir rather than DATABASE.
Thu Jun 6 09:32:24 BST 2013 Colin Watson <cjwatson@debian.org>
* src/catman.c (add_arg): MYDBM_DSIZE may return size_t; cast (for
the cases where it returns int instead) and format using %zu
rather than %d.
Thu Jun 6 09:01:46 BST 2013 Trần Ngọc Quân <vnwildman@gmail.com>
* po/vi.po: Update from Translation Project.
Thu Jun 6 02:51:15 BST 2013 Colin Watson <cjwatson@debian.org>
* src/tests/testlib.sh: Export LC_ALL and MANPATH, for the benefit
of shells that do not automatically re-export variables they
receive in their environment.
Thu Jun 6 02:50:25 BST 2013 Colin Watson <cjwatson@debian.org>
* src/descriptions_store.c (store_description): Format size_t using
%zu, not %d.
Thu Jun 6 02:40:10 BST 2013 Colin Watson <cjwatson@debian.org>
* src/tests/manconv-2, src/tests/manconv-3: Use octal escapes rather
than hexadecimal escapes; the latter are not portable to all
printf(1) implementations.
Thu Jun 6 01:49:32 BST 2013 Colin Watson <cjwatson@debian.org>
* man/Rules.man (TESTS_ENVIRONMENT): Quote variable assignments.
Thu Jun 6 01:43:29 BST 2013 Colin Watson <cjwatson@debian.org>
* man/Rules.man (TESTS_ENVIRONMENT): Move environment variable
settings here, rather than using non-portable 'export'.
Thu Jun 6 01:39:29 BST 2013 Colin Watson <cjwatson@debian.org>
* docs/INSTALL.quick: Reformat external package requirements as a
bullet list. Add flex >= 2.5.30.
Thu Jun 6 01:32:19 BST 2013 Colin Watson <cjwatson@debian.org>
* tools/config.guess: Update to 2013-05-16.
* tools/config.sub: Update to 2013-04-24.
Tue Jun 4 09:38:08 BST 2013 David Prévot <david@tilapin.org>
* man/po4a/po/fr.po: Update from Translation Project.
Mon Jun 3 22:59:03 BST 2013 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project.
Mon Jun 3 13:06:43 BST 2013 Colin Watson <cjwatson@debian.org>
* Version: 2.6.4-pre1.
Mon Jun 3 12:39:22 BST 2013 Colin Watson <cjwatson@debian.org>
* NEWS: Document changes since 2.6.3.
Mon Jun 3 12:18:55 BST 2013 Colin Watson <cjwatson@debian.org>
* manual/files.me (NLS manual pages): Wrap a table cell to avoid a
line-width warning from nroff.
Mon Jun 3 12:07:35 BST 2013 Colin Watson <cjwatson@debian.org>
Quieten most warnings from compiling Gnulib (Debian bug #668429).
* configure.ac: Add gl_WARN_ADD results to WARN_CFLAGS rather than
CFLAGS.
* lib/Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS).
* libdb/Makefile.am (AM_CFLAGS): Likewise.
* src/Makefile.am (AM_CFLAGS): Likewise. Move $(libpipeline_CFLAGS)
here from AM_CPPFLAGS.
Mon Jun 3 00:01:47 BST 2013 Colin Watson <cjwatson@debian.org>
* src/tests/Makefile.am (AM_LOG_FLAGS): Force each test to run with
the configure-detected shell.
Thu May 30 12:57:50 BST 2013 Peter Schiffer <pschiffe@redhat.com>
Colin Watson <cjwatson@debian.org>
Add support for wildcards in MANPATH (Fedora bug #677669).
* src/Makefile.am (catman_SOURCES, manpath_SOURCES, whatis_SOURCES):
Add globbing.c and globbing.h.
* src/globbing.c (expand_path): New function.
* src/globbing.h (expand_path): Add prototype.
* src/manp.c (add_dir_to_list): Rename to ...
(add_expanded_dir_to_list): ... this.
(add_dir_to_list): New function, expanding wildcards and wrapping
add_expanded_dir_to_list.
(add_dir_to_path_list): Expand wildcards.
* src/tests/man-4: New file.
* src/tests/Makefile.am (ALL_TESTS): Add man-4.
Thu May 30 11:51:54 BST 2013 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Remove gnulib/gets.patch.
Thu 30 May 11:42:29 BST 2013 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.13.2 and Gnulib 20130529.
* .bzrignore: Add gnulib/lib/locale.h, man/**/*.log, man/**/*.trs,
src/tests/*.log, and src/tests/*.trs.
* autogen.sh: Drop gnulib/gets.patch backport.
* gnulib/gets.patch: Remove.
* configure.ac (AM_INIT_AUTOMAKE): Set minimum Automake version to
1.11. Add parallel-tests option for compatibility with 1.11.
* man/Rules.man (TESTS_ENVIRONMENT): Move to ...
(LOG_COMPILER): ... this.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Rewrite as a list of
variable exports rather than as a command prefix, for
compatibility with parallel-tests.
Tue May 14 22:55:09 BST 2013 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Define YY_NO_INPUT, suppressing a -Wunused-function
warning from GCC (thanks, Bjarni Ingi Gislason).
* src/zsoelim.l: Likewise.
Tue May 7 15:27:28 BST 2013 Colin Watson <cjwatson@debian.org>
* src/man.c (escape_less): Revert handling of incompatible option
string escaping in less 456. That change was reverted upstream in
less 457.
Sun Mar 3 14:22:32 GMT 2013 Felipe Castro <fefcas@gmail.com>
* po/eo.po: New from Translation Project.
* po/LINGUAS: Add eo.
* man/THANKS: Add translator credit.
Sun Mar 3 14:19:38 GMT 2013 Robert Luberda <robert@debian.org>
* po/pl.po: Update from Translation Project.
* man/po4a/po/pl.po: Likewise.
Tue Jan 29 13:15:26 GMT 2013 Will <cwr@netcom.co.uk>
* src/manp.c (add_to_dirlist): Increase key length to handle buried
binutils manual page paths.
Mon Jan 21 11:20:48 GMT 2013 Colin Watson <cjwatson@debian.org>
* configure.ac (AC_HEADER_SYS_WAIT): Remove; no longer used.
Mon Jan 21 11:04:44 GMT 2013 Colin Watson <cjwatson@debian.org>
Upgrade to Libtool 2.4.2-1.2 (from Debian).
Sat Dec 22 13:59:14 GMT 2012 Colin Watson <cjwatson@debian.org>
Document default section list in manual pages (Debian bug #611007).
* man/replace.sin.in: Substitute %sections%.
* man/man1/man.man1 (DESCRIPTION): Fix misplaced comma. Document
configured list of sections rather than simply saying "a
pre-defined order".
(ENVIRONMENT): Document default for $MANSECT.
* man/man8/catman.man8 (ENVIRONMENT): Likewise.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Fri Dec 21 21:29:27 GMT 2012 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Use $MANLESS as the default for prompt_string if
the -r option was not used.
(setenv_less): Remove code to copy $MANLESS verbatim into $LESS.
* man/man1/man.man1 (Controlling formatted output, ENVIRONMENT):
Describe new behaviour of $MANLESS.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Sun Dec 16 12:00:55 GMT 2012 Colin Watson <cjwatson@debian.org>
* src/man.c (escape_less): Handle incompatible change to option
string escaping in less 456. Reported by Vincent Lefevre.
Sat Dec 15 10:49:46 GMT 2012 Joe Hansen <joedalton2@yahoo.dk>
* man/po4a/po/da.po: Update from Translation Project.
Sat Nov 24 22:42:01 GMT 2012 Colin Watson <cjwatson@debian.org>
* man/po4a/po/da.po: New from Translation Project (thanks, Joe
Hansen).
* configure.ac (AC_CONFIG_FILES): Add man/da/Makefile.
* man/LINGUAS.po4a: Add da.
* man/Makefile.am (DIST_SUBDIRS): Add da.
* man/da/Makefile.am, man/da/translator.add: New files.
* man/po4a/Makefile.am (POFILES): Add po/da.po.
* man/po4a/po4a.cfg (po4a_langs): Add da.
* man/THANKS: Credit Joe Hansen with man/da as well as da.po.
* .bzrignore: Add man/da/man1, man/da/man5, and man/da/man8.
Mon Sep 17 23:22:48 BST 2012 Colin Watson <cjwatson@debian.org>
* Version: 2.6.3.
Mon Sep 17 23:20:19 BST 2012 Colin Watson <cjwatson@debian.org>
Stop distributing .tar.gz, as promised in the release notes for
2.6.2.
* configure.ac (AM_INIT_AUTOMAKE): Add no-dist-gzip.
* docs/man-db.lsm (Primary-site): Drop .tar.gz size.
Mon Sep 17 22:53:40 BST 2012 Colin Watson <cjwatson@debian.org>
* autogen.sh, release.sh: Use 'set -e' rather than '#! /bin/sh -e',
to avoid accidents when debugging with 'sh -x'.
Mon Sep 17 22:53:14 BST 2012 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Add gnulib/gets.patch.
Mon Sep 17 22:33:41 BST 2012 Colin Watson <cjwatson@debian.org>
* configure.ac: Use AM_PROG_AR before LT_INIT, for compatibility
with Automake 1.12.
* NEWS: Document this.
Mon Sep 17 22:28:27 BST 2012 Colin Watson <cjwatson@debian.org>
Backport Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348 to
stop assuming gets (Savannah bug #37255).
* gnulib/gets.patch: New file.
* autogen.sh: Apply gnulib/gets.patch.
* NEWS: Document this.
Mon Sep 17 22:07:02 BST 2012 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.11.6.
Thu Aug 16 12:08:48 BST 2012 Trần Ngọc Quân <vnwildman@gmail.com>
* po/vi.po: Update from Translation Project.
* man/THANKS: Update.
Mon Jun 18 13:37:45 BST 2012 Colin Watson <cjwatson@debian.org>
* Version: 2.6.2.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Mon Jun 18 13:34:31 BST 2012 Ville Skyttä <ville.skytta@iki.fi>
* configure.ac: Add elinks and w3m to list of HTML browsers to
search for.
Mon Jun 18 13:02:06 BST 2012 Colin Watson <cjwatson@debian.org>
* configure.ac: Adjust indentation. Set unlzma to empty if xz is
found.
Mon Jun 18 12:56:56 BST 2012 Ville Skyttä <ville.skytta@iki.fi>
* configure.ac: Only check for lzma if xz is not found.
* include/comp_src.h.in (comp_list): Likewise.
Mon Jun 18 11:40:27 BST 2012 Colin Watson <cjwatson@debian.org>
* configure.ac (AM_INIT_AUTOMAKE): Distribute tarballs compressed
using xz as well as gzip.
Mon Jun 18 11:24:30 BST 2012 Colin Watson <cjwatson@debian.org>
* src/whatis.c (main): Make the global configuration file optional
if a user configuration file was supplied. Fixes test suite.
Mon Jun 18 10:59:41 BST 2012 Colin Watson <cjwatson@debian.org>
* README (Copyright and licensing): Update FSF copyright years.
Mon Jun 18 10:55:53 BST 2012 Colin Watson <cjwatson@debian.org>
Upgrade to Autoconf 2.69, Automake 1.11.5, and Gnulib
20120404-stable.
Mon Jun 18 04:20:41 BST 2012 Colin Watson <cjwatson@debian.org>
Avoid fatal errors when opening a 64-bit GDBM database from a 32-bit
process (Ubuntu bug #1001189).
* libdb/db_gdbm.c (trap_error): New function.
(man_gdbm_open_wrapper): Rearrange interface to call gdbm_open
rather than taking its return value as an argument. Fetch a test
value from the database after opening it, inside a setjmp/longjmp
guard to prevent GDBM from exiting.
* include/mydbm.h (man_gdbm_open_wrapper): Update prototype.
(MYDBM_CTRWOPEN, MYDBM_CRWOPEN, MYDBM_RWOPEN, MYDBM_RDOPEN):
Update man_gdbm_open_wrapper calls, since it now calls gdbm_open
itself.
* NEWS: Document this.
Mon May 14 16:40:00 PDT 2012 Colin Watson <cjwatson@debian.org>
* NEWS: The fix for Ubuntu bug #927028 also fixed Debian bug #672661
along the way. Document this.
Fri May 4 15:36:58 BST 2012 Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>
* man/po4a/po/de.po: Update from Translation Project.
Thu Apr 26 09:28:44 BST 2012 Arun Persaud <arun@nubati.net>
* po/de.po: Update from Translation Project.
Thu Apr 19 11:19:19 BST 2012 Arun Persaud <arun@nubati.net>
* po/de.po: Update from Translation Project.
* man/THANKS: Update.
Sun Apr 8 09:43:11 BST 2012 Marek Černocký <marek@manet.cz>
* po/cs.po: Update from Translation Project.
Mon Mar 19 10:57:16 GMT 2012 Joe Hansen <joedalton2@yahoo.dk>
* po/da.po: Update from Translation Project.
Mon Feb 27 13:26:47 GMT 2012 Colin Watson <cjwatson@debian.org>
* src/whatis.c (main): Move locale manpath expansion to ...
(locale_manpath): ... here (new function).
(suitable_manpath): New function.
(do_whatis): If a page contains a slash and is a path to an
executable on $PATH, then look up its base name only in
appropriate manual hierarchies.
(search): Pass current manpath entry to do_whatis.
* src/tests/whatis-1: New file.
* src/tests/Makefile.am (ALL_TESTS): Add whatis-1.
* NEWS: Document this.
Wed Feb 22 03:04:45 GMT 2012 Colin Watson <cjwatson@debian.org>
Optimise apropos when given many arguments (Ubuntu bug #927028).
* src/whatis.c (use_grep, do_whatis, parse_name, parse_whatis,
do_apropos, search): Operate on multiple pages.
(use_grep, do_whatis, do_apropos): Update an output array rather
than returning an int.
(parse_name, parse_whatis): Update an output array as well as
returning an int.
(display, do_whatis_section): Constify page argument.
(match): Constify lowpage and whatis arguments.
(main): Process all arguments using a single call to search.
* NEWS: Document this.
Wed Feb 22 02:46:22 GMT 2012 Colin Watson <cjwatson@debian.org>
* lib/encodings.c (fallback_source_encoding, fallback_roff_encoding,
fallback_less_charset): Save memory by declaring as const char[]
rather than const char * (see http://glandium.org/blog/?p=2361).
(find_charset_locale): Likewise for supported_path.
* src/man.c (default_roff_warnings): Likewise.
Sat Feb 18 09:34:42 GMT 2012 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (hashtable_lookup_structure): Make return type
more precise.
* lib/hashtable.h (hashtable_lookup_structure): Update prototype.
Thu Feb 16 10:55:05 GMT 2012 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Add gnulib/m4/math_h.m4.
Tue Feb 14 12:18:50 GMT 2012 Colin Watson <cjwatson@debian.org>
* Version: 2.6.1.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Thu Feb 9 08:44:09 GMT 2012 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.11.3.
Thu Feb 9 08:16:12 GMT 2012 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l, src/zsoelim.l: Ensure that config.h is included at
the very top of the scanner, before any other headers. This
should fix a compilation problem on Solaris reported by Clark J.
Wang.
Wed Feb 8 14:07:41 GMT 2012 Joe Hansen <joedalton2@yahoo.dk>
* po/da.po: Update from Translation Project.
Tue Feb 7 00:20:51 GMT 2012 Colin Watson <cjwatson@debian.org>
* docs/INSTALL.quick: Document requirement for libiconv >= 1.8 on
non-glibc systems.
Mon Feb 6 23:00:33 GMT 2012 David Prévot <david@tilapin.org>
* man/po4a/po/fr.po, po/fr.po: Update from Translation Project.
Mon Feb 6 22:57:12 GMT 2012 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po, po/ru.po: Update from Translation Project.
Mon Feb 6 10:45:22 GMT 2012 Colin Watson <cjwatson@debian.org>
* FAQ: New file.
* Makefile.am (dist_noinst_DATA): Add FAQ.
Sun Feb 5 21:59:39 GMT 2012 Colin Watson <cjwatson@debian.org>
* README (Notice to users of man-db version 2.2 or 2.2.1): Remove
this section. The chances of anyone still running man-db versions
from 1995 seem remote in the extreme.
Sun Feb 5 21:57:49 GMT 2012 Colin Watson <cjwatson@debian.org>
* release.sh: Make sure that src/lexgrog.c and src/zsoelim.c are
fresh.
Sun Feb 5 15:36:52 GMT 2012 Colin Watson <cjwatson@debian.org>
* README (Copyright and licensing): New year.
Sun Feb 5 13:14:42 GMT 2012 Colin Watson <cjwatson@debian.org>
* manual/README: Fix spelling mistake.
Sun Feb 5 02:11:04 GMT 2012 Colin Watson <cjwatson@debian.org>
* Version: 2.6.1-pre1.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Sun Feb 5 01:34:14 GMT 2012 Colin Watson <cjwatson@debian.org>
Fix 'make distcheck' to pass with Automake 1.11.2.
* Makefile.am (distuninstallcheck_listfiles): Ignore the
configuration file, which is deliberately left in place on
uninstall.
* configure.ac (AM_INIT_AUTOMAKE): Add -Wno-override.
* src/Makefile.am (EXTRA_DIST): Force distribution of lexgrog.c and
zsoelim.c.
Sun Feb 5 00:53:23 GMT 2012 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): Recommend 'bzr branch' rather
than 'bzr get'; the latter is apparently deprecated in bzr 2.4.
Sat Feb 4 23:38:15 GMT 2012 David Prévot <taffit@debian.org>
* man/man1/apropos.man1 (SEE ALSO), man/man1/lexgrog.man1 (SEE
ALSO), man/man1/man.man1 (SEE ALSO), man/man1/manconv.man1 (SEE
ALSO), man/man1/manpath.man1 (SEE ALSO), man/man1/whatis.man1 (SEE
ALSO), man/man1/zsoelim.man1 (SEE ALSO), man/man8/catman.man8 (SEE
ALSO), man/man8/mandb.man8 (SEE ALSO): Alphabetise references and
remove trailing full stops, per man-pages(7) (Debian bug #651482).
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Sat Feb 4 23:27:39 GMT 2012 Marek Černocký <marek@manet.cz>
* po/cs.po: Update from Translation Project.
* man/THANKS: Update.
Sat Feb 4 23:10:58 GMT 2012 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (split_data): Use ngettext to translate strings
containing plural forms (Savannah bug #34968).
* src/lexgrog.l (too_big): Likewise.
* src/mandb.c (main): Likewise.
* po/man-db.pot, po/*.po: Update.
Sat Feb 4 21:44:47 GMT 2012 Colin Watson <cjwatson@debian.org>
* src/man.c (options): Add --path as an alias for -w.
(main): Running 'man -w' (etc.) without a name now prints the
manpath, for compatibility with other man implementations.
* NEWS: Document this.
Thu Feb 2 18:05:16 GMT 2012 Colin Watson <cjwatson@debian.org>
* include/comp_src.h.in (comp_list): Don't handle .lzma files using
lzip. Requested by Matias A. Fonzo.
Thu Feb 2 01:51:18 GMT 2012 Colin Watson <cjwatson@debian.org>
Fix some errors spotted by the clang static analyser. Some just
needed to be suppressed, but there were two real bugs.
* src/manconv.c (try_iconv): Make sure outptr is always initialised,
even in the corner case where we convert some input text but don't
get any UTF-8 text in return.
* src/manp.c (get_catpath): Handle manpaths not containing a slash.
* src/convert_name.c: Mark as non-returning, and add an abort after
error (FATAL) to help the compiler prove this.
* src/man.c (format_display): Add an assert to help clang prove that
old_cwd is always non-NULL when used.
* src/ult_src.c: Add asserts to help clang prove that buf is always
non-NULL when used.
Thu Feb 2 00:02:07 GMT 2012 Matias A. Fonzo <selk@dragora.org>
Add support for Lzip-compressed manual pages.
* configure.ac: Check for lzip. Don't test for lzma if lzip is
present, as was already the case for xz.
* include/comp_src.h.in (comp_list): Add lzip.
* include/manconfig.h.in: Define UNLZIP.
* NEWS: Document this.
Wed Feb 1 23:25:03 GMT 2012 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.11.2 and Gnulib 20111211-stable.
* gnulib: Import closedir, fstat, and opendir modules.
Wed Nov 2 14:33:18 GMT 2011 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
Sun Oct 9 23:32:41 BST 2011 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (null_hashtable_free): Use ATTRIBUTE_UNUSED to
appease compiler warnings rather than assigning an argument to
itself.
* src/mandb.c (cleanup_sigsafe, cleanup): Likewise.
Sun Oct 9 23:14:11 BST 2011 Colin Watson <cjwatson@debian.org>
* src/man.c (get_roff_line_length, add_roff_line_length): Only
compile if either TROFF_IS_GROFF or HEIRLOOM_NROFF is defined.
Spotted by cppcheck.
Sun Oct 9 22:50:36 BST 2011 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_to_dirlist): Read lines from configuration file
using getline rather than fgets with a fixed-size buffer.
Sun Oct 9 22:42:00 BST 2011 Colin Watson <cjwatson@debian.org>
* gnulib: Import getline module (used in lib/encodings.c).
Sun Oct 9 22:26:15 BST 2011 Colin Watson <cjwatson@debian.org>
* man/es/man8/accessdb.man8: Remove; this is simply an out-of-date
copy of the English page. Reported by Křištof Želechovski.
* man/es/Makefile.am (man8_MANS): Remove man8/accessdb.8.
Sun Oct 9 22:21:19 BST 2011 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20110908-stable.
Sun Oct 9 00:24:22 BST 2011 Peter Schiffer <pschiffe@redhat.com>
* src/filenames.c (filename_info): Zero-initialise the contents of
info to avoid a double-free in store_descriptions (Fedora bug
#702904).
* src/tests/mandb-6: New file.
* src/tests/Makefile.am (ALL_TESTS): Add mandb-6.
* NEWS: Document this.
Sun Oct 9 00:16:25 BST 2011 Colin Watson <cjwatson@debian.org>
* NEWS: Update.
Sat Oct 8 23:34:26 BST 2011 Colin Watson <cjwatson@debian.org>
Convert the German manual pages translation to po4a.
* man/po4a/po/de.po: New from Translation Project (thanks, Martin
Eberhard Schauer).
* man/LINGUAS: Remove de.
* man/LINGUAS.po4a: Add de.
* man/de/man1, man/de/man5, man/de/man8: Remove.
* man/de/Makefile.am (PO4A_LINGUA): Set to yes.
(EXTRA_DIST): Add translator.add.
(man1_MANS): Add man1/lexgrog.1 and man1/manconv.1.
* man/po4a/Makefile.am (POFILES): Add po/de.po.
* man/po4a/po4a.cfg (po4a_langs): Add de.
* man/THANKS: Credit Martin Schauer with man/de as well as de.po.
* .bzrignore: Add man/de/man1, man/de/man5, and man/de/man8.
Sat Oct 8 17:11:08 BST 2011 Yasuaki Taniguchi <yasuakit@gmail.com>
* po/ja.po: Update from Translation Project.
Sat Oct 8 17:09:41 BST 2011 Colin Watson <cjwatson@debian.org>
* man/THANKS: Consolidate duplicated credit.
Sat Oct 8 17:07:17 BST 2011 Colin Watson <cjwatson@debian.org>
Convert the Japanese manual pages translation to po4a.
* man/po4a/po/ja.po: New from Translation Project (thanks, Yasuaki
Taniguchi).
* man/LINGUAS: Remove ja.
* man/LINGUAS.po4a: Add ja.
* man/ja/man1, man/ja/man5, man/ja/man8: Remove.
* man/ja/Makefile.am (PO4A_LINGUA): Set to yes.
(EXTRA_DIST): Add translator.add.
(man1_MANS): Add man1/lexgrog.1 and man1/manconv.1.
* man/po4a/Makefile.am (POFILES): Add po/ja.po.
* man/po4a/po4a.cfg (po4a_langs): Add ja.
* man/THANKS: Add Yasuaki Taniguchi.
* .bzrignore: Add man/ja/man1, man/ja/man5, and man/ja/man8.
Sun Sep 18 18:28:37 BST 2011 Colin Watson <cjwatson@debian.org>
* src/tests/mandb-5: Make executable.
Sat Sep 17 13:28:33 BST 2011 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): man-db's Bazaar repository now
requires bzr 1.16 or later.
Mon Sep 5 11:29:53 BST 2011 Colin Watson <cjwatson@debian.org>
* src/mandb.c: Include "xvasprintf.h" for xasprintf.
Mon Aug 8 14:00:32 BST 2011 Colin Watson <cjwatson@debian.org>
* src/mandb.c (mandb): Create a cache directory tag, per
http://www.brynosaurus.com/cachedir/ ("Cache Directory Tagging
Standard"). Suggested by Josh Triplett (Debian bug #637046).
Fri Jul 8 13:27:41 BST 2011 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Use a 32KiB buffer when copying files, rather
than a 1KiB buffer. This seems somewhat faster (although it's
hard to tell on an SSD!).
Fri Jul 8 12:49:46 BST 2011 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20110609-stable.
Thu Jun 16 12:18:08 BST 2011 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c, libdb/db_ndbm.c: Stop including "flock.h",
removed in 2.6.0. Reported by Maciej Mrozowski. Include
<sys/file.h> unconditionally, since Gnulib now provides it.
* NEWS: Document this.
Mon Jun 6 11:25:28 BST 2011 Colin Watson <cjwatson@debian.org>
* man/po4a/Locale/Po4a/Manext.pm (translate): Exclude a number of
untranslatable table entries from translation.
Mon Jun 6 10:36:01 BST 2011 David Prévot <david@tilapin.org>
* man/po4a/po/fr.po: Update from Translation Project.
Mon Jun 6 10:34:26 BST 2011 Colin Watson <cjwatson@debian.org>
* man/man8/accessdb.man8 (NAME): Remove trailing full stop
(suggested by David Prévot). Unfuzzy all translations.
Mon Jun 6 10:06:09 BST 2011 Colin Watson <cjwatson@debian.org>
* src/straycats.c (check_for_stray): Pass mandir_base as base
argument to store_descriptions, not mandir. Regression introduced
in man-db 2.6.0 (r1309).
Sat Jun 4 07:33:36 BST 2011 Colin Watson <cjwatson@debian.org>
* src/straycats.c (check_for_stray): When invoking col, try to
ensure that LC_CTYPE is set to a UTF-8 locale (Arch Linux bug
#18722).
Fri Jun 3 10:05:45 BST 2011 David Prévot <david@tilapin.org>
* man/po4a/po/fr.po: Update from Translation Project.
Tue May 31 01:04:26 BST 2011 Colin Watson <cjwatson@debian.org>
* lib/encodings.c (get_locale_charset): Eliminate ctype variable,
which was set but not used.
* src/man.c (make_roff_command): Preprocess out code to set
using_tbl if GNU_NROFF is defined, since that code is only used if
it is not defined.
Tue May 31 00:59:01 BST 2011 Colin Watson <cjwatson@debian.org>
* src/man.c (locale_macros): Add a backslash to the end of the .if
line, to avoid adding a blank line to the output (Debian bug
#628639).
Fri May 20 16:35:02 BST 2011 Yasuaki Taniguchi <yasuakit@gmail.com>
* po/ja.po: Update from Translation Project.
Wed May 18 17:25:46 BST 2011 Yasuaki Taniguchi <yasuakit@gmail.com>
* po/ja.po: Update from Translation Project.
* man/THANKS: Update.
Fri May 13 16:11:07 BST 2011 Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>
* po/de.po: Update from Translation Project.
Sat Apr 23 18:54:06 BST 2011 Colin Watson <cjwatson@debian.org>
* src/Makefile.am (SUBDIRS): Build this directory before tests/, so
that 'make check' works even if 'make' has not been run.
Sat Apr 23 18:00:34 BST 2011 Colin Watson <cjwatson@debian.org>
Upgrade to Autoconf 2.68 and Gnulib 20110412-stable.
Wed Apr 13 11:22:39 BST 2011 Colin Watson <cjwatson@debian.org>
* Version: 2.6.0.2.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Wed Apr 13 10:26:07 BST 2011 Colin Watson <cjwatson@debian.org>
* src/descriptions.c (parse_descriptions): Once we've seen at least
one record, ignore any further records that don't include a whatis
description, as they tend to be noise (Arch Linux bug #22866).
* NEWS: Document this.
Tue Apr 12 14:10:17 BST 2011 Jordi Mallach <jordi@gnu.org>
* po/ca.po: Update from Translation Project.
Tue Apr 12 14:03:38 BST 2011 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (test_manfile): whatis->whatis may be NULL in
the case of an empty page. Guard against this (Debian bug
#622104).
* src/tests/mandb-5: New file.
* src/tests/Makefile.am (ALL_TESTS): Add mandb-5.
* NEWS: Document this.
Sun Apr 10 22:09:10 BST 2011 Colin Watson <cjwatson@debian.org>
* Version: 2.6.0.1.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Sun Apr 10 14:45:52 BST 2011 Colin Watson <cjwatson@debian.org>
* src/manp.c (read_config_file): Read a user-specified configuration
file even if HOME is unset.
* NEWS: Document this.
Sun Apr 10 02:10:56 BST 2011 Colin Watson <cjwatson@debian.org>
* src/descriptions_store.c (store_descriptions): Ensure that the
target of a symlink or .so chain is always recorded as a real
page. Fixes mandb-2 test failures.
* NEWS: Document this.
Sun Apr 10 01:55:28 BST 2011 Colin Watson <cjwatson@debian.org>
* src/tests/mandb-2: Test the case where a manual page changes from
a symbolic link to a regular file, as well as vice versa.
Sat Apr 9 13:30:16 BST 2011 Colin Watson <cjwatson@debian.org>
* Version: 2.6.0.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po, po/man-db.pot,
po/*.po: Update.
Sat Apr 9 13:21:08 BST 2011 Colin Watson <cjwatson@debian.org>
Upgrade to Libtool 2.4.
Sat Apr 9 12:56:02 BST 2011 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (Controlling formatted output): Wrap first cell
in --ascii translation table.
* man/man8/mandb.man8 (DATABASE CACHES): Wrap second cell in
database type table.
* man/po4a/Locale/Po4a/Manext.pm (shiftline): Fix T} detection.
* man/po4a/po/ru.po: Don't translate "\\*[softhyphen]".
Sat Apr 9 11:52:20 BST 2011 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (DESCRIPTION): Typeset ellipses in roman rather
than bold (thanks, David Prévot).
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Manually unfuzzy translations.
Sat Apr 9 11:42:51 BST 2011 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
* po/pl.po: Likewise.
Sat Apr 9 11:38:52 BST 2011 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project.
Thu Apr 7 12:46:34 BST 2011 Colin Watson <cjwatson@debian.org>
* lib/cleanup.c (do_cleanups): Set tos and nslots to 0 before
freeing stack, in case do_cleanups_sigsafe is called again from a
signal handler (Fedora bug #694332).
* NEWS: Document this.
Sat Apr 2 12:20:30 BST 2011 David Prévot <david@tilapin.org>
* po/fr.po: Update from Translation Project.
Mon Mar 28 17:59:45 BST 2011 Yuri Kozlov <yuray@komyakino.ru>
* po/ru.po: Update from Translation Project.
Mon Mar 28 17:40:36 BST 2011 Colin Watson <cjwatson@debian.org>
* gnulib: Import flock module.
* lib/Makefile.am (libman_la_SOURCES): Remove flock.h.
* lib/README: Remove flock.*.
* lib/flock.c, lib/flock.h: Remove.
Mon Mar 28 13:07:50 BST 2011 Colin Watson <cjwatson@debian.org>
* libdb/mydbm.h (btree_close, btree_exists, btree_fetch,
btree_firstkey, btree_nextkey, btree_replace, btree_nextkeydata):
Drop inline specifier; these functions are typically used from
different translation units from their definitions.
Mon Mar 28 12:59:54 BST 2011 Colin Watson <cjwatson@debian.org>
* configure.ac: Add support for db5.
* NEWS: Document this.
Mon Mar 28 12:26:54 BST 2011 Colin Watson <cjwatson@debian.org>
* configure.ac: Apply correct M4 quotation throughout.
* m4/man-bdb.m4: Likewise.
* m4/man-gnu-nroff.m4: Likewise.
* m4/man-linguas.m4: Likewise.
* m4/man-trans-subst.m4: Likewise.
* m4/man-bdb.m4: Use AS_VAR_IF rather than AS_IF plus AS_VAR_GET.
Mon Mar 28 11:15:16 BST 2011 Joe Hansen <joedalton2@yahoo.dk>
* po/da.po: Update from Translation Project.
Mon Mar 28 11:12:38 BST 2011 David Prévot <david@tilapin.org>
* man/po4a/po/fr.po: Update from Translation Project.
* man/THANKS: Update.
Mon Mar 28 11:09:19 BST 2011 David Prévot <david@tilapin.org>
* po/fr.po: Update from Translation Project.
Mon Mar 28 11:06:04 BST 2011 Colin Watson <cjwatson@debian.org>
* m4/man-gcc-warning.m4: Remove.
* gnulib: Import warnings module.
* configure.ac: Replace MAN_GCC_WARNING with gl_WARN_ADD.
Sun Mar 27 18:25:25 BST 2011 Colin Watson <cjwatson@debian.org>
* Version: 2.6.0-pre1.
* po/man-db.pot, po/*.po: Update.
* man/po4a/po/man-db-manpages.pot: Update.
Thu Mar 24 12:46:38 GMT 2011 Colin Watson <cjwatson@debian.org>
* lib/security.c (do_system_drop_privs_child): Remove unused
variable.
Thu Mar 24 12:43:51 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/man.c (lang): Make non-const.
(local_man_loop): Free lang after calling display.
(display_filesystem): Likewise.
(display_database): Likewise.
(do_global_apropos_section): Ensure lang is set while calling
display.
* NEWS: Document this.
Thu Mar 24 01:22:00 GMT 2011 Colin Watson <cjwatson@debian.org>
Help novices find their way around. See
http://brainstorm.ubuntu.com/idea/25975.
* src/man.c (main): Add "(press h for help or q to quit)" to the
default less prompt string.
* man/man1/man.man1 (Controlling formatted output): Update
documentation.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
* NEWS: Document this.
Thu Mar 24 01:03:13 GMT 2011 Colin Watson <cjwatson@debian.org>
Rewrite all remaining subprocess handling in terms of libpipeline.
* lib/security.c (do_system_drop_privs_child): New function.
(do_system_drop_privs): Rewrite using libpipeline.
* src/catman.c (post_fork): New function.
(catman): Rewrite using libpipeline.
(add_arg): Rewrite as a wrapper around pipecmd_arg.
(do_catman): Remove.
(reset_cursor): Remove.
(parse_for_sec): Use libpipeline for subprocess handling.
(main): Install custom post-fork handler.
* src/man.c (gripe_no_man) [_AIX || __sgi]: Rewrite vendor fallback
using libpipeline.
* src/Makefile.am (catman_LDADD): Add $(libpipeline_LIBS).
* src/catman.c (main): Duplicate the output of setlocale if
non-NULL.
* configure.ac (AC_FUNC_VFORK): Remove.
(AC_REPLACE_FUNCS): Remove waitpid.
* gnulib: Remove waitpid module.
* lib/README: Remove waitpid.c.
* lib/waitpid.c: Remove.
Sun Mar 20 12:58:42 GMT 2011 Colin Watson <cjwatson@debian.org>
Remove the need for our patched version of xstrdup.
* lib/encodings.c (get_locale_charset): Check return value of
setlocale before passing to xstrdup.
(find_charset_locale): Likewise.
* lib/pathsearch.c (pathsearch): Check return value of getenv before
passing to xstrdup.
(pathsearch_executable): Likewise.
* lib/tempfile.c (create_tempdir): Adjust appendstr call to avoid
needing to pass return value of path_search to xstrdup.
* src/check_mandirs.c (test_manfile): Don't pass NULL lg.whatis to
xstrdup.
* src/descriptions.c (parse_descriptions): Don't pass NULL
head->whatis to xstrdup.
* src/man.c (main): Check return value of setlocale before passing
to xstrdup.
(add_col): Only call find_charset_locale if locale_charset is
non-NULL.
(add_candidate): Don't pass NULL ult to xstrdup.
* src/manp.c (read_config_file): Adjust appendstr call to avoid
needing to pass return value of getenv to xstrdup.
* src/whatis.c (do_apropos): Don't pass NULL info.whatis to xstrdup.
(main): Check return value of setlocale before passing to xstrdup.
* src/zsoelim.l (zsoelim_stdin_data_new): Don't pass NULL path to
xstrdup.
* Makefile.am (EXTRA_DIST): Remove gnulib/lib/xmalloc.c.orig and
gnulib/lib/xmalloc.patch.
* autogen.sh: Stop applying gnulib/lib/xmalloc.patch.
* gnulib/lib/xmalloc.c.orig, gnulib/lib/xmalloc.patch: Remove.
Sun Mar 20 01:39:41 GMT 2011 Colin Watson <cjwatson@debian.org>
* gnulib: Import waitpid module.
Sun Mar 20 01:31:33 GMT 2011 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20110216-stable.
Tue Mar 15 10:55:52 GMT 2011 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (STD_SECTIONS): Add section 0 between 3 and
2, matching a change in man-db 2.5.6.
Tue Mar 15 10:52:58 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): If the user asked for an explicit
section, sort exact matches first (Fedora bug #684977).
* src/tests/man-3: New file.
* src/tests/Makefile.am (ALL_TESTS): Add man-3.
* NEWS: Document this.
Tue Mar 15 10:48:19 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_sections): Put user entries in a separate list.
(get_sections): If any user entries are present, use them rather
than system entries.
(add_to_dirlist): Pass user to add_sections.
* NEWS: Document this.
Mon Mar 14 10:55:39 GMT 2011 Joe Hansen <joedalton2@yahoo.dk>
* po/da.po: Update from Translation Project.
* man/THANKS: Update.
Wed Mar 2 11:12:13 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Reset SIGPIPE to SIG_DFL on startup, to avoid
noisy output in the event that mandb was started from a context
where SIGPIPE was ignored (e.g. Fedora bug #649674).
* NEWS: Document this.
Tue Jan 25 00:20:29 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (MAN_NAME): Consider .PD requests as paragraph
breaks, to work around poor lexical analysis that causes them to
be matched as .P and emit a stray trailing "D" (Debian bug
#611012).
Sun Jan 23 23:50:38 GMT 2011 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Remove gnulib/m4/sockpfaf.m4, which was
removed along with the internal copy of libpipeline.
* man/po4a/Makefile.am (EXTRA_DIST): Add Locale/Po4a/Manext.pm.
(PO4A_ENVIRONMENT): Set PERL5LIB to $(srcdir), not `pwd`.
Sun Jan 23 17:01:51 GMT 2011 Colin Watson <cjwatson@debian.org>
* man/man1/apropos.man1 (OPTIONS), man/man1/lexgrog.man1 (OPTIONS),
man/man1/man.man1 (OPTIONS), man/man1/manconv.man1 (OPTIONS),
man/man1/manpath.man1 (OPTIONS), man/man1/whatis.man1 (OPTIONS),
man/man1/zsoelim.man1 (OPTIONS), man/man8/accessdb.man8 (OPTIONS),
man/man8/catman.man8 (OPTIONS), man/man8/mandb.man8 (OPTIONS):
Print commas in roman rather than bold. Based on a patch from
David Prévot (Debian bug #600002).
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Manually unfuzzy translations.
Mon Jan 10 20:08:03 GMT 2011 Colin Watson <cjwatson@debian.org>
If mandb sees that A is a symlink to B, it should never store a
whatis reference for B (Debian bug #204249).
* src/check_mandirs.c (whatis_hashtable_free): New function.
(test_manfile): Change whatis_hash free function to
whatis_hashtable_free. Fetch an ult_trace structure from ult_src,
record it in whatis_hash in the case of a cache miss, and pass it
to store_descriptions.
* src/descriptions_store.c (is_prefix): New function.
(store_descriptions): Add path and trace parameters. Update all
callers.
* src/descriptions.h (store_descriptions): Update prototype. Count
a match for any name in the provided ult_trace structure as
indicating that we shouldn't create a whatis reference. If a name
matches a trace entry outside the current manual hierarchy, skip
that name entirely.
* src/ult_src.c (ult_trace, free_ult_trace): New functions.
(ult_src): Add trace parameter. Record each file name we
encounter in the trace. Update all callers.
* src/ult_src.h (ult_src): Update prototype.
(free_ult_trace): Add prototype.
* src/Makefile.am (lexgrog_SOURCES): Add filenames.c and
filenames.h.
* src/tests/mandb-2: Test two-level symlinks.
* src/tests/mandb-4: New file.
* src/tests/Makefile.am (ALL_TESTS): Add mandb-4.
Mon Jan 10 16:20:22 GMT 2011 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (DESCRIPTION), man/de/man1/man.man1
(BESCHREIBUNG), man/es/man1/man.man1 (DESCRIPCIÓN),
man/it/man1/man.man1 (DESCRIZIONE), man/ja/man1/man.man1 (説明):
Enclose long table cells in T{ T}.
* man/po4a/Locale/Po4a/Manext.pm: New file, to let us translate
individual table cells separately.
* man/po4a/Makefile.am: Run po4a with PERL5LIB=`pwd`.
* man/po4a/po4a.cfg: Change type to manext.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
* man/check-man: Stop ignoring "table wider than line width"
warnings.
* NEWS: Document this.
Sat Jan 8 18:21:07 GMT 2011 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Remove lib/pipeline.c (file removed) and
src/descriptions.c (no translatable strings).
* po/man-db.pot, po/*.po: Update.
Sat Jan 8 18:14:18 GMT 2011 Colin Watson <cjwatson@debian.org>
Remove obsolete cat* subdirectories as well as NLS subdirectories.
* src/mandb.c (process_manpath): Store the manpath in tried_catdirs
along with whether it has been seen.
(tried_catdirs_free): New function.
(purge_catdir): Improve message.
(purge_catsubdirs): New function.
(purge_catdirs): Adjust tried_catdirs handling. Call
purge_catsubdirs for both top-level catdirs and NLS catdirs.
(main): Set tried_catdirs free function to tried_catdirs_free.
* NEWS: Document this.
Sat Jan 8 11:42:13 GMT 2011 Colin Watson <cjwatson@debian.org>
Remove obsolete NLS subdirectories of cat directories (Debian bug
#558804).
* lib/hashtable.c (hashtable_iterate): New function.
* lib/hashtable.h (hashtable_iterate): Add prototype.
* lib/util.c (remove_directory): Add recurse parameter. Add missing
closedir calls.
* include/manconfig.h.in (remove_directory): Update prototype.
* src/man.c (format_display): Update remove_directory callers.
* src/mandb.c (process_manpath): Add catpath to tried_catpath hash.
Check that manpath exists and is a directory here rather than in
the caller.
(is_lang_dir, purge_catdir, purge_catdirs): New functions.
(main): Create and free tried_catdirs. Move manpath stat checks
to process_manpath. Call purge_catdirs after all manpath entries
have been processed.
* NEWS: Document this.
Fri Jan 7 23:49:55 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display_and_save): Drop SIGPIPE handling.
pipeline_pump handles this itself, and doing it here means that
SIGPIPE is incorrectly ignored in subprocesses (Debian bug
#597756).
Fri Jan 7 23:25:39 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Use running_setuid.
* src/manp.c (get_def): Likewise.
Tue Jan 4 11:09:00 GMT 2011 Colin Watson <cjwatson@debian.org>
* lib/security.c (running_setuid): New function.
* lib/security.h (running_setuid): Add prototype.
* src/manconv_client.c (manconv_stdin): If running setuid, exec
manconv as an external process, since iconv_open is not guaranteed
to work correctly in setuid processes.
* configure.ac: Require libpipeline >= 1.1.0.
* docs/INSTALL.quick: Document increased version requirement.
* NEWS: Document this.
Mon Jan 3 03:02:50 GMT 2011 Colin Watson <cjwatson@debian.org>
Add basic support for the Heirloom Documentation Tools.
* m4/man-heirloom-nroff.m4: New file.
* configure.ac: Call MAN_PROG_HEIRLOOM_NROFF. If successful and an
nroff macro was found, prepend -mg -msafe -mpadj to the nroff and
troff options.
* lib/encodings.c (charset_table) [HEIRLOOM_NROFF]: Disable latin1
and nippon devices.
(device_table) [HEIRLOOM_NROFF]: Add locale device.
* src/man.c (heirloom_line_length) [HEIRLOOM_NROFF]: New function.
(add_roff_line_length): Optionally return a command, which should
be inserted before troff.
(add_roff_line_length) [HEIRLOOM_NROFF]: Support Heirloom, which
needs text inserted at the start of the input.
(make_roff_command) [HEIRLOOM_NROFF]: Use locale device instead of
utf8 in UTF-8 locales. Handle add_roff_line_length return value.
Unset TROFFMACS if running setuid.
(make_browser): Compile only if TROFF_IS_GROFF.
(format_display): Only declare variables related to HTML output if
TROFF_IS_GROFF.
* src/tests/zsoelim-1: Ignore .ll and .lt lines inserted by
heirloom_line_length.
* NEWS: Document this.
Mon Jan 3 00:56:55 GMT 2011 Colin Watson <cjwatson@debian.org>
* src/manp.c (get_manpath_from_path): Return an empty string rather
than asserting if no path elements with corresponding manpaths
were found (Debian bug #608490).
* src/man.c (local_man_loop): Skip executable processing if no
useful manpath was returned.
* src/tests/man-2: New test for this bug.
* src/tests/Makefile.am (ALL_TESTS): Add man-2.
* README (Copyright and licensing): New year.
Thu Dec 23 16:00:06 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (testmandirs): Make output neater when stderr
is not a tty. Suggested by C W Rose.
* NEWS: Document this.
Thu Dec 23 15:50:39 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (glyphs, perldocs): Remove terminating NULL entries;
these arrays are handled using bsearch with an explicit length,
and NULL-terminating them causes crashes.
Mon Dec 20 00:41:04 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/catman.c (main): Initialise locale using the LC_MESSAGES
category rather than LC_ALL. glibc returns a composite name for
the latter.
* lib/util.c (init_locale): Return void instead of returning the
result of setlocale.
* include/manconfig.h.in (init_locale): Update prototype.
Sun Dec 19 16:10:35 GMT 2010 Colin Watson <cjwatson@debian.org>
* gnulib: Import idpriv-drop and idpriv-droptemp modules.
* configure.ac: Stop checking for seteuid, setreuid, and setresuid.
* lib/security.c (POSIX_SAVED_IDS, SET_EUID, SWAP_UIDS): Remove in
favour of idpriv.h.
(drop_effective_privs): Use idpriv_temp_drop.
(regain_effective_privs): Use idpriv_temp_restore.
(do_system_drop_privs): Use idpriv_drop. Drop saved-IDs case;
avoiding a fork doesn't justify having two code paths.
Sun Dec 5 20:58:10 GMT 2010 Colin Watson <cjwatson@debian.org>
Provide byte positions in manconv errors (Debian bug #562789).
* src/manconv.c (locate_error): New function.
(try_iconv): Skip over processed input data after handling errors.
Use locate_error to produce exact byte positions for conversion
errors.
Thu Dec 2 23:54:03 GMT 2010 Colin Watson <cjwatson@debian.org>
Allow passing multiple sections to whatis and apropos (Debian bug
#571285).
* src/whatis.c (options): Allow spelling --section as --sections;
this is now the preferred long spelling. Document that the
argument may be colon-separated.
(split_sections): New function.
(parse_opt): Pass -s argument through split_sections.
(do_whatis): Move most logic to ...
(do_whatis_section): ... here.
(do_whatis): Iterate over sections, calling do_whatis_section for
each.
(do_apropos): Test all requested sections.
* man/man1/apropos.man1 (SYNOPSIS, OPTIONS), man/man1/whatis.man1
(SYNOPSIS, OPTIONS): Document new semantics.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
* NEWS: Document this.
Thu Dec 2 23:32:07 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/whatis.c (parse_opt): Make -f and -k force program identity to
whatis and apropos respectively. This is useful when running
directly from the build tree, since libtool makes it hard to
detect the program name correctly.
Thu Dec 2 19:28:06 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/catman.c (parse_for_sec): Format ARG_MAX - arg_size using %zd.
* src/manp.c (has_mandir): Cast printf field precisions to int.
(create_pathlist): Use %td to format pointer differences.
Thu Dec 2 19:23:36 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (make_display_command): Make sure the returned pipeline
is never NULL; this causes crashes later.
Thu Dec 2 12:33:43 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (make_display_command): Don't start a pager if standard
output is not a tty (Fedora bug #658132).
* NEWS: Document this.
Thu Dec 2 00:31:31 GMT 2010 Colin Watson <cjwatson@debian.org>
Handle roff named glyphs and perldoc strings in NAME sections
(Debian bug #601025).
* src/lexgrog.l (glyphs, perldocs): New arrays.
(MAN_NAME): Call newline_found on encountering \& at the start of
a line. Call add_glyph_to_whatis on roff named glyphs, and
add_perldoc_to_whatis on perldoc strings.
(compare_macro, add_macro_to_whatis, add_glyph_to_whatis,
add_perldoc_to_whatis): New functions.
* NEWS: Document this.
Wed Dec 1 22:24:51 GMT 2010 Colin Watson <cjwatson@debian.org>
Improve .so searching (Debian bug #503472).
* src/Makefile.am (zsoelim_SOURCES): Add manp.c and manp.h.
* src/zsoelim.l (zsoelim_parse_file): Take manpathlist and
parent_path arguments, and save those to pass on to
zsoelim_open_file.
(try_compressed): New function, split out from zsoelim_open_file.
(zsoelim_open_file): Take manpathlist and parent_path arguments.
Rearrange search logic as follows: (1) if there is no parent_path,
try opening directly; (2) look up filename within each manpath
entry, treating filenames without directory parts as full manual
page lookups; (3) if there is a parent_path, try opening directly.
(zsoelim_stdin): Pass path and manpathlist from input data to
zsoelim_open_file and zsoelim_parse_file.
(zsoelim_stdin_data_new, zsoelim_stdin_data_free): New functions.
* src/zsoelim.h (zsoelim_open_file, zsoelim_parse_file): Update
prototypes.
(zsoelim_stdin_data_new, zsoelim_stdin_data_free): Add prototypes.
* src/zsoelim_main.c (main): Initialise locale and manpath. Pass
manpath to zsoelim_open_file and zsoelim_parse_file.
* src/man.c (main): Calculate manpath before handling -l option.
(make_roff_command): Pass dir and manpathlist to zsoelim_stdin.
* src/tests/zsoelim-1: New test.
* src/tests/Makefile.am (ALL_TESTS): Add zsoelim-1.
* NEWS: Document this.
* src/manp.c (get_def): If not setuid, make this identical to
get_def_user.
* src/manp.h (get_def): Likewise.
Wed Dec 1 14:15:34 GMT 2010 Colin Watson <cjwatson@debian.org>
* lib/security.c (do_system_drop_privs): Copy-edit header comment,
and update it for libpipeline.
Mon Nov 29 17:48:29 GMT 2010 Colin Watson <cjwatson@debian.org>
Remove obsolete versions of lexgrog. They're still available in
revision control if people want them.
* src/Makefile.am (EXTRA_DIST): Remove.
* src/README.lexgrog, src/lexgrog.l-2.3.8, src/lexgrog.l-2.4a,
src/lexgrog.l.new: Remove.
Sun Nov 28 15:01:21 GMT 2010 Colin Watson <cjwatson@debian.org>
Remove internal copy of libpipeline.
* configure.ac: Remove --enable-socketpair-pipe and
--with-external-pipeline options. Remove INTERNAL_PIPELINE
Automake conditional. Check for libpipeline unconditionally.
* docs/INSTALL.quick: Mention the need to install libpipeline.
* gnulib: Remove strsignal and sys_select modules.
* lib/Makefile.am (libman_la_SOURCES): Never add pipeline.c or
pipeline.h.
* lib/pipeline.c, lib/pipeline.h: Remove.
* m4/man-socketpair.m4: Remove.
* NEWS: Document this. Bump to 2.6.0.
Thu Nov 18 13:46:04 GMT 2010 Colin Watson <cjwatson@debian.org>
Reducing linkage when we switched to libtool caused build failures
with versions of GNU ld that default to --no-copy-dt-needed-entries.
Partially revert these changes, this time taking care to directly
link programs against libraries if and only if they use symbols from
those libraries directly (otherwise, the linkage from libman.la and
libmandb.la should be sufficient).
* src/Makefile.am (LIBMAN): Add $(top_builddir)/gnulib/lib/libgnu.la
and @LTLIBINTL@.
(LIBMANDB): Add $(LIBMAN) and $(DBLIBS).
(lexgrog_LDADD, man_LDADD, manconv_LDADD, mandb_LDADD): Add
$(libpipeline_LIBS) and $(LTLIBICONV).
(whatis_LDADD, zsoelim_LDADD): Add $(libpipeline_LIBS).
* NEWS: Document this.
Wed Nov 17 11:43:30 GMT 2010 Colin Watson <cjwatson@debian.org>
* Version: 2.5.9.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Wed Nov 17 11:34:36 GMT 2010 Colin Watson <cjwatson@debian.org>
* lib/util.c (init_locale): Avoid warnings if configured with
--disable-nls. Remove arguments, since this was only ever called
as 'init_locale (LC_ALL, "")' anyway, and that required callers to
explicitly include <locale.h>. Update all callers.
* include/manconfig.h.in (init_locale): Update prototype.
Wed Nov 17 11:22:28 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (test_manfile): Revert changes to this
function from 2010-11-14. Explicitly deleting bad links from the
database was overly sensitive to directory ordering, and caused
test failures on some systems.
* NEWS: Document this.
Mon Nov 15 22:34:57 GMT 2010 Colin Watson <cjwatson@debian.org>
* Version: 2.5.8.
* man/po4a/po/man-db-manpages.pot, po/man-db.pot, po/*.po: Update.
Mon Nov 15 22:22:47 GMT 2010 Colin Watson <cjwatson@debian.org>
* man/Rules.man (distclean-hook): Rename to ...
(distclean-local): ... this, and fix syntax so that it actually
works.
Mon Nov 15 21:38:04 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (local_man_loop): Simplify and improve code to make a
temporary copy of manpathlist, in order that it can't free
unallocated memory (may fix Savannah bug #31633).
Mon Nov 15 13:48:26 GMT 2010 Colin Watson <cjwatson@debian.org>
* man/po4a/Makefile.am (clean-local): Remove; distclean-hook in
man/Rules.man already takes care of this (thanks, Denis Barbier).
Sun Nov 14 22:12:21 GMT 2010 Colin Watson <cjwatson@debian.org>
Prevent repeated rescans when a link is broken. Thanks to Daniel
Isenmann for debugging information.
* src/check_mandirs.c (test_manfile): Explicitly delete bad links
from the database.
(count_glob_matches, purge_whatis, purge_missing): Extract the
database mtime, and ignore any pages at least as old as that for
the purposes of deciding whether a whatis entry has been replaced
by a real page.
* src/tests/mandb-3: New test.
* src/tests/Makefile.am (ALL_TESTS): Add mandb-3.
* NEWS: Document this.
Wed Nov 3 23:40:25 GMT 2010 Jordi Mallach <jordi@gnu.org>
* po/ca.po: Update from Translation Project.
Wed Nov 3 20:27:46 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/catman.c (parse_for_sec): Explicitly pass -S before section
number, to reduce ambiguity.
* src/man.c (main): In catman mode, never try to guess whether a
page argument is a section, as it's too easy to get this wrong
(Ubuntu bug #664211).
Fri Oct 29 07:25:44 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.h (pipeline_install_post_fork): Clarify that this is
run in the child process.
(pipeline_wait_all): Clarify that SIGPIPE is considered equivalent
to exiting zero.
Fri Oct 29 06:18:31 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipecmd_new_sequencev): New function.
(pipecmd_new_sequence): Rewrite in terms of pipecmd_new_sequence.
(pipeline_new_command_argv): New function.
(pipeline_new_command_args): Rewrite in terms of
pipeline_new_command_argv.
(pipeline_command_argv): New function.
(pipeline_command_args): Rewrite in terms of
pipeline_command_argv.
* lib/pipeline.h (pipecmd_new_sequencev, pipeline_new_command_argv,
pipeline_command_argv): Add prototypes.
Fri Oct 29 05:28:33 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Rename to ...
(pipeline_wait_all): ... this. Return 127 rather than 1 if
closing the pipeline output fails. Return 127 if a command other
than the last one fails. Return the statuses and the number of
statuses in new output parameters if they are non-NULL.
(pipeline_wait): Add new wrapper function.
* lib/pipeline.h (pipeline_wait_all): Add prototype.
Fri Oct 29 03:50:16 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_new): Default ignore_signals to 0.
* lib/decompress.c (decompress_open, decompress_fdopen): Remove
redundant calls to pipeline_ignore_signals.
* src/man.c (make_browser): Explicitly ignore SIGINT and SIGQUIT
when running the browser.
(make_display_command): Explicitly ignore SIGINT and SIGQUIT when
running the pager.
Fri Oct 29 03:28:57 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c, lib/pipeline.h: Rename command to pipecmd,
command_* to pipecmd_*, and COMMAND_* to PIPECMD_*. Update all
callers.
Fri Oct 29 03:24:10 BST 2010 Colin Watson <cjwatson@debian.org>
* man/po4a/po/nl.po: Use I<> rather than U<>.
Tue Oct 26 12:43:45 BST 2010 Erwin Poeze <erwin.poeze@gmail.com>
* man/po4a/po/nl.po: Update from Translation Project.
Tue Oct 26 12:40:12 BST 2010 Martin Schauer <Martin.E.Schauer@gmx.de>
* po/de.po: Update from Translation Project.
* man/THANKS: Update.
Mon Oct 25 17:59:01 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_install_post_fork): New function.
(pipeline_start): Call post-fork handler rather than hardcoding
pop_all_cleanups.
* lib/pipeline.h (pipeline_install_post_fork): Add prototype.
* src/lexgrog_test.c (main), src/man.c (main), src/manconv_main.c
(main), src/mandb.c (main), src/whatis.c (main),
src/zsoelim_main.c (main): Install pop_all_cleanups as a post-fork
handler.
Mon Oct 25 16:18:08 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_unsetenv): New function.
(command_dup, command_dump, command_tostring): Check for NULL
cmd->env[i].value.
(command_start_child): If cmd->env[i].value is NULL, call unsetenv
rather than setenv.
* lib/pipeline.h (command_unsetenv): Add prototype.
Sun Oct 24 23:37:08 BST 2010 Colin Watson <cjwatson@debian.org>
Allow building with an external libpipeline.
* configure.ac: Add --with-external-pipeline option.
* lib/Makefile.am (libman_la_CPPFLAGS): Add $(libpipeline_CFLAGS).
(libman_la_SOURCES): Include pipeline.c and pipeline.h only
conditionally.
(libman_la_LDFLAGS): Add $(libpipeline_LIBS).
* src/Makefile.am (AM_CPPFLAGS): Add $(libpipeline_CFLAGS).
* NEWS: Document this.
Sun Oct 24 21:15:07 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_start_child): Add trailing newline to
"nice failed" debug message.
Sun Oct 24 21:10:20 BST 2010 Colin Watson <cjwatson@debian.org>
Make command and pipeline opaque types.
* lib/pipeline.c (command_nice, command_discard_err,
pipeline_get_ncommands, pipeline_get_command,
pipeline_set_command, pipeline_want_in, pipeline_want_out,
pipeline_want_infile, pipeline_want_outfile,
pipeline_ignore_signals): New functions.
* lib/pipeline.h (command_nice, command_discard_err,
pipeline_get_ncommands, pipeline_get_command,
pipeline_set_command, pipeline_want_in, pipeline_want_out,
pipeline_want_infile, pipeline_want_outfile,
pipeline_ignore_signals): Add prototypes.
* lib/pipeline.h (enum command_tag, struct command_env, struct
command, struct pipeline): Move to ...
* lib/pipeline.c (enum command_tag, struct command_env, struct
command, struct pipeline): ... here.
Redirections are now handled slightly differently internally,
allowing redirection from/to fd 0.
* lib/pipeline.c (pipeline_new, pipeline_join): Set redirect_in and
redirect_out.
(pipeline_connect): Use pipeline_want_in and pipeline_want_out.
Check source->redirect_out.
(pipeline_start): Handle new redirection semantics.
* lib/decompress.c (decompress_open, decompress_fdopen): Use new
accessor functions rather than accessing pipeline fields directly.
* src/man.c (make_display_command, discard_stderr, open_cat_stream,
format_display, display_catman, display): Likewise.
Sun Oct 24 21:04:45 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_run): This would be a more convenient
wrapper for the common case if it freed the pipeline as well, so
do that. (Callers that don't want this should call pipeline_start
and pipeline_wait separately.)
* lib/pipeline.h (pipeline_run): Update comment.
* lib/security.c (do_system_drop_privs): Consistently free the
supplied pipeline, and document doing so.
* src/man.c (format_display): Remove pipeline_free after
do_system_drop_privs.
* src/whatis.c (use_grep): Remove pipeline_free after pipeline_run.
Sun Oct 24 21:03:25 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_new_command_args): New function.
* lib/pipeline.h (pipeline_new_command_args): Add prototype.
* src/man.c (make_browser): Use it.
Sun Oct 24 20:59:27 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_run): New function.
* lib/pipeline.h (pipeline_run): Add prototype.
* lib/security.c (do_system_drop_privs): Use it.
* src/man.c (do_extern, run_mandb): Likewise.
* src/whatis.c (use_grep): Likewise.
Sun Oct 24 20:56:00 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.h (pipeline_pump): Mention in comment that arguments
must be NULL-terminated.
Sun Oct 24 20:55:10 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.h (pipeline_new_commandv): Fix comment.
Sat Oct 23 20:52:24 BST 2010 Colin Watson <cjwatson@debian.org>
* configure.ac (AC_TYPE_SIGNAL): Remove (unused).
Tue Oct 12 11:16:31 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/util.c (init_locale): New function.
* include/manconfig.h.in (init_locale): Add prototype.
* src/Makefile.am (AM_CPPFLAGS): Move -DLOCALEDIR to ...
* lib/Makefile.am (libman_la_CPPFLAGS): ... here.
* src/accessdb.c (main), src/catman.c (main), src/globbing_test.c
(main), src/lexgrog_test.c (main), src/man.c (main),
src/manconv_main.c (main), src/mandb.c (main), src/manpath.c
(main), src/whatis.c (main), src/zsoelim.c (main): Use
init_locale.
* lib/util.c (init_locale): Suppress warning message if
DPKG_RUNNING_VERSION is set in the environment.
* NEWS: Document this.
Mon Oct 11 09:38:03 BST 2010 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): Update for restored bzr+ssh
access.
Mon Oct 11 09:36:55 BST 2010 Colin Watson <cjwatson@debian.org>
* .bzrignore: Remove tools/config.rpath.*, which hasn't been needed
here since 2009-04-14.
Tue Oct 5 11:48:57 BST 2010 Colin Watson <cjwatson@debian.org>
* man/po4a/Makefile.am (clean-local): Don't use 'po4a
--rm-translations', since it sometimes updates PO/POT files and
the obvious workaround for that breaks 'make distcheck'.
Reimplement it by hand instead.
Tue Oct 5 10:59:02 BST 2010 Colin Watson <cjwatson@debian.org>
* man/check-man: Use libtool to run man from the build tree.
Tue Oct 5 10:36:35 BST 2010 Colin Watson <cjwatson@debian.org>
It turns out that AM_GNU_GETTEXT([use-libtool]) is unsupported.
Switch to external libintl instead.
* configure.ac (AM_GNU_GETTEXT): Set external.
(AC_CONFIG_FILES): Remove intl/Makefile.
* Makefile.am (SUBDIRS): Remove intl.
(EXTRA_DIST): Add gnulib/m4/glibc2.m4, gnulib/m4/intdiv0.m4,
gnulib/m4/intl.m4, gnulib/m4/intmax.m4, gnulib/m4/inttypes-pri.m4,
gnulib/m4/lcmessage.m4, gnulib/m4/printf-posix.m4,
gnulib/m4/uintmax_t.m4, and gnulib/m4/visibility.m4.
* intl: Remove.
* lib/Makefile.am (libman_la_CPPFLAGS): Remove
-I$(top_builddir)/intl.
* libdb/Makefile.am (libmandb_la_CPPFLAGS): Likewise.
* src/Makefile.am (AM_CPPFLAGS): Likewise.
* .bzrignore: Remove intl/Makefile, intl/charset.alias,
intl/libgnuintl.h, intl/libintl.h, intl/ref-add.sed, and
intl/ref-del.sed.
* NEWS: Document this.
Tue Oct 5 01:05:24 BST 2010 Colin Watson <cjwatson@debian.org>
* configure.ac (AM_GNU_GETTEXT): Set use-libtool.
Tue Oct 5 00:11:23 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/Makefile.am (libman_la_LIBADD): Include @LTLIBINTL@ rather
than @LIBINTL@.
* src/Makefile.am (whatis_LDADD): Include $(LTLIBICONV) rather than
$(LIBICONV).
Mon Oct 4 23:56:36 BST 2010 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Add lib/security.c. Remove src/fake_security.c
and src/security.c.
* po/man-db.pot, po/*.po: Update.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Sun Oct 3 23:57:45 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_argf): New function.
* lib/pipeline.h (command_argf): Add prototype.
* src/man.c (add_roff_line_length): Use it, reducing need for
temporary local variables.
(make_roff_command): Likewise.
Sun Oct 3 23:30:06 BST 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (setenv_less): Take a command argument. Set environment
variables only for that command, not globally.
(make_display_command): Call setenv_less on the command
constructed from pager.
Sun Oct 3 22:34:13 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (reap_children, pipeline_sigchld,
pipeline_install_sigchld): Move above pipeline_start.
(pipeline_install_sigchld): Make static. Return immediately if
already installed.
(pipeline_start): Call pipeline_install_sigchld.
* lib/pipeline.h (pipeline_start): Document that this installs a
SIGCHLD handler.
(pipeline_install_sigchld): Remove prototype.
* src/lexgrog_test.c (main), src/man.c (main), src/manconv_main.c
(main), src/mandb.c (main), src/whatis.c (main),
src/zsoelim_main.c (main): Stop calling pipeline_install_sigchld.
Thu Sep 30 16:01:22 BST 2010 Colin Watson <cjwatson@debian.org>
Convert the French manual pages translation to po4a.
* man/LINGUAS: Remove fr.
* man/LINGUAS.po4a: Add fr.
* man/fr/man1, man/fr/man5, man/fr/man8: Remove.
* man/fr/Makefile.am (PO4A_LINGUA): Set to yes.
(EXTRA_DIST): Add translator.add.
(man1_MANS): Add man1/manconv.1.
* man/po4a/Makefile.am (POFILES): Add po/fr.po.
* man/po4a/po4a.cfg (po4a_langs): Add fr.
* man/THANKS: Add David Prévot.
* .bzrignore: Add man/fr/man1, man/fr/man5, and man/fr/man8.
Thu Sep 30 15:44:46 BST 2010 David Prévot <david@tilapin.org>
* po/fr.po: Update from Translation Project.
* man/po4a/po/fr.po: New from Translation Project.
* man/fr/translator.add: New file.
Mon Sep 27 19:06:10 BST 2010 Colin Watson <cjwatson@debian.org>
Move util to libman.
* src/util.c: Move to ...
* lib/util.c: ... here.
* lib/Makefile.am (libman_la_SOURCES): Add util.c.
* src/Makefile.am (accessdb_SOURCES, catman_SOURCES,
globbing_SOURCES, lexgrog_SOURCES, man_SOURCES, mandb_SOURCES,
manpath_SOURCES, whatis_SOURCES, zsoelim_SOURCES): Remove util.c.
* lib/README: Add util.c.
Mon Sep 27 00:50:37 BST 2010 Colin Watson <cjwatson@debian.org>
* gnulib/m4/gnulib-cache.m4: Remove obsolete modules atexit, memcmp,
and strcspn.
Mon Sep 27 00:24:50 BST 2010 Colin Watson <cjwatson@debian.org>
Move security to libman.
* src/security.c: Move to ...
* lib/security.c: ... here.
* src/security.h: Move to ...
* lib/security.h: ... here.
* lib/Makefile.am (libman_la_SOURCES): Add security.c and
security.h.
* src/Makefile.am (lexgrog_SOURCES): Remove fake_security.c and
security.h.
(man_SOURCES, mandb_SOURCES): Remove security.c and security.h.
* lib/README: Add security.*.
* src/lexgrog_test.c: Call init_security, so that we can use generic
security functions rather than fake_security.
* src/fake_security.c: Remove.
* lib/security.c (do_system_drop_privs): Unroll calls to do_system
into calls to pipeline_start and pipeline_wait.
* src/whatis.c (use_grep): Likewise.
* src/util.c (do_system): Remove.
* include/manconfig.h.in (do_system): Remove.
* src/*.c: Update #include grouping for movements to libman.
Sun Sep 26 23:53:08 BST 2010 Colin Watson <cjwatson@debian.org>
Get the tests working again following the switch to libtool.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Remove CLEANPATH.
* src/tests/man-1, src/tests/mandb-1, src/tests/mandb-2: Set MANPATH
rather than using run_clean_path; running with a stripped-down
PATH is risky in general and breaks libtool in particular.
* src/tests/testlib.sh (run_clean_path): Remove.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Add top_builddir.
* src/tests/testlib.sh (run): New function.
* src/tests/lexgrog-1, src/tests/man-1, src/tests/manconv-1,
src/tests/manconv-2, src/tests/manconv-3, src/tests/mandb-1,
src/tests/mandb-2, src/tests/testlib.sh (accessdb_filter): Use run
when running programs from the build tree.
Sun Sep 26 23:25:31 BST 2010 Colin Watson <cjwatson@debian.org>
Move encodings to libman.
* src/encodings.c: Move to ...
* lib/encodings.c: ... here.
* src/encodings.h: Move to ...
* lib/encodings.h: ... here.
* lib/Makefile.am (libman_la_SOURCES): Add encodings.c and
encodings.h.
* src/Makefile.am (lexgrog_SOURCES, man_SOURCES, manconv_SOURCES,
mandb_SOURCES, manpath_SOURCES): Remove encodings.c and
encodings.h.
* lib/README: Add encodings.*.
Sun Sep 26 23:15:00 BST 2010 Colin Watson <cjwatson@debian.org>
* src/encodings.c (struct manconv_codes, manconv_stdin,
free_manconv_codes, add_manconv): Move to ...
* src/manconv_client.c: ... here (new file).
* src/encodings.h (add_manconv): Move to ...
* src/manconv_client.h: ... here (new file).
* src/lexgrog.l, src/man.c, src/straycats.c: Include
manconv_client.h.
* src/Makefile.am (lexgrog_SOURCES, man_SOURCES, mandb_SOURCES): Add
manconv_client.c and manconv_client.h.
* src/manp.c: Remove unnecessary inclusion of encodings.h.
Sun Sep 26 22:59:54 BST 2010 Colin Watson <cjwatson@debian.org>
* src/compression.c: Remove unnecessary inclusion of security.h.
* src/ult_src.c: Likewise.
Sun Sep 26 22:47:02 BST 2010 Colin Watson <cjwatson@debian.org>
* src/manp.c (mkcatdirs): Move to ...
* src/check_mandirs.c (mkcatdirs): ... here, as it's only used by
testmandirs. Removes dependency of manp.c on security.h.
* src/manp.h (mkcatdirs): Remove prototype.
* src/Makefile.am (catman_SOURCES, manpath_SOURCES, whatis_SOURCES):
Remove fake_security.c.
Sun Sep 26 22:34:17 BST 2010 Colin Watson <cjwatson@debian.org>
* src/security.c (remove_with_dropped_privs): Remove; no longer
used.
* src/fake_security.c (remove_with_dropped_privs): Likewise.
* src/security.h (remove_with_dropped_privs): Likewise.
Sun Sep 26 22:23:26 BST 2010 Colin Watson <cjwatson@debian.org>
* lib/Makefile.am (libman_la_LIBADD): Use $(LTLIBOBJS) rather than
$(LIBOBJS).
Sun Sep 26 22:08:39 BST 2010 Colin Watson <cjwatson@debian.org>
Build libman and libmandb as shared libraries, reducing our
installed footprint by about 200K.
* configure.ac: Add LT_INIT. Move AC_GNU_SOURCE up to above it.
Remove redundant AC_PROG_RANLIB.
* gnulib/m4/gnulib-cache.m4: Enable libtool support.
* gnulib/m4/libtool.m4, gnulib/m4/ltoptions.m4,
gnulib/m4/ltsugar.m4, gnulib/m4/ltversion.m4,
gnulib/m4/lt~obsolete.m4, tools/ltmain.sh: New files, created by
libtoolize.
* autogen.sh: Export LIBTOOLIZE_OPTIONS=--quiet.
* lib/Makefile.am: Switch to libtool. Add ../gnulib/lib/libgnu.la,
$(LIBCOMPRESS), and @LIBINTL@ to LIBADD. Install the library in
$(pkglibdir), and instruct libtool to set an RPATH on binaries
built against this library.
* libdb/Makefile.am: Switch to libtool. Add ../lib/libman.la to
LIBADD. Install the library in $(pkglibdir), and instruct libtool
to set an RPATH on binaries built against this library.
* src/Makefile.am (LIBMAN): Reduce to libman.
(LIBMANDB): Reduce to libmandb.
(accessdb_LDADD, catman_LDADD, globbing_LDADD, lexgrog_LDADD,
man_LDADD, manconv_LDADD, mandb_LDADD, manpath_LDADD,
whatis_LDADD, zsoelim_LDADD): Remove dependencies of libman and
libmandb.
* .bzrignore: Add **/*.la, **/*.lo, **/.libs, and ./libtool.
* NEWS: Document this.
Avoid symbol clashes between libgnu and libman.
* lib/hashtable.c (null_hash_free, plain_hash_free, hash_create,
hash_lookup_structure, hash_lookup, hash_install, hash_remove,
hash_free): Rename to ...
(null_hashtable_free, plain_hashtable_free, hashtable_create,
hashtable_lookup_structure, hashtable_lookup, hashtable_install,
hashtable_remove, hashtable_free): ... these. Update all callers
and prototypes.
* lib/hashtable.h (hash_free_ptr): Rename to ...
(hashtable_free_ptr): ... this. Update all users.
Thu Sep 16 13:53:11 BST 2010 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
Tue Aug 17 15:31:38 BST 2010 Colin Watson <cjwatson@debian.org>
* man/po4a/Makefile.am (clean-local): Make sure not to change PO or
POT files when removing generated translations.
Tue Aug 17 15:26:12 BST 2010 Colin Watson <cjwatson@debian.org>
Upgrade to Autoconf 2.67.
Tue Aug 17 14:29:53 BST 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (display_catman): Add iconv to format_cmd before adding
a compressor.
* NEWS: Document this.
Tue Aug 17 14:22:06 BST 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (add_output_iconv): Make static.
Tue Jul 20 08:18:41 BST 2010 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20100704.
* configure.ac (AM_GNU_GETTEXT_VERSION): Upgrade to gettext 0.18.1.
Wed May 19 12:38:31 BST 2010 Colin Watson <cjwatson@debian.org>
* src/descriptions.c (parse_descriptions): Free record.
* src/encodings.c (check_preprocessor_encoding): Free directive.
(manconv_stdin): Free p.
* src/lexgrog_test.c (main): Free lg.filters and lg.whatis.
Thu May 13 11:45:02 CEST 2010 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Mon May 10 09:42:41 CEST 2010 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project.
Sun May 9 07:37:14 BST 2010 Colin Watson <cjwatson@debian.org>
* Version: 2.5.8-pre1.
* release.sh: Remove man/po4a/po/man-db-manpages.pot before running
'make distcheck', to force it to be regenerated with the current
version number.
* man/po4a/Makefile.am: Make po/man-db-manpages.pot depend on
update-po, rather than using dist-hook which is too late.
* po/man-db.pot, po/*.po: Update.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Sat May 8 15:39:49 BST 2010 Colin Watson <cjwatson@debian.org>
* src/filenames.c (filename_info): Explicitly fail if the extension
is zero-length.
Sat May 8 15:35:17 BST 2010 Colin Watson <cjwatson@debian.org>
* src/filenames.c (filename_info): Allow section and extension to
differ as long as the first character is the same. (This is my
understanding of what the code was originally meant to do, but it
only worked if the section was exactly one character long.)
Tue Apr 27 11:02:48 BST 2010 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20100424.
Fri Apr 2 20:44:11 BST 2010 Ville Skyttä <ville.skytta@iki.fi>
* configure.ac: Only test for lzma if xz is missing. Add xz to list
of compressors checked when deciding whether to define COMP_CAT or
COMP_SRC.
* include/comp_src.h.in (comp_list): If xz is available, use it for
.lzma files in preference.
Fri Apr 2 20:26:41 BST 2010 Ville Skyttä <ville.skytta@iki.fi>
* include/comp_src.h.in (comp_list): If compress is not available,
use gzip to handle .Z files.
Mon Mar 29 09:36:00 BST 2010 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Wed Mar 24 11:04:46 GMT 2010 Colin Watson <cjwatson@debian.org>
Fix build regression when GNU_NROFF is undefined (Savannah bug
#29318).
* src/man.c (add_col): New function, split out from
make_display_command.
(make_roff_command): Reinstate tbl/col logic here, as by the time
we get to make_display_command we've forgotten whether tbl was
used.
(make_display_command): Remove tbl/col logic, useless here. Use
add_col.
Sun Mar 21 21:59:54 GMT 2010 Tanguy Ortolo <tanguy+debian@ortolo.eu>
* src/man.c (main): Try underscore-separated subpages as well as
hyphen-separated ones (Debian bug #574641).
* man/man1/man.man1 (Finding manual pages): Document this.
* NEWS: Document this.
Wed Mar 17 10:26:44 GMT 2010 Colin Watson <cjwatson@debian.org>
* gnulib: Import localcharset module.
* src/encodings.c (struct charset_entry): Rename locale_charset to
charset_from_locale. Update all users.
(struct less_charset_entry): Likewise.
(get_locale_charset): Use locale_charset function from Gnulib,
rather than dealing with nl_langinfo and the fallback ourselves.
(get_default_device): Rename locale_charset parameter to
charset_from_locale.
(get_less_charset): Likewise.
(get_jless_charset): Likewise.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Add
@LOCALCHARSET_TESTS_ENVIRONMENT@.
Sat Mar 13 22:15:54 GMT 2010 Colin Watson <cjwatson@debian.org>
* man/check-man: Ignore "table wider than line width" warnings for
Dutch too.
Sat Mar 13 21:33:48 GMT 2010 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20100308.
Thu Mar 11 01:26:56 GMT 2010 Colin Watson <cjwatson@debian.org>
* configure.ac: Add AM_MAINTAINER_MODE. In the modern world,
timestamps are often just too fragile for those make targets to
work well; use ./autogen.sh instead.
Tue Mar 2 19:11:44 GMT 2010 Darren Salt <linux@youmustbejoking.demon.co.uk>
Add support for XZ-compressed manual pages (Debian bug #572233).
* configure.ac: Check for xz.
* include/comp_src.h.in (comp_list): Add xz.
* include/manconfig.h.in: Define UNXZ.
* NEWS: Document this.
Tue Mar 2 10:04:54 GMT 2010 Colin Watson <cjwatson@debian.org>
Fix assertion failure on 'man -l' with an uncompressed page and
prefixed input (no-hyphenation, no-justification, or a non-English
page).
* lib/pipeline.c (command_new_passthrough): New function.
* lib/pipeline.h (command_new_passthrough): Add prototype.
* src/man.c (display): Allow zero-command decompression pipelines
with prefix sequences. In that case, append a passthrough command
to the prefix sequence, and append the prefix sequence to the
decompression pipeline rather than replacing its first command.
* NEWS: Document this.
Tue Mar 2 09:31:36 GMT 2010 Colin Watson <cjwatson@debian.org>
* man/po4a/po/nl.po: New from Translation Project (thanks, Erwin
Poeze).
* configure.ac (AC_CONFIG_FILES): Add man/nl/Makefile.
* man/LINGUAS.po4a: Add nl.
* man/Makefile.am (DIST_SUBDIRS): Add nl.
* man/nl/Makefile.am, man/nl/translator.add: New files.
* man/po4a/Makefile.am (POFILES): Add po/nl.po.
* man/po4a/po4a.cfg (po4a_langs): Add nl.
* man/THANKS: Credit Erwin Poeze with man/nl as well as nl.po.
* .bzrignore: Add man/nl/man1, man/nl/man5, and man/nl/man8.
Thu Feb 18 01:38:04 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (locale_macros): Explicitly set groff's hyphenation
language, to ensure that it only hyphenates languages it knows
about (Debian bug #570247).
Tue Feb 16 23:11:58 GMT 2010 Colin Watson <cjwatson@debian.org>
* Version: 2.5.7.
* po/man-db.pot, po/*.po: Update.
Tue Feb 16 23:09:11 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/manp.c (get_catpath): Fix handling of non-translated cat
paths.
Sun Feb 14 00:19:47 GMT 2010 Colin Watson <cjwatson@debian.org>
Always save cat pages in UTF-8 (Debian bug #446741).
* src/encodings.c (struct directory_entry): Remove
standard_output_encoding member.
(directory_table): Likewise.
(get_standard_output_encoding): Remove.
* src/encodings.h (get_standard_output_encoding): Remove prototype.
* src/man.c (my_locale_charset): New function, with code moved from
make_roff_command.
(make_roff_command): Return pipeline output encoding in a new
output parameter. Remove enforcement that cat pages could only be
saved for the manual hierarchy's default character set. Move
post-cat-page pipeline elements to ...
(add_output_iconv, make_display_command): ... here.
(make_display_command): Remove code for handling a named input
file, which has been unused for some time. New encoding argument.
(open_cat_stream): New encoding argument. Convert from it to
UTF-8 while saving the cat page.
(format_display_and_save): New encoding argument, passed to
open_cat_stream.
(display_catman): New encoding argument. Convert from it to UTF-8
while saving the cat page.
(display): Get formatted encoding from make_roff_command and pass
it to display_catman, make_display_command, and
format_display_and_save. Assume UTF-8 when displaying an existing
cat page.
* NEWS: Document this.
Sat Feb 13 14:25:42 GMT 2010 Vincent Lefèvre <vincent@vinc17.net>
* lib/decompress.c (decompress_open): Fix sense of directory check
(Debian bug #537434).
Mon Feb 8 07:01:35 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/manp.c (get_catpath): Handle man -> cat substitution correctly
for translated cat pages.
Mon Feb 8 04:57:09 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display_and_save): Use sigaction, not signal.
Mon Feb 8 04:29:42 GMT 2010 Colin Watson <cjwatson@debian.org>
* gnulib: Import getopt-gnu module rather than the obsolete getopt.
Mon Feb 1 12:18:36 PST 2010 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Don't bother printing error
messages for SIGINT and SIGQUIT, since these correspond to
explicit user actions (Debian bug #568000).
Sun Jan 31 03:44:59 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Don't lose iconv errors from converting
to UTF-8 when the target encoding is not UTF-8.
Sun Jan 31 03:33:33 GMT 2010 Colin Watson <cjwatson@debian.org>
Upgrade to Automake 1.11.1 and Gnulib 20100109.
Thu Jan 14 11:51:59 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/whatis.c (search): "%s: nothing appropriate." is an error;
write it to stderr, not stdout (Debian bug #565255).
Wed Jan 13 23:42:00 GMT 2010 Werner Fink <werner@suse.de>
Add support for using socketpair(2) as a replacement for pipe(2),
which is faster on some systems (Savannah patch #6741).
* configure.ac: Add --enable-socketpair-pipe option.
* m4/man-socketpair.m4: New file.
* lib/pipeline.c [USE_SOCKETPAIR_PIPE]: Redefine pipe() to a
construction based on socketpair().
* NEWS: Document this.
Wed Jan 13 22:04:23 GMT 2010 Colin Watson <cjwatson@debian.org>
Upgrade to Autoconf 2.65 and Gnulib 20091120.
Wed Jan 13 18:26:47 GMT 2010 Diego Pettenò <flameeyes@gentoo.org>
Add support for heirloom-doctools (Savannah patch #6933).
* configure.ac: Substitute TROFF.
* manual/Makefile.am (.pp.dvi, .pp.ps, .pp.tdvi, .pp.html): Use
$(TROFF) rather than groff or troff.
* src/man.c (options, parse_opt): Just ignore the --warnings option
when troff is not groff, rather than compiling it out entirely.
(make_roff_command): Only use gxditview variable when troff is
groff.
* NEWS: Document this.
Tue Jan 12 13:33:51 GMT 2010 Samuel Thibault <sthibault@debian.org>
* lib/pipeline.c (pipeline_pump): Fix off-by-one error when write
returns EAGAIN (Debian bug #564818).
Fri Jan 1 17:03:18 GMT 2010 Colin Watson <cjwatson@debian.org>
* README (Copyright and licensing): Update copyright years.
Fri Jan 1 13:26:21 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Only handle iconv errors when iconv
returned -1.
Fri Jan 1 11:37:13 GMT 2010 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Handle iconv errors when attempting to
convert the last input encoding to UTF-8 (Debian bug #562503).
* src/tests/manconv-3: Add test for this.
* src/tests/Makefile.am (TESTS): Add manconv-3.
Tue Dec 15 14:10:19 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Fix possible crash when MAN_MUST_CREATE is
unset.
* NEWS: Document this.
Tue Dec 15 13:47:50 GMT 2009 Colin Watson <cjwatson@debian.org>
* lib/debug.c (init_debug): New function: check for MAN_DEBUG=1 in
the environment.
* include/manconfig.h.in (init_debug): Add prototype.
* src/accessdb.c (main), src/catman.c (main), src/globbing_test.c
(main), src/lexgrog_test.c (main), src/man.c (main),
src/manconv_main.c (main), src/mandb.c (main), src/manpath.c
(main), src/whatis.c (main), src/zsoelim_main.c (main): Call
init_debug.
* NEWS: Document this.
Sat Dec 12 00:36:14 GMT 2009 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
Tue Dec 1 17:01:19 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (do_extern): Pass section through to external program
(Savannah bug #28145). Fix passing of alternate system name to use
-m rather than -s.
Tue Nov 24 18:27:59 GMT 2009 Robert Luberda <robert@debian.org>
* po/pl.po: Update from Translation Project.
Wed Nov 18 14:58:52 GMT 2009 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project.
Wed Nov 18 14:55:31 GMT 2009 Yuri Kozlov <yuray@komyakino.ru>
* po/ru.po: Update from Translation Project.
Wed Nov 18 14:52:43 GMT 2009 Erwin Poeze <erwin.poeze@gmail.com>
* po/nl.po: Update from Translation Project.
Sun Nov 15 22:49:35 GMT 2009 Colin Watson <cjwatson@debian.org>
* README (Non-generic arguments to configure): Use more readable
formatting.
* manual/options-only.me, manual/print-options: New file.
* manual/intro.me (Arguments to configure): Add hooks for
options-only.me.
* manual/Makefile.am (dist_noinst_DATA): Add options-only.me and
print-options.
Sun Nov 15 16:15:56 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): Savannah has disabled bzr+ssh for
the time being; update push URL.
Sun Nov 15 16:05:26 GMT 2009 Colin Watson <cjwatson@debian.org>
* Version: 2.5.7-pre1.
* po/man-db.pot, po/*.po: Update.
Sun Nov 15 14:30:27 GMT 2009 Colin Watson <cjwatson@debian.org>
* NEWS: Document previous change.
Sun Nov 15 14:18:35 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Prefer getting a page from the
best manual section over getting a page in the correct language; I
have my reservations about this, but it seems to be what people
are requesting (Debian bug #519547).
Sun Nov 15 14:02:11 GMT 2009 Colin Watson <cjwatson@debian.org>
Search man<sec><ext> directories in the GNU layout (Debian bug
#519807, Arch Linux bug #13734).
* src/globbing.c (match_in_directory): Optionally take allocated
count from caller. If it's non-zero, don't clear the glob.
(look_for_file): In the GNU layout, search all subdirectories of
hier that begin with the first character of the section.
* NEWS: Document this.
Sun Nov 15 13:32:58 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/globbing.c (match_in_directory): Make this void; checking
whether any glob matches were returned is sufficient. Move
glob-clearing code to ...
(clear_glob): ... here (new function).
(look_for_file): Simplify since we now only need to check
gbuf.gl_pathc == 0, not the return value of match_in_directory as
well. Clear gbuf on entry.
Sun Nov 15 13:18:38 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/tests/lexgrog-1, src/tests/man-1, src/tests/manconv-1,
src/tests/manconv-2, src/tests/mandb-1, src/tests/mandb-2: Use
'diff -u', which produces more helpful output on failures.
Sat Nov 14 20:10:57 GMT 2009 Colin Watson <cjwatson@debian.org>
* README (System specific notes): Remove entirely. The notes about
Linux here only pertain to thoroughly obsolete systems.
Sat Nov 14 20:08:40 GMT 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Handle Ultrix-4.3a -YPOSIX requirement
automatically.
* README (System specific notes): Remove note about Ultrix-4.3a.
Sat Nov 14 19:14:02 GMT 2009 Colin Watson <cjwatson@debian.org>
* lib/README: Copyright is not the same as licensing; fix confusion.
Sat Nov 14 18:57:42 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (options): Add --nh and --nj aliases for
--no-hyphenation and --no-justification respectively.
* man/man1/man.man1 (Controlling formatted output): Document new
aliases.
Sat Nov 14 18:52:15 GMT 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (argstr_get_word): Fix a small memory leak.
Sat Nov 14 18:51:37 GMT 2009 Colin Watson <cjwatson@debian.org>
Do what the user probably means when the full path to an executable
is given as an argument (Debian bug #505465).
* lib/pathsearch.c (directory_on_path): New function.
* lib/pathsearch.h (directory_on_path): Add prototype.
* src/manp.c (get_manpath_from_path): Make external. Add 'mandatory'
argument to control the addition of MANDATORY_MANPATH entries.
(guess_manpath): Update caller.
* src/manp.h (get_manpath_from_path): Add prototype.
* src/man.c (main): Move locale manpath expansion to ...
(locale_manpath): ... here (new function).
(local_man_loop): If the argument is an executable, try looking up
the corresponding manual page in the appropriate part of the
manpath, rather than just trying to format the text of the
executable as a manual page.
* NEWS: Document this.
Sat Nov 14 10:28:29 GMT 2009 Colin Watson <cjwatson@debian.org>
Add option to disable justification (Debian bug #440047).
* src/man.c (options, parse_opt): Accept --no-justification. Reset
corresponding variable with -D.
(disable_justification): New function.
(display): Append disable_justification to the decompressor
pipeline if --no-justification is used.
* man/man1/man.man1 (SYNOPSIS, Controlling formatted output):
Document --no-justification.
* NEWS: Document this.
Sat Nov 14 10:23:28 GMT 2009 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (ATTRIBUTE_NORETURN): Define to an
attribute marking a function as non-returning if using GCC 2.5 or
newer.
* lib/pipeline.c (command_new_sequence, command_sequence_command):
New functions.
(command_dup, command_dump, command_tostring, command_free):
Handle commands of type COMMAND_SEQUENCE.
(pipeline_start): Move command execution to ...
(command_start_child): ... here (new function). Handle commands of
type COMMAND_SEQUENCE.
* lib/pipeline.h (enum command_tag): Add COMMAND_SEQUENCE.
(struct command): Add support for commands that consist of a
sequence of commands.
(command_new_sequence, command_sequence_command): Add prototypes.
* src/man.c (disable_hyphenation, locale_macros): Drop passthrough
code.
(display): Create a command sequence for hyphenation and
locale-macro decompressor prefixes if necessary.
Mon Nov 9 16:59:47 GMT 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Define a CROSS_COMPILING conditional if
cross-compiling.
* man/Rules.man, src/tests/Makefile.am: Don't run tests if
cross-compiling.
* NEWS: Document this.
Mon Nov 9 16:53:10 GMT 2009 Colin Watson <cjwatson@debian.org>
Upgrade to Gnulib 20090915.
Mon Nov 9 16:27:44 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c (find_charset_locale): New function.
* src/encodings.h (find_charset_locale): Add prototype.
* src/man.c (make_roff_command): When invoking col, ensure that
LC_CTYPE is set to an appropriate locale for the selected
character set (Debian bug #555331).
* NEWS: Document this.
Thu Oct 8 23:22:57 BST 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c: Include <unistd.h> for dup and STDIN_FILENO.
Thu Oct 1 01:08:40 BST 2009 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (parse_opt), src/lexgrog_test.c (parse_opt),
src/whatis.c (parse_opt): Turn off ARGP_HELP_PRE_DOC to avoid
problems with translations of documentation strings beginning with
a vertical tab separator (i.e. no pre-option documentation).
Thu Sep 24 12:32:48 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_pump): When a source pipeline dies, make
sure to drain its output before discarding its output file
descriptor (Debian bug #548153). We still record the death to
avoid duplicate debugging messages.
* NEWS: Document this.
Tue Sep 22 00:53:42 BST 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_default_device): If the locale encoding is
ASCII, then use the ascii device even if preconv is available; it
will do a better job than producing UTF-8 output and then recoding
that to ASCII (Debian bug #547695).
Sat Sep 19 15:02:20 BST 2009 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Fri Sep 11 01:19:41 BST 2009 Colin Watson <cjwatson@debian.org>
* man/po4a/po/id.po: Fix syntax error.
Wed Sep 9 14:42:18 BST 2009 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (General options): Refer to the "Warnings" node
in 'info groff' for a list of available warning names (Debian bug
#545805).
Wed Sep 9 14:36:39 BST 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* man/po4a/po/id.po: Update from Translation Project.
Tue Sep 8 19:14:23 BST 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* po/id.po: Update from Translation Project.
Wed Aug 26 01:12:20 BST 2009 Colin Watson <cjwatson@debian.org>
* Version: 2.5.6.
* po/man-db.pot, po/*.po: Update.
Wed Aug 26 01:07:16 BST 2009 Colin Watson <cjwatson@debian.org>
* src/whatis.c (display): Include the section in the hash key used
to determine whether a page has already been displayed.
Wed Aug 26 00:20:45 BST 2009 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (compare_ids): Fix documentation of return
values.
(replace_if_necessary): Don't replace ULT_MAN or SO_MAN with
lesser ids just because the mtime is newer. (This still satisfies
Debian bug #490582, but doesn't cause the database to be rebuilt
every time mandb runs on hierarchies with both symlinks and whatis
entries for the same name.)
Tue Aug 25 17:07:05 BST 2009 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (zh_CN_name, zh_TW_name): Add alternative
translation "名字", seen in testprns(1).
Tue Aug 25 17:05:51 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/man-1: Restrict manpath to test directories.
Tue Aug 25 10:30:58 BST 2009 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Add .bzrignore,
gnulib/lib/xmalloc.c.orig, gnulib/m4/intldir.m4,
gnulib/m4/sockpfaf.m4, and release.sh, for consistency between
revision control and the distribution.
Tue Aug 25 09:48:39 BST 2009 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Remove src/wrapper.c.
Sun Aug 23 15:49:45 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_dup): Fix newcmd->nenv assertion.
Sun Aug 23 15:41:32 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_dup, command_setenv): cmd->env does not
need to be { NULL, NULL }-terminated.
Sun Aug 23 11:25:50 BST 2009 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Distribute gnulib/m4/gnulib-tool.m4.
Sun Aug 23 11:21:40 BST 2009 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Distribute gnulib/lib/xmalloc.patch.
Sun Aug 23 11:15:53 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/man-db.lsm (Keywords): Add accessdb and lexgrog.
Sun Aug 23 11:14:04 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/INSTALL.autoconf: Update to instructions from Autoconf 2.64.
Sun Aug 23 11:11:02 BST 2009 Colin Watson <cjwatson@debian.org>
* m4/man-bdb.m4: Bump serial, forgotten in most recent change.
Sun Aug 23 11:07:26 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/README: Update.
Sun Aug 23 10:56:50 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/TODO: Remove entry about the other 'man' package; 'man -K'
was the last major missing feature relative to it.
* docs/HACKING (Testing): Document new test suite.
Sun Aug 23 10:51:33 BST 2009 Colin Watson <cjwatson@debian.org>
* tools/README: Don't bother describing files installed here by the
autotools.
Sun Aug 23 10:47:16 BST 2009 Colin Watson <cjwatson@debian.org>
* src/README.zsoelim: Remove, merging text into ...
* src/zsoelim.l: ... here.
* src/Makefile.am (EXTRA_DIST): Remove README.zsoelim.
Sun Aug 23 10:36:28 BST 2009 Colin Watson <cjwatson@debian.org>
Remove the old set-id wrapper, which hasn't been recommended for
several years now.
* src/wrapper.c: Remove.
* src/Makefile.am (noinst_PROGRAMS, wrapper_LDADD, wrapper_SOURCES):
Remove.
Sun Aug 23 10:26:32 BST 2009 Colin Watson <cjwatson@debian.org>
* README: Various minor updates.
Sun Aug 23 00:13:56 BST 2009 Colin Watson <cjwatson@debian.org>
* manual/Makefile.am (noinst_DATA): Move $(MANUAL).dvi to ...
(CLEANFILES): ... here.
(install-data-hook): Stop installing the DVI version of the manual
by default.
Sun Aug 23 00:07:03 BST 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Add --enable-automatic-create,
--disable-automatic-update, and --disable-cats options.
* include/manconfig.h.in (MAN_DB_CREATES, MAN_DB_UPDATES, MAN_CATS):
Remove.
* manual/intro.me (Arguments to configure): Document new options.
* manual/misc.me (Modes of operation): Adjust configuration advice
to use new configure options.
* README (Non-generic arguments to configure): Update.
* NEWS: Document this.
Sun Aug 23 00:04:56 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_setenv): New function, allowing
application code to ask for environment variables to be set when a
command is executed.
(command_new, command_new_function, command_dup, command_dump,
command_tostring, command_free): Handle new nenv, env_max, and env
members of 'struct command'.
(argstr_get_word): Add TODO comment for environment variable
support.
(pipeline_start): Set environment variables as requested.
* lib/pipeline.h (struct command_env): New structure.
(struct command): Add nenv, env_max, and env members.
(command_setenv): Add prototype.
* src/man.c (run_mandb): Set MAN_MUST_CREATE=1 environment variable
if create is true.
* src/mandb.c (main): If --create was passed and no databases were
created, only exit non-zero if MAN_MUST_CREATE=1.
Sat Aug 22 15:34:15 BST 2009 Colin Watson <cjwatson@debian.org>
Cope with some more cases of database corruption (Debian bug
#187750).
* libdb/db_store.c (dbstore): Always replace existing keys once
we've decided we ought to. If the key already exists in the
database, then that probably indicates some kind of database
corruption, but our new key is almost certainly better.
* src/check_mandirs.c (sanity_check_db): New function, checking
dbver_rd and ensuring that all keys have non-NULL content.
(update_db): Use sanity_check_db to decide whether an existing
database is OK.
* src/accessdb.c (main): If we encounter a key with no content,
print a debugging message and continue as far as we can before
exiting non-zero, rather than just silently exiting non-zero
immediately.
Sat Aug 22 14:58:39 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/mandb-2: Run mandb with a clean path, and only on the
test manual page hierarchy (already done for the second instance,
but not the first).
Sat Aug 22 14:51:25 BST 2009 Yuri Kozlov <yuray@komyakino.ru>
* po/ru.po: Update from Translation Project.
Sat Aug 22 14:42:49 BST 2009 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): When trying the last source encoding in
the list, ignore characters not representable in UTF-8 (which
almost certainly means codepoints that do not exist in the source
encoding).
* src/tests/manconv-2: Add test for this.
Thu Aug 20 23:52:28 BST 2009 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project.
Thu Aug 20 15:17:54 BST 2009 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (MAX_NAME): Increase from 2048 to 8192, since some
manual pages with NAME sections exceeding 2048 bytes have been
observed in the wild (Debian bug #489907).
Thu Aug 20 15:05:38 BST 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c (check_preprocessor_encoding): Break coding tag
search loop if pp_search is NULL, fixing a segfault (introduced by
the fix for Debian bug #496604) if there is a preprocessor comment
line with no coding tag.
* src/tests/manconv-1: Add a test for this bug.
Thu Aug 20 09:52:23 BST 2009 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (replace_if_necessary): Always replace if the
mtime of the new data is newer than that of the old data,
regardless of the id (Debian bug #490582).
* src/tests/testlib.sh (next_second): New function.
* src/tests/mandb-2: New test for this bug.
* src/tests/Makefile.am (TESTS): Add mandb-2.
* src/tests/mandb-1: Run mandb with a clean path, and only on the
test manual page hierarchy.
Thu Aug 20 07:47:02 BST 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (run_mandb): If -C was given, pass it through to mandb.
(main): Treat the main configuration file as optional if -C was
given.
* src/tests/testlib.sh (fake_config): Take the manual page
hierarchies to use as arguments.
(run_clean_path): New function.
* src/tests/man-1: New test, for Debian bug #163347 (apparently
fixed some time back).
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Set CLEANPATH, so that
run_clean_path can run commands with a reduced PATH.
(TESTS): Add man-1.
Wed Aug 19 20:23:00 BST 2009 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Treat the main configuration file as optional
if we're only producing user databases. This makes testing easier.
* configure.ac, m4/man-bdb.m4 (MAN_CHECK_BDB): Define DBTYPE to
gdbm, ndbm, or btree, indicating the database type in use.
* src/tests/testlib.sh (fake_config, db_ext, accessdb_filter): New
functions.
* src/tests/mandb-1: New test.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Set DBTYPE
appropriately in the test environment.
(TESTS): Add mandb-1.
Wed Aug 19 12:17:25 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/testlib.sh (write_page): New function.
* src/tests/lexgrog-1: New (fairly trivial) test.
* src/tests/Makefile.am (TESTS): Add lexgrog-1.
Wed Aug 19 00:10:58 BST 2009 Colin Watson <cjwatson@debian.org>
* Version: 2.5.6-pre1.
* po/man-db.pot, po/*.po: Update.
Tue Aug 18 23:53:50 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/Makefile.am (dist_check_SCRIPTS): Distribute test files.
Tue Aug 18 23:39:28 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/Makefile: Remove; accidentally added to revision
control.
* .bzrignore: Ignore src/tests/Makefile.
Tue Aug 18 09:47:50 BST 2009 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Convert text to UTF-8 and then (if
necessary) to the target encoding. This allows us to distinguish
between "text not in input encoding" and "characters not
representable in output encoding" (Debian bug #514963).
* src/tests/manconv-2: Add test for this and some other possible
encoding-handling bugs in manconv.
* src/tests/Makefile.am (TESTS): Add manconv-2.
* NEWS: Document this.
Mon Aug 17 18:32:04 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/testlib.sh (init): New function.
(finish): Honour TEST_FAILURE_KEEP environment variable.
* src/tests/manconv-1: Use init function. Reverse diff arguments so
that failure output makes more sense.
Mon Aug 17 00:56:20 BST 2009 Colin Watson <cjwatson@debian.org>
* NEWS: Update.
Mon Aug 17 00:38:12 BST 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c (conversion_table): New table, with contents
mostly borrowed from groff's preconv.
(convert_encoding): New function.
(check_preprocessor_encoding): Loop through semicolon-separated
tags, and convert Emacs coding tags to ones that libiconv
understands (Debian bug #496604).
* src/tests/manconv-1: Test multiple tags. Test coding aliases.
Sun Aug 16 23:52:38 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/testlib.sh: Add a simple test library, to be extended as
necessary.
* src/tests/manconv-1: Use it.
Sun Aug 16 23:37:11 BST 2009 Colin Watson <cjwatson@debian.org>
* src/tests/manconv-1: Simple test for manconv's handling of
Emacs-style coding: tags.
* src/tests/Makefile.am: New file.
* src/Makefile.am (SUBDIRS): Add tests.
* configure.ac (AC_CONFIG_FILES): Add src/tests/Makefile.
* .bzrignore: Ignore src/tests/tmp-*.
Fri Aug 14 16:09:56 BST 2009 Colin Watson <cjwatson@debian.org>
* tools/chconfig: Make executable.
Fri Aug 14 12:20:16 BST 2009 Colin Watson <cjwatson@debian.org>
* manual/Makefile.am (install-data-hook, uninstall-hook):
Install/uninstall the manual into/from $(docdir).
Fri Aug 14 12:18:43 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/Makefile.am (dist_noinst_DATA): Move NEWS to ...
* Makefile.am (dist_noinst_DATA): ... here.
Fri Aug 14 11:50:27 BST 2009 Colin Watson <cjwatson@debian.org>
Move ChangeLog and NEWS to their more conventional location at the
top level.
* docs/ChangeLog: Move to ...
* ChangeLog: ... here.
* docs/NEWS: Move to ...
* NEWS: ... here.
* README, docs/HACKING (Revision control, Release process),
src/check_mandirs.c: Update references.
Fri Aug 14 11:43:41 BST 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Use silent rules by default if Automake 1.11 is
available.
* man/Rules.man (replace.sed, .man1.1, .man5.5, .man8.8): Be quieter
in silent mode.
Upgrade to Autoconf 2.64, Automake 1.11, and Gnulib 20090801.
Mon Aug 3 17:13:19 BST 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c (less_charset_table): Add CP1251 -> windows, per
less(1) (Debian bug #539690).
Wed Jul 22 10:48:10 BST 2009 Colin Watson <cjwatson@debian.org>
Make whatis/apropos only display any given manual page, or pointers
to it, once (Ubuntu bug #27113).
* lib/hashtable.c (hash_lookup_structure): Make external.
* lib/hashtable.h (hash_lookup_structure): Add prototype.
* src/whatis.c (get_whatis): Split pointer resolution out to ...
(resolve_pointers): ... here. Only accept info->pointer == page if
info->name == page too.
(display): Use resolve_pointers so that we have the resolved name
to hand. Only display any given resolved name once.
(main): Initialise display_seen hash table.
* docs/NEWS: Document this.
Tue Jul 21 22:05:01 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Fix typo.
Tue Jul 21 15:17:49 BST 2009 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (Controlling formatted output, ENVIRONMENT):
Explicitly state that -P/$PAGER/$MANPAGER identifies a single
command with no pipes (Debian bug #363250).
Mon Jul 20 10:59:00 BST 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (locale_macros): Fix groff version test not to think
that 1.20.1 >= 1.20.2.
Tue Jul 14 22:48:56 BST 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Add -Wredundant-decls to CFLAGS.
* lib/tempfile.c: Remove redundant declarations of mkstemp and
mkdtemp.
* src/manp.c: Remove redundant and unused declaration of
program_name.
* src/zsoelim.l: Add never-interactive option, partly because that's
reasonably accurate anyway and partly to suppress flex's redundant
declaration of isatty.
Mon Jul 13 13:40:17 BST 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (options, parse_opt): New --no-subpages option.
(main): Try pairing up manual page names with hyphens unless
--no-subpages was given.
* ma/man1/man.man1 (SYNOPSIS, Finding manual pages): Document
--no-subpages.
* docs/NEWS: Document this.
Mon Jul 13 01:17:41 BST 2009 Colin Watson <cjwatson@debian.org>
* README (Copyright and licensing): Update copyright years.
Mon Jul 13 00:48:32 BST 2009 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_less_charset, get_jless_charset): Cope with
locale_charset being NULL; loosely based on a patch posted to
mingw-msys by Mark Junker
(http://osdir.com/ml/gnu.mingw.msys/2005-06/msg00012.html).
Sun Jun 28 17:56:49 BST 2009 Colin Watson <cjwatson@debian.org>
Don't create unnecessary database directories (Debian bug #472919).
* src/check_mandirs.c (testmandirs): Add catpath and create
arguments. Create the database when it first seems to be needed.
Use mkcatdirs rather than make_database_directory.
(make_database_directory): Remove.
(create_db): Add catpath argument. Don't create the database here;
let testmandirs do it when needed instead.
(update_db): Add catpath argument. Don't create the database
directory; either it exists already in which case there's nothing
to do, or it's missing in which case there'll be no database to
update anyway.
* src/check_mandirs.h (create_db, update_db): Update prototypes.
* src/mandb.c (update_db_wrapper): Add catpath argument.
(mandb): Update calls to functions that now take the catpath too.
* src/manp.c (add_mandb_map): Don't create the cat hierarchy here;
testmandirs will do it on demand.
(mkcatdirs): Make external for use by check_mandirs.c.
* src/manp.h (mkcatdirs): Add prototype.
* docs/NEWS: Document this.
Sun Jun 28 16:33:24 BST 2009 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (DESCRIPTION): Note that the exact rendering of
(e.g.) italic text may vary depending on the output device (Debian
bug #516808).
Sun Jun 28 16:21:34 BST 2009 Colin Watson <cjwatson@debian.org>
Implement 'man -K', which was the last major remaining missing
feature when comparing man-db with the man package (Debian bug
#135926, Ubuntu bug #390575).
* src/man.c (options, parse_opt): New -K/--global-apropos option.
(main): Handle --global-apropos.
(locate_page): Skip database lookups in --global-apropos mode.
(grep, do_global_apropos_section, do_global_apropos): New
functions.
* src/man.h (do_global_apropos): Add prototype.
* man/man1/man.man1 (SYNOPSIS, Main modes of operation): Document
-K/--global-apropos.
* docs/NEWS: Document this.
Sun Jun 28 10:31:16 BST 2009 Colin Watson <cjwatson@debian.org>
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: po4a 0.36 tags
"type:" comments as extracted comments rather than translator
comments. Upgrade our .pot and .po files to match.
Sun Jun 28 02:04:55 BST 2009 Colin Watson <cjwatson@debian.org>
* src/manp.c (get_nls_manpath): Close mandir, fixing a memory leak.
Sun Jun 28 01:47:51 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_free): Free buffer and line_cache.
Sun Jun 28 01:40:24 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (get_line): Limit newline search to the data length
returned by get_block, fixing an assertion failure.
* docs/NEWS: Document this.
Mon Jun 22 08:02:55 BST 2009 Colin Watson <cjwatson@debian.org>
* src/descriptions.c (parse_descriptions): Strip leading and
trailing whitespace from name tokens before checking whether they
contain whitespace.
* docs/NEWS: Document this.
Sun Jun 21 02:55:56 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document previous change.
Sun Jun 21 02:20:22 BST 2009 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (dblookup): In exact mode, make sure extensions
match exactly, rather than merely that the extension found is a
prefix of that which was requested (Arch Linux bug #14467).
Sun Jun 21 02:00:31 BST 2009 Colin Watson <cjwatson@debian.org>
* src/ult_src.c (ult_src): Keep a copy of base before passing it to
decompress_open, as that function doesn't keep its own copy and we
may change base later.
Sat Jun 20 21:26:02 BST 2009 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (replace_if_necessary): Prevent misleading
debugging message: don't say "ignoring differing ids" if the new
id was preferred and we attempted a replacement.
Sat May 30 12:50:44 BST 2009 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Check the return value of nice.
* include/manconfig.h.in (create_tempdir): Warn if the result is not
used.
* lib/tempfile.c (create_tempdir): Check the return value of
mkdtemp.
* src/man.c (format_display): Check the return value of
create_tempdir.
Sat May 30 13:37:58 CEST 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Initialise page_encoding.
Wed May 13 18:28:44 BST 2009 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20090501.
* tools/config.guess, tools/config.sub: Update.
Wed Apr 22 15:50:51 BST 2009 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (lt_name): Add.
Wed Apr 15 00:34:06 BST 2009 Colin Watson <cjwatson@debian.org>
* man/it/man1/whatis.man1 (STATI D'USCITA): Fix section heading
(formerly "STATI D?USCITA") to match man(1) and apropos(1).
Reported by Ken Moffat.
Wed Apr 15 00:33:16 BST 2009 Colin Watson <cjwatson@debian.org>
* man/check-man: Set MAN_KEEP_FORMATTING=1, since a UTF-8-aware col
(such as that in util-linux-ng) will object to being asked to
process non-ASCII text under LC_ALL=C. Reported by Ken Moffat.
* docs/NEWS: Document this.
Wed Apr 15 00:31:00 BST 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Start 2.5.6.
Wed Apr 15 00:22:54 BST 2009 Colin Watson <cjwatson@debian.org>
* .bzrignore: Ignore gnulib/lib/glthread/.deps and
gnulib/lib/glthread/.dirstamp.
Wed Apr 15 00:20:45 BST 2009 Colin Watson <cjwatson@debian.org>
Upgrade to Autoconf 2.63, Automake 1.10.2, and Gnulib 20090401.
Tue Apr 14 23:59:40 BST 2009 Colin Watson <cjwatson@debian.org>
Call gnulib-tool after autopoint, and only use the gettext macros
supplied via gnulib. This is required to work properly with current
versions of gettext and gnulib; see
http://lists.gnu.org/archive/html/bug-gnulib/2009-03/msg00154.html
and thread.
* autogen.sh: If gnulib-tool is installed, call autopoint first and
prevent autoreconf from calling it later. Remove special handling
of tools/config.rpath, which is not necessary with this approach.
* Makefile.am (ACLOCAL_AMFLAGS): Put gnulib/m4 before m4, so that
autopoint puts its macros in gnulib/m4 (later overwritten by
gnulib-tool).
Mon Mar 23 14:32:25 GMT 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* po/id.po, man/po4a/po/id.po: Update from Translation Project.
Wed Mar 18 01:10:50 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): Moved bzr archive to Savannah;
update URLs and note that this now allows access to other members
of the man-db group on Savannah.
Mon Mar 16 11:42:35 GMT 2009 Colin Watson <cjwatson@debian.org>
* Makefile.am (EXTRA_DIST): Distribute gnulib/m4/gnulib-cache.m4.
Mon Mar 16 10:39:40 GMT 2009 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project.
Sun Mar 15 13:13:40 GMT 2009 Colin Watson <cjwatson@debian.org>
Apparently some packages ship section 0 manual pages documenting C
library header files. See http://bugs.archlinux.org/task/13734 and
http://en.wikipedia.org/wiki/Manual_page_(Unix).
* configure.ac (--with-sections): Add section 0 between 3 and 2.
* man/man5/manpath.man5 (FORMAT): Update documentation of SECTION.
* src/man_db.conf.in (SECTION): Update documentation.
Sun Mar 15 01:08:16 GMT 2009 Colin Watson <cjwatson@debian.org>
* gnulib: Import the sigaction, signal, and sigprocmask modules.
Sat Mar 14 22:44:33 GMT 2009 Colin Watson <cjwatson@debian.org>
* Version: 2.5.5.
Sat Mar 14 22:42:39 GMT 2009 Colin Watson <cjwatson@debian.org>
* man/check-man: Ignore "cannot adjust line" and "can't break line"
groff warnings for all languages, not just CJK; long
%manpath_config_file% values during 'make distcheck' cause
problems here at the moment.
Sat Mar 14 18:51:22 GMT 2009 Colin Watson <cjwatson@debian.org>
* man/check-man: Force MANWIDTH to 80. Ignore "table wider than line
width" warnings from groff >= 1.20 for now.
Sat Mar 14 18:34:26 GMT 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* man/po4a/po/id.po: Update from Translation Project.
Sat Mar 14 13:54:13 GMT 2009 Colin Watson <cjwatson@debian.org>
* man/Makefile.am (EXTRA_DIST): Distribute check-man.
* src/manp.c (read_config_file): Add argument to control whether the
main configuration file is optional. Use a static variable to
track whether we've been called already.
(get_manpath): read_config_file will keep track of whether it's
been called already for itself. Pass new argument.
* src/manp.h (read_config_file): Update prototype.
* src/man.c (main): Treat the main configuration file as optional if
-l was given, since in that case we can get by well enough without
it. This makes it easier to run 'make check' without first running
'make install'.
Sat Mar 14 12:07:58 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Start 2.5.5.
Sat Mar 14 00:29:51 GMT 2009 Dustin Marquess <dmarquess@gmail.com>
* src/man.c (sort_candidates): Initialise count (Debian bug
#519647).
Tue Mar 10 23:46:08 GMT 2009 Will Day <wd+debianbugs@hpgx.net>
* man/man1/man.man1 (Controlling formatted output): Fix missing
backslash in -r default (Debian bug #519162).
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
Tue Mar 10 23:24:27 GMT 2009 Colin Watson <cjwatson@debian.org>
Fix handling of pages that declare a non-default encoding in their
preprocessor lines. Thanks to Hugo Herbelin for some of the ideas
here (Debian bug #519095).
* src/encodings.c (get_source_encoding): Note that this function
should only be called if the page encoding is UTF-8. Add another
example.
* src/manconv.c (check_preprocessor_encoding): Move to ...
* src/encodings.c (check_preprocessor_encoding): ... here.
* src/encodings.h (check_preprocessor_encoding): Add prototype.
* src/man.c (make_roff_command): Use preprocessor-declared encoding
as page_encoding if known. Set source_encoding to page_encoding
unless the latter is UTF-8.
* src/Makefile.am (manconv_SOURCES): Add encodings.c.
* src/encodings.c (charset_table): Use ISO-8859-15 -> latin1 entry
only in the !MULTIBYTE_GROFF case; true ISO-8859-15 pages are
better handled using ascii8 or preconv if possible.
Tue Mar 10 14:11:14 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/zsoelim.l (zsoelim_parse_file): Put the initial .lf request
after any initial comment line, so that manconv can find encoding
instructions more easily.
Mon Mar 9 11:32:19 GMT 2009 Colin Watson <cjwatson@debian.org>
* man/check-man: Check that a manual page formats without errors;
inspired by Lintian.
* man/Rules.man: Run check-man over all manual pages during 'make
check'.
Mon Mar 9 10:47:08 GMT 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* man/po4a/po/id.po: Update from Translation Project.
Tue Feb 24 01:06:46 GMT 2009 Colin Watson <cjwatson@debian.org>
* Version: 2.5.4.
* po/man-db.pot, po/*.po: Update.
Tue Feb 24 01:00:56 GMT 2009 Colin Watson <cjwatson@debian.org>
* man/po4a/po/id.po: Fix groff syntax error.
Mon Feb 23 22:37:36 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Sending patches): Refer to new man-db-devel mailing
list.
Mon Feb 23 22:29:43 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Things to do): Improve bug tracking system link.
Mon Feb 23 22:17:50 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (locale_macros, display): Only load per-locale groff
macros if preconv is available, since those macros may change the
assumed input encoding.
Mon Feb 23 22:11:56 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Update.
Sat Feb 21 12:01:55 GMT 2009 Colin Watson <cjwatson@debian.org>
Load per-locale groff macros if possible. This only works with groff
1.20.2 (as yet unreleased) or better, since that introduces
facilities to allow us to avoid an error message if there is no
macro file for the relevant locale.
* src/man.c (locale_macros): New function.
(display): Check the page language, and add locale_macros to the
formatting pipeline provided that the language is not empty or
"C".
Fri Feb 20 09:58:13 GMT 2009 Colin Watson <cjwatson@debian.org>
Partially rewrite building of manpath according to locale. The
previous code was completely wrong: as well as handling duplicates
rather oddly, it effectively handled LANGUAGE in reverse order
(Debian bug #516133).
* src/manp.c (add_nls_manpath): Rename to ...
(get_nls_manpath): ... this. Some minor adjustments. Make
manpathlist argument const and always return a freshly-allocated
string. Explicitly add the top-level directory to the string in
the case of English locales (although we still look for
subdirectories in case of things like en_GB.UTF-8); C and POSIX
already just return a copy of manpathlist.
(add_nls_manpaths): New function to iterate over a colon-separated
list of locales, concatenating the result of get_nls_manpath for
each. Stop worrying about deduplication at this point as we used
to; instead, we let create_pathlist sort that out.
(create_pathlist): Keep the first of any set of duplicates rather
than the last, in order to keep item order stable.
* src/manp.h (add_nls_manpath): Remove prototype.
(add_nls_manpaths): Add prototype.
* src/man.c (main), src/whatis.c (main): Call add_nls_manpaths
rather than add_nls_manpath, with appropriate adjustments.
* src/man.c (main), src/whatis.c (main): Don't set internal_locale
to the first component of multiple_locale. We will account for
this in search paths, but shouldn't forget about internal_locale
entirely.
Thu Feb 19 21:50:44 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_to_manpath): Remove; this just called pathappend
with the same arguments and so is pointless cruft.
(add_nls_manpath): Update all callers.
Tue Feb 17 00:49:28 GMT 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Check for gpreconv/preconv properly, i.e. by using
AC_CHECK_PROGS rather than by using 'which'.
Mon Feb 16 01:45:59 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Update.
Mon Feb 16 00:49:47 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): If we have preconv, it's silly to
recode to the assumed page encoding and risk problems with
characters unrepresentable in that encoding; we might as well just
recode to UTF-8 and feed that to preconv.
Mon Feb 16 00:39:22 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Append //TRANSLIT to iconv -t
argument (specifically, so that hyphens get properly
transliterated when using preconv and groff -Tutf8 in a non-UTF-8
locale; thanks, Matthew Burgess and Alexander Patrakov).
Mon Feb 16 00:20:07 GMT 2009 Colin Watson <cjwatson@debian.org>
* configure.ac: Check for gpreconv/preconv, which is evidence of a
version of groff supporting Unicode input, and therefore good
enough to assume --enable-mb-groff (thanks, Matthew Burgess).
Sun Feb 15 23:48:51 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Remove obsolete first-pass
language code comparison. Language codes are already handled by
later code here, and this comparison caused English pages to be
preferred over pages for languages whose names sort later than
"man".
Thu Feb 12 11:23:19 GMT 2009 Colin Watson <cjwatson@debian.org>
* src/manconv_main.c (main): Correct error message if the given
filename cannot be opened.
Wed Feb 4 13:53:47 CET 2009 Yuri Kozlov <yuray@komyakino.ru>
* man/po4a/po/ru.po: Update from Translation Project (trivial).
Sun Feb 1 16:40:16 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Directory layout): Mention gnulib.
Sun Feb 1 16:36:01 GMT 2009 Colin Watson <cjwatson@debian.org>
* lib/linelength.c (get_line_length): Use line length from standard
input, but only if standard output is not a terminal; this allows
commands such as 'MAN_KEEP_STDERR=1 man foo >/dev/null' to report
errors based on the current line length.
Sat Jan 31 12:20:42 GMT 2009 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Update.
Sat Jan 31 12:14:10 GMT 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* po/id.po: Update from Translation Project.
Tue Jan 27 09:54:25 GMT 2009 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project (trivial).
Tue Jan 27 09:52:18 GMT 2009 Erwin Poeze <erwin.poeze@gmail.com>
* po/nl.po: Update from Translation Project.
* man/THANKS: Update.
Mon Jan 26 13:40:30 GMT 2009 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Mon Jan 26 13:38:11 GMT 2009 Robert Luberda <robert@debian.org>
* po/pl.po, man/po4a/po/pl.po: Update from Translation Project.
Sun Jan 18 23:27:11 GMT 2009 Colin Watson <cjwatson@debian.org>
* lib/linelength.c (get_line_length): Line length is a property of
output, not input, so only check whether standard output is a
terminal, not also standard input (Debian bug #512233).
Thu Jan 15 16:04:01 GMT 2009 Colin Watson <cjwatson@debian.org>
* po/Makevars (XGETTEXT_OPTIONS): Add --flag=debug:1:c-format
--flag=debug_error:1:c-format.
Thu Jan 15 00:00:05 GMT 2009 Colin Watson <cjwatson@debian.org>
Update manual page search order to permit FHS-compliant installation
of packages in /opt. Reported by Matt Domsch.
* src/manp.c (has_mandir): Use xasprintf rather than clumsier
xmalloc/strncpy/strcpy combination. Try ../share/man and share/man
subdirectories too.
(get_manpath_from_path): Update header comment and debug output.
* manual/files.me (Determination of the internal manpath): Update
description of directory search order.
* docs/NEWS: Document this.
Mon Jan 5 17:47:55 GMT 2009 Yuri Kozlov <kozlov.y@gmail.com>
* po/ru.po, man/po4a/po/ru.po: Update from Translation Project.
Mon Jan 5 17:35:02 GMT 2009 Arif E. Nugroho <arif_endro@yahoo.com>
* man/po4a/po/id.po: Update from Translation Project.
Wed Dec 31 12:28:55 GMT 2008 Colin Watson <cjwatson@debian.org>
Trust the database if it tells us that a page is ULT_MAN (i.e. not a
hard link, symbolic link, or .so link), and avoid passing the
SO_LINK flag to ult_src which requires it to open the page to look
for .so links. Produces roughly a threefold speed improvement for
searches with thousands of results.
* src/man.c (get_ult_flags): New function.
(add_candidate, display_database): Use it.
Wed Dec 31 11:51:41 GMT 2008 Colin Watson <cjwatson@debian.org>
Sort manual page candidates in one go just before displaying them,
rather than insertion-sorting them along the way. Produces, very
roughly, a 25% speed improvement for searches with many results
(e.g. with --regex).
* src/man.c (duplicate_candidates, compare_candidates): Simplify
interface by passing 'struct candidate' for both sides.
(compare_candidates): Explicitly stabilise the comparison as a
last resort, using a new add_index member.
(compare_candidates_qsort, free_candidate): New functions.
(add_candidate): Adjust calls to duplicate_candidates and
compare_candidates, requiring us to create the candidate structure
earlier. Note that the search produces quadratic-time behaviour.
Only compare candidates in cases of duplicates; otherwise just add
them to the end of the list and defer sorting until later. Use
free_candidate to free search->ult as well as search when freeing
superseded duplicates.
(sort_candidates): New function.
(man): Sort candidates before displaying them.
Tue Dec 30 13:08:35 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.4-pre2.
* po/man-db.pot, po/*.po: Update.
Tue Dec 30 12:55:59 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man5/manpath.man5 (FORMAT): Add space between
"MINCATWIDTH"/"MAXCATWIDTH"/"CATWIDTH" and "width".
* man/po4a/po/id.po: Unfuzzy translations.
Tue Dec 30 12:52:26 GMT 2008 Arif E. Nugroho <arif_endro@yahoo.com>
* po/id.po, man/po4a/po/id.po: Update from Translation Project.
Sun Dec 28 00:27:23 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.4-pre1.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po, po/man-db.pot,
po/*.po: Update.
Sun Dec 28 00:17:45 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/Makefile.am (PO4A_ARGS): Always generate output files
even if poorly translated, since Automake's generated rules will
get upset otherwise.
Sat Dec 27 23:47:19 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/Makefile.am (dist-hook): Update PO and POT files on 'make
dist'.
Sat Dec 27 23:42:53 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (Controlling formatted output): Hide ".B
\-\-no\-hyphenation" from po4a.
Sat Dec 27 11:38:43 GMT 2008 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Start 2.5.4.
Sat Dec 27 00:00:01 GMT 2008 Colin Watson <cjwatson@debian.org>
Add option to disable hyphenation (Debian bug #166701).
* src/man.c (options, parse_opt): Accept --no-hyphenation. Reset
corresponding variable with -D.
(disable_hyphenation): New function.
(display): Append disable_hyphenation to the decompressor pipeline
if --no-hyphenation is used.
* man/man1/man.man1 (SYNOPSIS, Controlling formatted output):
Document --no-hyphenation.
Thu Dec 25 22:09:01 GMT 2008 Colin Watson <cjwatson@debian.org>
Add regular expression and shell wildcard search facilities to man
(Debian bug #461319).
* src/whatis.c (lower): Move to ...
* lib/lower.c: ... here, with optimisation from name_to_key. New
file.
* lib/lower.h: New file.
* src/whatis.c (word_fnmatch): Move to ...
* lib/wordfnmatch.c: ... here, with more generic argument names. New
file.
* lib/wordfnmatch.h: New file.
* src/whatis.c (main): Factor regcomp error handling out to ...
* lib/xregcomp.c: ... here. New file.
* lib/xregcomp.h: New file.
* lib/Makefile.am (libman_a_SOURCES): Add lower.c, lower.h,
wordfnmatch.c, wordfnmatch.h, xregcomp.c, and xregcomp.h.
* po/POTFILES.in: Add lib/xregcomp.c; remove src/globbing.c.
* libdb/db_lookup.c (name_to_key): Use lower.
(dblookup_pattern): New function.
* libdb/db_storage.h (dblookup_pattern): Add prototype.
* src/globbing.c (end_pattern): Rename to ...
(make_pattern): ... this. Create the whole pattern rather than
merely appending section or extension components. Handle regexes
if the new opts argument has the LFF_REGEX bit set.
(match_in_directory): Take an opts disjunction rather than a
boolean ignore_case argument; ignore_case is replaced by the
LFF_MATCHCASE bit being unset. Handle regexes if opts has the
LFF_REGEX bit set.
(look_for_file): Take an opts disjunction rather than a boolean
match_case argument; match_case is replaced by the LFF_MATCHCASE
bit being set. Handle regexes if opts has the LFF_REGEX bit set.
Handle shell wildcards if opts has the LFF_WILDCARD bit set (which
simply means not shell-escaping unesc_name). Call make_pattern
rather than end_pattern (with appropriate adjustments).
* src/globbing.h (enum look_for_file_opts): New enumeration.
(look_for_file): Update prototype.
* src/globbing_test.c (options, parse_opt): Accept -r/--regex and
-w/--wildcard.
(main): Update look_for_file arguments, including passing
LFF_REGEX or LFF_WILDCARD if the corresponding options are used.
* src/check_mandirs.c (purge_whatis, purge_missing), src/zsoelim.l
(zsoelim_open_file): Update look_for_file arguments.
* src/whatis.c (main): Only free preg if a regular expression was
compiled into it in the first place.
* src/man.c (options, parse_opt): Accept --regex, --wildcard, and
--names-only. Reset corresponding variables with -D. Refuse to
accept both --regex and --wildcard.
(try_section): Update look_for_file arguments, including passing
LFF_REGEX or LFF_WILDCARD if the corresponding options are used.
(try_db): Use dblookup_pattern if --regex or --wildcard is used,
with corresponding options.
* man/man1/man.man1 (SYNOPSIS, Finding manual pages): Document
--regex, --wildcard, and --names-only.
Tue Dec 23 11:17:01 GMT 2008 Colin Watson <cjwatson@debian.org>
Sync supported language list with Fedora's patch to man
(http://cvs.fedora.redhat.com/viewvc/rpms/man/F-10/man-1.6b-i18n_nroff.patch?view=markup,
with corrections based on /usr/share/i18n/SUPPORTED).
* src/encodings.c (directory_table): Add Estonian -> ISO-8859-1,
Belarusian -> CP1251, Greek -> ISO-8859-7, Lithuanian ->
ISO-8859-13, Latvian -> ISO-8859-13, Macedonian -> ISO-8859-5,
Romanian -> ISO-8859-2, Slovenian -> ISO-8859-2, and Ukrainian ->
KOI8-U.
(charset_alias_table): Map KOI8U to KOI8-U.
(less_charset_table): Map KOI8-U to koi8-r (possibly not quite
right but with any luck good enough).
Mon Dec 8 13:08:22 GMT 2008 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (compare_ids): If the promote_links argument is
true, consider SO_MAN equivalent to ULT_MAN.
(replace_if_necessary): Update call to compare_ids.
* libdb/db_storage.h (compare_ids): Update prototype.
* src/man.c (compare_candidates): Consider SO_MAN equivalent to
ULT_MAN for the purposes of sorting candidate pages for display
(Debian bug #384301).
Mon Dec 8 10:08:45 GMT 2008 Colin Watson <cjwatson@debian.org>
Improve sorting and de-duplication of manual page candidates (Debian
bugs #389762 and #496172).
* src/man.c (struct candidate): Add ult member.
(duplicate_candidates): Pare down to only check for duplication
rather than trying to compare as well; the latter function is now
handled entirely by compare_candidates. Compare the ultimate
source file as the first test.
(compare_candidates): Compare locale elements in candidate paths
before comparing sections.
(add_candidates): Look up the ultimate source file if necessary,
and save it in the candidate structure. Use duplicate_candidates
for duplicate testing only and compare_candidates for comparison.
Insert elements at the latest possible position rather than the
earliest possible.
(try_section): Pass the ultimate source file that was already
looked up here.
(try_db): Adjust for new add_candidate signature.
Sun Dec 7 17:43:21 GMT 2008 Colin Watson <cjwatson@debian.org>
Make handling of terminal widths for cat pages configurable (Debian
bug #121997).
* src/manp.c (add_to_dirlist): Recognise new MINCATWIDTH,
MAXCATWIDTH, and CATWIDTH directives.
* src/man_db.conf.in: Add MINCATWIDTH, MAXCATWIDTH, and CATWIDTH.
* src/man.c (get_roff_line_length): Use CATWIDTH rather than the
terminal width if the former is non-zero.
(add_roff_line_length): Check the terminal width against
MINCATWIDTH and MAXCATWIDTH rather than checking whether it
differs from groff's default (via get_roff_line_length). Allow cat
page saving regardless in catman mode.
(make_roff_command): Forbid saving cat pages in troff mode here
rather than via add_roff_line_length/get_roff_line_length.
* man/man5/manpath.man5 (FORMAT): Document MINCATWIDTH, MAXCATWIDTH,
and CATWIDTH.
Sun Dec 7 17:17:34 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man5/manpath.man5 (FORMAT): Document SECTION.
Sat Dec 6 22:57:14 GMT 2008 Colin Watson <cjwatson@debian.org>
Reorganise lexgrog to stop on any unrecognised roff request, rather
than continuing and often littering the database with garbage
(Debian bug #271402). This also involved extending lexgrog to
recognise some additional requests.
* src/lexgrog.l (word): New definition.
(typeface): Add .SB and .SM.
(MAN_PRENAME): Go straight to MAN_REST on encountering a section
request or EOF. Go to MAN_NAME on encountering roff requests that
would ordinarily be processed and removed. Skip over any other
roff requests, including spacing and comments.
(MAN_NAME): Process .Tn and .Nm by handling their arguments as
text. Process .At, .Bsx, .Bx, .Fx, .Nx, .Ox, and .Ux by inserting
the appropriate text (introducing several new mini-scanners).
Process .Dq by surrounding its arguments by double quotes. Go to
MAN_REST on encountering any unrecognised roff request.
(add_wordn_to_whatis, add_word_to_whatis, mdoc_text): New
functions to support scanning of .At and friends.
Fri Dec 5 22:27:03 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man8/mandb.man8 (FILES): List FHS database cache location
first, and indicate more clearly that the others are old locations
(from a comment in Debian bug #243763).
Fri Dec 5 13:52:14 GMT 2008 Colin Watson <cjwatson@debian.org>
Make it possible to override man's default of discarding stderr when
stdout is a terminal (Debian bug #480996).
* src/man.c (discard_stderr): Make static.
(maybe_discard_stderr): New function, checking MAN_KEEP_STDERR.
(format_display_and_save, format_display, display_catman): Use
maybe_discard_stderr.
* man/man1/man.man1 (ENVIRONMENT): Document this.
Thu Dec 4 15:03:08 GMT 2008 Colin Watson <cjwatson@debian.org>
Exit as soon as possible if database writes return ENOSPC (Debian
bug #167159).
* src/check_mandirs.c (testmandirs, create_db, update_db,
purge_normal, purge_whatis, check_multi_key, purge_missing):
Return int rather than short, to make space for -errno.
* src/mandb.c (update_one_file, update_db_wrapper, mandb,
process_manpath): Likewise.
* src/check_mandirs.h (create_db, update_db, purge_missing): Update
prototypes.
* src/check_mandirs.c (create_db): Return -errno for database open
errors other than EACCES and EROFS.
* src/mandb.c (mandb): Return early on errors from create_db and
update_db_wrapper. Propagate errors from xcopy as well as
returning early.
(process_manpath): Return early on errors from mandb.
(main): Exit FATAL on errors from process_manpath.
Wed Dec 3 10:54:53 GMT 2008 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (make_content): Cast time_t value to long before
trying to print as %ld.
* libdb/db_ndbm.c (ndbm_flclose, ndbm_flopen): Rename dbf to db to
avoid shadowing a global variable.
* libdb/mydbm.h: Update prototypes and gdbm/ndbm macros likewise.
Wed Dec 3 10:45:07 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/Makefile.am (libman_a_CPPFLAGS), libdb/Makefile.am
(libmandb_a_CPPFLAGS), src/Makefile.am (AM_CPPFLAGS): Add
-I$(top_builddir)/intl.
Wed Dec 3 10:38:33 GMT 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Import the gettext module. The practical effect of this is
to get the intl directory included while compiling files in
gnulib/lib.
* autogen.sh: Prefer gnulib's version of tools/config.rpath over
gettext's.
Wed Dec 3 10:17:50 GMT 2008 Colin Watson <cjwatson@debian.org>
* m4/man-po4a.m4 (MAN_PO4A): Define a PO4A Automake conditional
(again).
* man/po4a/Makefile.am: Define all-local, update-po, and clean-local
rules only if PO4A is set, so that (in particular) distclean works
if po4a isn't installed.
Tue Dec 2 16:25:53 GMT 2008 Arif E. Nugroho <arif_endro@yahoo.com>
* man/po4a/po/id.po: Update from Translation Project (trivial).
Tue Dec 2 14:50:12 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/po/id.po: New from Translation Project (thanks, Arif E.
Nugroho).
* configure.ac (AC_CONFIG_FILES): Add man/id/Makefile.
* man/Makefile.am (DIST_SUBDIRS): Add id.
* man/id/Makefile.am: New file.
* man/po4a/Makefile.am (POFILES): Add po/id.po.
* man/po4a/po4a.cfg (po4a_langs): Add id.
* man/THANKS: Credit Arif E. Nugroho with man/id as well as id.po.
* .bzrignore: Add man/id/man1, man/id/man5, and man/id/man8.
Mon Nov 17 19:26:50 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Now that we use the ISO 8601 date format rather than
language-specific date variants, there's no reason to call out to
date (using options specific to GNU date) to format the date
string, so just hardcode it.
* docs/HACKING (Release process): datemark -> date.
Mon Nov 17 17:55:35 GMT 2008 Colin Watson <cjwatson@debian.org>
FreeBSD build fixes.
* man/Rules.man (replace.sed): Spell out
$(top_builddir)/man/replace.sin in full since $< is unspecified in
target rules.
* src/Makefile.am (accessdb_LDADD, catman_LDADD, globbing_LDADD,
lexgrog_LDADD, man_LDADD, manconv_LDADD, mandb_LDADD,
manpath_LDADD, whatis_LDADD, wrapper_LDADD, zsoelim_LDADD): Add
@LIBINTL@.
(apropos$(EXEEXT)): Remove target before creating symlink. Spell
out whatis$(EXEEXT) in full since $< is unspecified in target
rules.
* src/check_mandirs.c (testmandirs): Cast time_t values to long
before trying to print as %ld.
* src/descriptions.c (parse_descriptions): Rename base_name to base
and seen_base_name to seen_base.
* src/descriptions_store.c (store_descriptions): Rename base_name to
base.
* src/descriptions.h (parse_descriptions, store_descriptions):
Update prototypes.
Mon Nov 17 11:44:17 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.3.
* po/man-db.pot, po/*.po: Update.
Mon Nov 17 11:07:50 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_new_function): Initialise discard_err.
(pipeline_start): Zero-initialise pids and statuses arrays on
allocation, and don't unblock SIGCHLD until after doing so.
* src/manconv.c (manconv): Don't free elements of from here, as when
called from manconv_stdin they will be freed by
free_manconv_codes.
* src/manconv_main.c (main): Free elements of from_code here
instead.
Mon Nov 17 10:45:55 GMT 2008 Colin Watson <cjwatson@debian.org>
* libdb/db_storage.h (infoalloc): Implement as a macro rather than
as an inline function; seems to cause fewer problems when building
without optimisation.
Mon Nov 17 10:18:10 GMT 2008 Colin Watson <cjwatson@debian.org>
* m4/longdouble.m4: Remove; gettext no longer installs this.
* man/Makefile.am (EXTRA_DIST): Distribute LINGUAS and LINGUAS.po4a.
Mon Nov 17 09:59:19 GMT 2008 Colin Watson <cjwatson@debian.org>
* release.sh: Use 'make distcheck' rather than 'make dist'.
Mon Nov 17 01:13:17 GMT 2008 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Add src/manconv_main.c and src/zsoelim_main.c.
* po/man-db.pot, po/*.po: Update.
Mon Nov 17 00:53:33 GMT 2008 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Update.
Mon Nov 17 00:39:14 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Mangle return value into a value
suitable for passing to exit (Debian bug #477305).
Mon Nov 17 00:06:28 GMT 2008 Colin Watson <cjwatson@debian.org>
Make bare .so includes (e.g. ".so foo.1" rather than ".so
man1/foo.1") work, although only within the same manual page
hierarchy for now. Reported by Mike Frysinger; partially fixes
Debian bug #503472.
* src/zsoelim.l (zsoelim_open_file): Attempt to handle bare .so
includes using look_for_file.
* src/Makefile.am (zsoelim_SOURCES): Add globbing.c, globbing.h, and
util.c.
Sun Nov 16 23:34:02 GMT 2008 Colin Watson <cjwatson@debian.org>
Improve handling of systems without internationalisation support.
Reported by Mike Frysinger.
* include/manconfig.h.in (locale_changed): New macro.
* src/man.c (main), src/whatis.c (main): Use it.
* src/manconv.c (check_preprocessor_encoding, try_iconv): Declare
only if HAVE_ICONV is defined.
(manconv): If HAVE_ICONV is not defined, supply a replacement that
just passes data straight through.
* src/whatis.c (simple_convert): Declare only if HAVE_ICONV is
defined and supply a macro replacement otherwise, since in the
latter case iconv_t is not defined.
Sun Nov 16 18:40:09 GMT 2008 Colin Watson <cjwatson@debian.org>
* manual/misc.me (Credits): Update with contributors of
non-translation patches since I started maintaining man-db;
mention man/THANKS for translator credits. Probably still missing
some people, as ever ...
Sun Nov 16 18:16:55 GMT 2008 Chusslove Illich <caslav.ilic@gmx.net>
* src/encodings.c (directory_table): Add Serbian Latin ->
ISO-8859-2.
* src/lexgrog.l (sr_name): Add another possible translation.
(srlatin_name): Add.
Sun Nov 16 18:00:23 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (main), src/whatis.c (main): Tokenise LANGUAGE properly
rather than only taking the first two characters of each entry.
Based on a suggestion from Chusslove Illich in Savannah patch
#6658.
Sun Nov 16 17:57:57 GMT 2008 Chusslove Illich <caslav.ilic@gmx.net>
* src/manp.c (add_nls_manpath): Check that modifiers match if set
(Savannah patch #6658).
Wed Nov 12 12:32:17 GMT 2008 Arif E. Nugroho <arif_endro@yahoo.com>
* po/id.po: New from Translation Project.
* po/LINGUAS: Add id.
* man/THANKS: Add translator credit.
Sun Nov 9 16:23:12 GMT 2008 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
Sun Oct 26 12:44:42 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/manp.c (create_pathlist): Eliminate duplicates due to
symlinks. Reported by Mike Frysinger.
* src/man.c (main): Emit "manpath search path" debugging message
before calling create_pathlist.
* docs/NEWS: Document this.
Sun Oct 26 11:58:37 GMT 2008 Colin Watson <cjwatson@debian.org>
Support LINGUAS environment variable to control installation of
localised manual pages. Reported by Mike Frysinger.
* m4/man-po4a.m4, m4/man-linguas.m4: New files.
* configure.ac: Call MAN_PO4A instead of inline code. Remove NLS and
PO4A Automake conditionals, no longer needed. Call MAN_LINGUAS.
* man/LINGUAS, man/LINGUAS.po4a: New files.
* man/Makefile.am (SUBDIRS): Set to $(MAN_SUBDIRS) rather than
computing the list here.
(DIST_SUBDIRS): Add, since we no longer use Automake conditionals.
* docs/NEWS: Document this.
Sun Oct 26 01:53:36 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Check for lzma.
* include/comp_src.h.in (comp_list): Add lzma.
* include/manconfig.h.in: Define UNLZMA.
* docs/NEWS: Document this.
Wed Oct 1 12:19:29 BST 2008 Colin Watson <cjwatson@debian.org>
* docs/TODO: Remove entry about Berkeley DB's error handling, fixed
in Berkeley DB 4.1 (see http://bugs.debian.org/180379).
Tue Sep 30 16:39:19 BST 2008 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Norwegian Bokmål and
Norwegian Nynorsk (following a comment on
http://www.linuxfromscratch.org/lfs/view/development/chapter06/man-db.html).
Sun Sep 28 11:35:18 BST 2008 Colin Watson <cjwatson@debian.org>
* manual/files.me (NLS manual pages): Describe automatic detection
of manual pages encoded in UTF-8. Recommend that character set
components not be used in directory names.
Sun Sep 28 11:30:40 BST 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Check for GDBM before Berkeley DB.
* docs/man-db.lsm: List GDBM before Berkeley DB.
* manual/db.me (Database types): Explain why GDBM is preferred.
* manual/intro.me (Arguments to configure), README (Non-generic
arguments to configure): Update --with-db description.
* docs/NEWS: Document this, with a note to distributors on upgrade
handling.
Thu Sep 18 02:00:54 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/apropos.man1 (AUTHOR), man/man1/manpath.man1 (AUTHOR),
man/man1/whatis.man1 (AUTHOR), man/man8/catman.man8 (AUTHOR): Add
my name.
Thu Sep 18 01:42:34 BST 2008 Colin Watson <cjwatson@debian.org>
Call zsoelim as an internal function rather than as an external
process, to improve performance.
* src/Makefile.am (man_SOURCES): Add zsoelim.h and zsoelim.l.
(zsoelim_SOURCES): Add zsoelim.h and zsoelim_main.c.
* src/man.c (make_roff_command): Call zsoelim_stdin as an internal
function.
* src/zsoelim.l (open_file): Rename to ...
(zsoelim_open_file): ... this. Make external. Update all callers.
(parse_file): Rename to ...
(zsoelim_parse_file): ... this. Make external. Update all callers.
(zsoelim_stdin): New function.
(parse_opt, main): Move to ...
* src/zsoelim_main.c: ... here. New file.
* src/zsoelim.h: New file.
* docs/NEWS: Document this.
* man/man1/zsoelim.man1 (AUTHOR): Add my name.
Mon Sep 8 09:21:34 BST 2008 Colin Watson <cjwatson@debian.org>
Call manconv as an internal function rather than as an external
process, to improve performance. Indirectly suggested by Dr. Werner
Fink in Savannah bug #24043.
* src/Makefile.am (whatis_LDADD): Add $(LIBCOMPRESS).
(lexgrog_SOURCES, man_SOURCES, mandb_SOURCES, whatis_SOURCES): Add
manconv.c and manconv.h.
(manconv_SOURCES): Add manconv.h and manconv_main.c.
* src/encodings.c (manconv_stdin, free_manconv_codes): New
functions.
(add_manconv): Call manconv as an internal function.
* src/manconv.c (try_iconv): Take the target code as an argument
rather than using a global variable.
(manconv): New function, split out of main.
(split_codes, parse_opt, main): Move to ...
* src/manconv_main.c: ... here. New file.
* src/manconv.h: New file.
* docs/NEWS: Document this.
Mon Sep 8 09:09:06 BST 2008 Colin Watson <cjwatson@debian.org>
Add support for freeing command_function data.
* lib/pipeline.c (command_new_function): Add free_func argument.
(command_dup): Copy it.
(pipeline_connect): Adjust command_new_function call.
(pipeline_start): Free command_function data before exiting.
(pipeline_wait): Free command_function data while cleaning up
pipeline.
* lib/pipeline.h: Add command_function_free_type typedef.
(struct command [struct command_function]): Add free_func member.
(command_new_function): Update prototype.
* lib/decompress.c (decompress_open, decompress_fdopen): Adjust
command_new_function calls.
Sun Sep 7 15:26:25 BST 2008 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Remove premature optimisation that
sometimes caused us to write incomplete output.
* src/encodings.c (add_manconv): Always use manconv even if iconv
could theoretically do the job, as manconv has slightly more
permissive behaviour that is generally more suitable for
converting manual page source (Debian bug #498082).
Sun Aug 31 18:38:34 BST 2008 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Update.
Sun Aug 31 18:17:14 BST 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20080801.
Sun Aug 17 16:42:43 BST 2008 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (main), src/catman.c (main), src/globbing_test.c
(main), src/lexgrog_test.c (main), src/man.c (main), src/manconv.c
(main), src/mandb.c (main), src/manpath.c (main), src/whatis.c
(main), src/zsoelim.l (main): Suppress locale warning if being
called by another man-db program (Debian bug #494989).
Sun Aug 17 00:27:07 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (tmp_cat_fd, man_modtime, discard_stderr): Move
definitions outside MAN_CATS guard; these are needed by catman
handling and (in the case of discard_stderr) manual page
formatting functions as well as cat handling in man itself
(Savannah bug #24044).
Thu Aug 7 02:12:09 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (display): If we fail to decompress man_file and it
matters (i.e. we aren't just displaying a stray cat), then emit an
error message and return early (Coverity CID #5, #6).
Wed Aug 6 22:36:48 BST 2008 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (infoalloc): Move to ...
* libdb/db_storage.h (infoalloc): ... here (as inline function).
Include "xalloc.h" for this.
(dblookup_all, dblookup_exact, gripe_lock, gripe_corrupt_data):
Stop declaring inline.
* src/security.h (drop_effective_privs, regain_effective_privs):
Stop declaring inline.
Wed Aug 6 22:23:41 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (display): If display_to_stdout is set, assert that
man_file is non-NULL; all the stray-cat code paths ensure that
neither troff nor recode is set by this point (Coverity CID #5).
Wed Aug 6 21:40:37 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (manopt_to_env): Duplicate options assigned to elements
of argv, and free the copy of manopt before returning. This isn't
really a bug as such, but it appeases Coverity CID #22.
Thu Jul 31 02:10:06 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (get_section_list): Fix leak of get_sections return
value if the configuration file contains no SECTIONS directives
(Coverity CID #21).
Thu Jul 31 02:03:46 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (try_section): Free info and info_buffer if there is a
failure before adding a candidate (Coverity CID #24).
Thu Jul 31 01:41:17 BST 2008 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_nls_manpath): Copy manpathlist to omanpathlist
after the initial locale checks, to avoid memory leaks (Coverity
CID #20).
(get_manpath): Free return value of add_system_manpath (Coverity
CID #18) and guess_manpath (Coverity CID #19) when they're simply
interpolated into another string.
Thu Jul 31 01:18:59 BST 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (display): Check for failure to open the preformatted
cat file (Coverity CID #14).
Thu Jul 31 01:01:13 BST 2008 Colin Watson <cjwatson@debian.org>
* src/util.c (lang_dir): Free ld if returning xstrdup ("C") instead
(Coverity CID #17).
Thu Jul 31 00:55:36 BST 2008 Colin Watson <cjwatson@debian.org>
* lib/pathsearch.c (pathsearch): Free path if returning early due to
being given a qualified name (Coverity CID #16).
Thu Jul 31 00:51:58 BST 2008 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_pump): Free known_source before returning
(Coverity CID #15).
Thu Jul 31 00:47:43 BST 2008 Colin Watson <cjwatson@debian.org>
* src/whatis.c (word_fnmatch): Free lowwhatis on return paths
(Coverity CID #25).
Thu Jul 31 00:40:29 BST 2008 Colin Watson <cjwatson@debian.org>
* src/catman.c (parse_for_sec): Fix initialisation of initial_bit
(Coverity CID #28).
Tue Jul 15 15:58:24 BST 2008 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Sat Jul 12 16:47:11 BST 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.3-pre1.
* po/man-db.pot, po/*.po: Update.
Sat Jul 12 16:43:07 BST 2008 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Start 2.5.3.
Sat Jul 5 11:33:16 BST 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20080701.
Mon Jun 9 13:47:50 BST 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20080601.
Mon Jun 9 09:31:04 BST 2008 Yuri Kozlov <kozlov.y@gmail.com>
* man/po4a/po/ru.po: Update.
Tue Jun 3 09:54:17 BST 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/po/ru.po: Update with msgmerge.
Tue Jun 3 09:53:59 BST 2008 Colin Watson <cjwatson@debian.org>
* man/ru/translator.add: Add dummy file.
Tue Jun 3 00:07:47 BST 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/po/ru.po: New from Translation Project (thanks, Yuri
Kozlov).
* configure.ac (AC_CONFIG_FILES): Add man/ru/Makefile.
* man/Makefile.am (MAYBE_PO4A_LINGUAS): Add ru.
* man/ru/Makefile.am: New file.
* man/po4a/Makefile.am (POFILES): Add po/ru.po.
* man/po4a/po4a.cfg (po4a_langs): Add ru.
* man/THANKS: Credit Yuri Kozlov with man/ru as well as ru.po.
* .bzrignore: Add man/ru/man1, man/ru/man5, and man/ru/man8.
Sun Jun 1 16:40:12 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man8/mandb.man8 (SYNOPSIS): Document -t (thanks, Yuri Kozlov;
Debian bug #483951).
Sun Jun 1 04:01:12 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/whatis.man1 (SYNOPSIS): Document -v (thanks, Yuri Kozlov;
Debian bug #483862).
Fri May 30 00:11:15 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/manconv.man1 (SYNOPSIS), man/man1/manpath.man1
(SYNOPSIS): Document -h and -V here as well as in OPTIONS (thanks,
Yuri Kozlov; Debian bug #483589).
Sun May 25 18:51:47 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (SYNOPSIS): Fix minor formatting error in -w|-W
synopsis.
Sun May 25 18:46:55 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (SYNOPSIS): Restructure to include all options
from the OPTIONS section and to use approximately the same order.
Thanks to Yuri Kozlov; Debian bugs #482424, #482791, #482792, and
#482810.
Sun May 25 18:29:28 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/lexgrog.man1 (SYNOPSIS): Correct -s to -E.
(OPTIONS): Correct -e to -E.
Thanks to Yuri Kozlov; Debian bug #481226.
Sun May 25 19:23:00 CEST 2008 Yuri Kozlov <kozlov.y@gmail.com>
* man/man1/apropos.man1 (SYNOPSIS): Document -v (Debian bug
#480678).
Mon May 5 09:53:19 BST 2008 Colin Watson <cjwatson@debian.org>
* lib/cleanup.c: #include <string.h> for memset.
Mon May 5 02:34:52 BST 2008 Colin Watson <cjwatson@debian.org>
* docs/man-db.lsm: Update to 2.5.2.
* docs/HACKING: Note requirement for docs/man-db.lsm update just
before release.
Mon May 5 02:11:38 BST 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.2.
* po/man-db.pot, po/*.po: Update.
Mon May 5 02:07:00 BST 2008 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document previous commit.
Mon May 5 01:39:22 BST 2008 Colin Watson <cjwatson@debian.org>
Fix jless support to avoid breaking less (Debian bug #217519).
* src/encodings.c (less_charset_table): Add jless_charset members.
Move EUC-JP less_charset to jless_charset, falling back to iso8859
for less. Use the more explicit japanese-ujis rather than ja.
* src/encodings.c (get_jless_charset): New function.
* src/encodings.h (get_jless_charset): Add prototype.
* src/man.c (make_roff_command): Set JLESSCHARSET to the return
value of get_jless_charset if non-NULL.
Mon May 5 01:06:56 BST 2008 Colin Watson <cjwatson@debian.org>
Clean up some loose ends of Chinese support (thanks, Wu Songhai;
Debian bug #354321).
* src/encodings.c (directory_table): Add zh_SG, defaulting to the
GBK encoding.
(charset_alias_table): Map EUCTW to EUC-TW.
(charset_table): Add EUC-TW, defaulting to the nippon driver.
(compatible_encodings): Recognise EUC-TW encoding.
Mon May 5 00:05:19 BST 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20080501.
Sun May 4 23:16:59 BST 2008 Colin Watson <cjwatson@debian.org>
* lib/cleanup.c (sighandler, trap_signal), lib/pipeline.c
(pipeline_start, pipeline_pump): Zero sigaction structures before
using them. (I believe we set all required fields anyway; this is
just an extra safety catch.)
Mon Apr 28 09:54:48 BST 2008 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Mon Apr 28 09:38:53 BST 2008 Benno Schulenberg <benno@vertaalt.nl>
* po/nl.po: Update from Translation Project.
Sun Apr 27 22:41:54 BST 2008 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: Update from Translation Project.
Sun Apr 27 11:47:19 BST 2008 Colin Watson <cjwatson@debian.org>
* po/man-db.pot, po/*.po: Update (sync with 2.5.2-pre2 tarball).
Sun Apr 27 11:27:46 BST 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.2-pre2.
* po/man-db.pot, po/*.po: Update.
Sun Apr 27 11:24:24 BST 2008 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_sigchld): assert is not
async-signal-safe, so avoid calling it in a signal handler and use
an if guard instead (Ubuntu bug #221635, although exactly why the
assertion is failing there is unclear).
Sun Apr 27 01:40:32 BST 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20080401.
Sun Apr 27 01:32:58 BST 2008 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (ko_name): Add another possible translation, seen in
hdparm(1).
Sun Apr 27 01:31:47 BST 2008 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Don't handle //IGNORE unless this is
the last encoding to be tried.
* src/encodings.c (add_manconv): Append //IGNORE to the target
encoding.
* docs/NEWS: Document this.
Sun Apr 27 00:54:05 BST 2008 Colin Watson <cjwatson@debian.org>
Don't emit encoding conversion errors in mandb's quiet mode (Debian
bug #473862).
* src/manconv.c (options, parse_opt): Accept -q/--quiet.
(try_iconv): Suppress iconv errors under --quiet.
* man/man1/manconv.man1 (SYNOPSIS, OPTIONS): Document --quiet.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/pl.po: Update.
* po/man-db.pot, po/*.po: Update.
* src/encoding.c (add_manconv): Pass -q to manconv if this is mandb
in quiet mode.
Sat Apr 26 14:34:26 BST 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (DESCRIPTION): Bring list of conventional
section names more into sync with man-pages(7).
* man/po4a/po/man-db-manpages.pot, man/po4a/po/pl.po: Update.
Sat Apr 26 13:51:27 BST 2008 Colin Watson <cjwatson@debian.org>
* man/de/man1/apropos.man1, man/de/man1/man.man1,
man/de/man1/manpath.man1, man/de/man1/whatis.man1,
man/de/man1/zsoelim.man1, man/de/man5/manpath.man5,
man/de/man8/catman.man8, man/es/man1/man.man1,
man/fr/man1/man.man1, man/it/man8/accessdb.man8: Fix various small
mistakes that caused warnings from groff.
Sun Mar 30 20:39:34 BST 2008 Benno Schulenberg <benno@vertaalt.nl>
* po/nl.po: Update from Translation Project.
Mon Mar 17 19:29:43 GMT 2008 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Fri Mar 14 14:24:58 GMT 2008 Colin Watson <cjwatson@debian.org>
Persuade 'make distcheck' to pass again.
* man/po4a/po4a.cfg: Use paths relative to $(srcdir) and
$(builddir).
* man/po4a/Makefile.am (PO4A_ARGS): Define srcdir and builddir
variables.
(all-local, update-po, clean-local): Pass $(PO4A_ARGS) to $(PO4A).
Read po4a.cfg from $(srcdir).
* man/po4a/*.pl.add: Consolidate into ...
* man/pl/translator.add: ... this.
* man/Rules.man (dist-hook): Only do anything if PO4A_LINGUA is not
set to yes.
(distclean-hook): Remove man1, man5, and man8 if PO4A_LINGUA is
set to yes.
* man/pl/Makefile.am (PO4A_LINGUA): Set to yes.
(EXTRA_DIST): Distribute translator.add.
* .bzrignore: Ignore man/pl/man1, man/pl/man5, and man/pl/man8,
rather than just some files within those directories.
Fri Mar 14 01:06:42 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (Controlling formatted output): Change
'soft-hyphen' string to 'softhyphen' to work around Debian bug
#470849.
* man/po4a/po/man-db-manpages.pot, man/po4a/po/pl.po: Update.
Fri Mar 14 00:57:37 GMT 2008 Colin Watson <cjwatson@debian.org>
Build Polish manual pages. The method used scales rather poorly and
will probably need to be revisited at some point.
* configure.ac (AC_CONFIG_FILES): Add man/pl/Makefile.
* man/Makefile.am (MAYBE_PO4A_LINGUAS): New, containing pl.
(SUBDIRS): Add $(MAYBE_PO4A_LINGUAS) if po4a is present.
* man/pl/Makefile.am: New file.
* man/po4a/Makefile.am (POFILES): New, containing po/pl.po.
(EXTRA_DIST): Add $(POFILES).
(all-local, clean-local): New rules to generate and remove
translated documents.
(update-po): Add --no-translations option.
* man/po4a/po4a.cfg (po4a_langs): Replace zh_CN with pl. (zh_CN can
come back once it has a translation.)
* man/THANKS: Credit Robert Luberda with man/pl as well as pl.po.
* .bzrignore: Add man/pl/man1/*.man1, man/pl/man5/*.man5, and
man/pl/man8/*.man8.
* man/po4a/po/man-db-manpages.pot: Update.
Fri Mar 14 00:55:15 GMT 2008 Robert Luberda <robert@debian.org>
* man/po4a/po/pl.po: New from Translation Project.
* man/po4a/accessdb.pl.add, man/po4a/apropos.pl.add,
man/po4a/catman.pl.add, man/po4a/lexgrog.pl.add,
man/po4a/man.pl.add, man/po4a/manconv.pl.add,
man/po4a/mandb.pl.add, man/po4a/manpath.pl.add,
man/po4a/whatis.pl.add, man/po4a/zsoelim.pl.add: New files.
Thu Mar 13 09:56:53 GMT 2008 Robert Luberda <robert@debian.org>
* po/pl.po: Update from Translation Project.
Wed Mar 12 18:29:32 GMT 2008 Yuri Kozlov <kozlov.y@gmail.com>
* po/ru.po: Update from Translation Project.
Wed Mar 12 13:52:02 GMT 2008 Benno Schulenberg <benno@vertaalt.nl>
* po/nl.po: Update from Translation Project.
Wed Mar 12 12:30:09 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (parse_opt): Only set html_pager if arg is non-NULL.
* docs/NEWS: Document this.
Wed Mar 12 12:20:50 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Check for po4a. Define an Automake conditional based
on whether it is present.
* man/Makefile.am (SUBDIRS): Add the po4a subdirectory only if the
po4a program is present.
* man/po4a/Makefile.am (update-po): Use PO4A variable.
Wed Mar 12 08:53:48 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/Makefile.am (update-po): New target.
Wed Mar 12 08:53:32 GMT 2008 Robert Luberda <robert@debian.org>
* man/man1/apropos.man1 (OPTIONS, FILES), man/man1/man.man1
(ENVIRONMENT, FILES), man/man1/manconv.man1 (OPTIONS),
man/man1/manpath.man1 (OPTIONS, FILES), man/man1/whatis.man1
(OPTIONS, EXIT STATUS, FILES), man/man8/mandb.man8 (OPTIONS):
Consolidate various nearly-identical strings.
* man/po4a/po/man-db-manpages.pot: Update.
Tue Mar 11 10:41:05 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.2-pre1 (really this time).
Tue Mar 11 10:39:45 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac (AC_CONFIG_FILES): Add man/po4a/Makefile.
* man/Makefile.am (SUBDIRS): Add po4a.
* man/po4a/Makefile.am: New file. Distribute po4a.cfg and
po/man-db-manpages.pot.
Tue Mar 11 10:26:49 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.2-pre1.
* po/man-db.pot, po/*.po: Update.
Mon Mar 10 19:42:19 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (Controlling formatted output): Quote %pager,
since it may expand to multiple words.
Mon Mar 10 16:07:11 GMT 2008 Colin Watson <cjwatson@debian.org>
* docs/NEWS: More updates for 2.5.2.
Mon Mar 10 16:00:15 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/po/man-db.pot: Rename to ...
* man/po4a/po/man-db-manpages.pot: ... this, so that the translation
domain name stops clashing with that used for program translations
(per Benno Schulenberg).
* man/po4a/po4a.cfg (po4a_paths): Adjust for rename.
Mon Mar 10 01:05:57 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/Rules.man (.man1.1, .man8.8): Substitute name of manual page
being processed as %program%.
* man/man1/apropos.man1 (OPTIONS), man/man1/man.man1 (Finding manual
pages), man/man1/whatis.man1 (OPTIONS): Consolidate
nearly-identical descriptions of --locale using %program% (thanks,
Robert Luberda).
* man/po4a/po/man-db.pot: Update.
Tue Mar 4 09:24:40 GMT 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to 20080301.
Tue Mar 4 09:18:43 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (options): Force --extension to appear after --sections
in --help output.
Mon Mar 3 21:46:36 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/po/man-db.pot: Update.
Sun Mar 2 12:41:13 GMT 2008 Colin Watson <cjwatson@debian.org>
* po/man-db.pot, po/*.po: Update.
Sun Mar 2 12:37:43 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (options): Describe --recode's argument as ENCODING, not
CODE (thanks, Benno Schulenberg).
Sun Mar 2 12:35:28 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (options), src/manpath.c (options), src/whatis.c
(options): Use a unified description for --systems (thanks, Benno
Schulenberg).
Sun Mar 2 12:29:57 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/manconv.c (args_doc, options): Describe argument to -f as
"CODE[:...]" rather than "CODE:..." (thanks, Benno Schulenberg).
Sun Mar 2 12:28:40 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (OPTIONS): Reorganise into subsections, with
options listed in the same order as in 'man --help' output.
* src/man.c (options, parse_opt): Rearrange a few options slightly
so that the ordering makes more sense.
Sun Mar 2 11:56:48 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1, src/encodings.c, src/encodings.h,
src/lexgrog_test.c: Update copyright notices.
Sun Mar 2 11:03:21 GMT 2008 Colin Watson <cjwatson@debian.org>
Improve 'man -E' to allow overriding the output encoding explicitly,
rather than implicitly (and unreliably) by changing the *roff device
(Debian bug #466396).
* src/encodings.c (device_table): Add stub entries for troff
devices.
(is_roff_device): New function.
* src/encodings.h (is_roff_device): Add prototype.
* src/man.c (options): Change description of -E to allow general
encoding selection.
(parse_opt): Only assign the argument of -E to roff_device if it
is actually a *roff device; otherwise it is presumed to be a true
character encoding and stored in want_encoding. Remove
different_encoding, since testing whether want_encoding is set
supersedes that.
(make_roff_command): If want_encoding is set and is not a *roff
device, recode to it rather than to the locale's encoding.
(display, try_section, display_filesystem, display_database): Test
want_encoding rather than different_encoding.
* man/man1/man.man1 (OPTIONS): Adjust documentation of -E.
* docs/NEWS: Document this.
* src/lexgrog_test.c (options): Bring description of -E into sync
with man.
Sat Mar 1 22:14:43 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_roff_encoding): In the CJK UTF-8 special
case, check the canonicalised encoding in order that locale
specifications such as "zh_CN.utf8" work (Debian bug #467249).
Fri Feb 29 09:59:23 GMT 2008 Colin Watson <cjwatson@debian.org>
* autogen.sh: Run autoreconf with -f.
* tools/config.guess, tools/config.sub, tools/depcomp,
tools/install-sh, tools/ylwrap: Update.
Thu Feb 28 10:47:22 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Terminate MAN_NAME at .ie or .if conditionals
(Debian bug #467444).
Sun Feb 17 17:17:16 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/manp.c (def_path): Fix brace indentation.
Sun Feb 17 17:13:55 GMT 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Import the strsignal module.
* lib/pipeline.c (pipeline_wait): Call strsignal rather than
xstrsignal.
* lib/xstrsignal.c: Remove.
* lib/README (xstrsignal): Remove.
* lib/Makefile.am (libman_a_SOURCES): Remove xstrsignal.c.
* include/manconfig.h.in (xstrsignal): Remove.
* m4/man-strsignal.m4: Remove.
* configure.ac (MAN_FUNC_STRSIGNAL): Remove.
Sun Feb 17 16:59:22 GMT 2008 Colin Watson <cjwatson@debian.org>
* Makefile.in, aclocal.m4, config.h.in, configure, docs/Makefile.in,
gnulib, lib/Makefile.in, libdb/Makefile.in, man/Makefile.in,
man/de/Makefile.in, man/es/Makefile.in, man/fr/Makefile.in,
man/it/Makefile.in, man/ja/Makefile.in, manual/Makefile.in,
src/Makefile.in, tools/Makefile.in: Upgrade to Automake 1.10.1 and
Gnulib 20080201.
Mon Feb 4 08:28:33 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man_db.conf.in: Make /usr/local/share/man mandatory rather
than /usr/local/man (thanks, Reuben Thomas; Debian bug #463892).
Fri Feb 1 09:01:34 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/replace.sin.in: Strip off ".if !'po4a'hide' " from input
manual pages. It's a no-op except for po4a's purposes, and
removing it helps non-groff manual page renderers.
Mon Jan 28 08:54:47 GMT 2008 Colin Watson <cjwatson@debian.org>
* docs/man-db.lsm: Update to 2.5.1.
Mon Jan 28 08:47:51 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.1.
* po/man-db.pot, po/*.po: Update.
Sun Jan 27 22:48:32 GMT 2008 Colin Watson <cjwatson@debian.org>
Support Korean when configured with support for the multibyte groff
patch (thanks, Hansun Lee; Ubuntu bug #176896).
* src/encodings.c (compatible_encodings): Allow EUC-KR -> UTF-8.
(get_roff_encoding): Handle ko_KR.UTF-8 via devutf8.
Sun Jan 27 13:42:31 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_join): Initialise source, buffer, buflen,
bufmax, line_cache, and peek_offset.
Sun Jan 27 13:37:17 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/pipeline.h (struct pipeline): Add ignore_signals member.
* lib/pipeline.c (pipeline_new): Initialise ignore_signals to 1.
(pipeline_join): Set ignore_signals if either input pipeline has
it set.
(pipeline_start): Only ignore SIGINT and SIGQUIT if ignore_signals
is set.
(pipeline_wait): Only restore SIGINT and SIGQUIT if ignore_signals
is set.
* lib/decompress.c (decompress_open, decompress_fdopen): Set
ignore_signals to 0 so that SIGINT and SIGQUIT are not ignored
just because a decompression process is running (Debian bug
#462276).
* docs/NEWS: Document this.
Thu Jan 24 17:12:24 GMT 2008 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (INTERRUPTED): Remove.
* src/man.c (int_handler): Remove; this is useless and
non-signal-safe.
(main): Don't set SIGINT to int_handler.
Thu Jan 17 09:13:04 GMT 2008 Ming Hua <minghua-guest@users.alioth.debian.org>
* po/zh_CN.po: Update from Translation Project.
Tue Jan 15 18:45:22 GMT 2008 Yuri Kozlov <kozlov.y@gmail.com>
* po/ru.po: Update from Translation Project.
* man/THANKS: Update e-mail address.
Tue Jan 15 14:37:15 GMT 2008 Colin Watson <cjwatson@debian.org>
* m4/man-bdb.m4: Add WITH-DB option; make ACTION-IF-FOUND optional;
define BDB_H and BTREE.
* configure.ac: Make Berkeley DB checks more concise using the
above.
Tue Jan 15 12:31:12 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Remove unused AC_HEADER_STDC.
Tue Jan 15 08:42:27 GMT 2008 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Tue Jan 15 08:39:56 GMT 2008 Benno Schulenberg <benno@vertaalt.nl>
* po/nl.po: Update from Translation Project.
Tue Jan 15 00:01:39 GMT 2008 Colin Watson <cjwatson@debian.org>
* m4/man-compress-lib.m4: New function, MAN_COMPRESS_LIB: like
AC_CHECK_LIB but adds the library to LIBCOMPRESS rather than LIBS.
* configure.ac: Use it for -lz.
* src/Makefile.am (lexgrog_LDADD, man_LDADD, manconv_LDADD,
mandb_LDADD, zsoelim_LDADD): Add $(LIBCOMPRESS).
Mon Jan 14 15:29:55 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Don't check for strerror; Gnulib supplies a
replacement now.
Mon Jan 14 13:59:18 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Set the new file's mode to DBMODE in order to
try to defend against strange problems with databases being left
world-unreadable (Debian bug #430800).
Mon Jan 14 00:55:22 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/po4a/po/man-db.pot: Update.
Mon Jan 14 00:16:57 GMT 2008 Colin Watson <cjwatson@debian.org>
* Version: 2.5.1-pre2.
* po/man-db.pot, po/*.po: Update.
Mon Jan 14 00:00:21 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/lexgrog_test.c (parse_opt): Use argp_error rather than
error/argp_usage. Suggested by Ivan Shmakov.
* src/man.c (parse_opt): Likewise.
* src/manconv.c (parse_opt): Likewise.
Sun Jan 13 23:35:27 GMT 2008 Ivan Shmakov <oneingray@gmail.com>
Add a command-line option to man to enable groff warnings.
* src/man.c (enum opts, struct string_llist): New types.
(default_roff_warnings, roff_warnings): Set defaults.
(options, parse_opt): Accept --warnings.
(make_roff_command): Add warnings to groff command line.
* man/man1/man.man1 (SYNOPSIS, OPTIONS): Document --warnings.
* docs/NEWS: Document this.
Thu Jan 10 09:24:19 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (local_man_loop): Guess language based on absolute path
to provided file, rather than relative (Debian bug #460014).
Mon Jan 7 17:28:54 GMT 2008 Colin Watson <cjwatson@debian.org>
* gnulib/lib/xmalloc.patch: Add commentary.
Mon Jan 7 15:30:56 GMT 2008 Yuri Kozlov <kozlov.y@gmail.com>
* po/ru.po: Update from Translation Project.
Mon Jan 7 11:38:19 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/replace.sin: Rename to ...
* man/replace.sin.in: ... this.
* configure.ac (AC_CONFIG_FILES): Generate man/replace.sin.
* man/Rules.man (CLEANFILES, replace.sed, .man1.1, .man5.5,
.man8.8): Generate replace.sed at 'make' time so that
$(config_file) is substituted properly. Reported by Peter
Breitenlohner.
* .bzrignore: Update.
Mon Jan 7 11:14:04 GMT 2008 Peter Breitenlohner <peb@mppmu.mpg.de>
* manual/Makefile.am: Use soelim with -I$(srcdir).
* man/Rules.man (mandir): Append the language so that Automake can
handle translated manual pages.
(install-data-local, uninstall-local): Removed in favor of rules
generated by Automake.
(CLEANFILES, dist-hook): Go back to using man*_MANS.
(all-am): Remove explicit dependencies.
* man/Makefile.am, man/de/Makefile.am, man/es/Makefile.am,
man/fr/Makefile.am, man/it/Makefile.am, man/ja/Makefile.am: Go
back to using man*_MANS.
* man/man8/accessdb.man8, man/fr/man8/accessdb.man8: Fix typo (-V,
not -v).
* manual/Makefile.am (.pp.ps): Use groff -Tps, not -Tdvi.
* src/Makefile.am (install-data-hook): Don't (try to) overwrite
existing config files.
* src/Makefile.am (bin_SCRIPTS, all-am, install-exec-hook,
uninstall-hook): Remove apropos from bin_SCRIPTS, explicitly
depend on it from all-am, and manually create a whatis->apropos
symlink at install time; installing the symlink from the build
directory using bin_SCRIPTS would install a second copy (not
stripped by "make install-strip").
Mon Jan 7 09:54:12 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Stop checking for memory.h (not used) and limits.h
(guaranteed by C89).
* lib/hashtable.c, libdb/db_ver.c, src/convert_name.c,
src/descriptions.c, src/filenames.c: Remove unnecessary #include
<stdio.h>.
* libdb/db_delete.c, libdb/db_lookup.c, libdb/db_store.c,
src/manpath.c: Remove unnecessary #include <assert.h>.
* libdb/mydbm.h, src/catman.c, src/man.c, src/manpath.c: Include
<limits.h> unconditionally.
* src/convert_name.c: Remove unnecessary #include <unistd.h>.
* src/man.c: Remove unnecessary #include <sys/file.h> and
<sys/wait.h>.
* src/manpath.c: Remove unnecessary #include <termios.h>.
* src/straycats.c: Remove unnecessary #include <fcntl.h>.
* src/ult_src.c: Remove S_ISLNK conditionals; Gnulib's <sys/stat.h>
wrapper deals with this.
* lib/linelength.c (get_line_length): Remove trailing newline from
message passed to perror.
Mon Jan 7 03:21:49 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/gettext.h: Remove; now provided by Gnulib.
* lib/Makefile.am (libman_a_SOURCES): Remove gettext.h.
* lib/README: Remove gettext.h.
Mon Jan 7 03:11:08 GMT 2008 Colin Watson <cjwatson@debian.org>
* include/comp_src.h.in: Update header comment.
Mon Jan 7 02:52:25 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/util.c (mkdbname): Replace with ...
* include/manconfig.h.in (mkdbname): ... a simpler macro.
Mon Jan 7 02:27:59 GMT 2008 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c, libdb/db_storage.h, libdb/mydbm.h, src/catman.c,
src/check_mandirs.c, src/convert_name.c, src/globbing.c,
src/man.c, src/man.h, src/mandb.c, src/manp.c, src/security.c,
src/security.h, src/whatis.c: Replace __inline__ with inline
everywhere. Autoconf's handling of the latter is sufficient.
* include/manconfig.h.in: Remove __inline and __inline__
definitions.
Mon Jan 7 02:12:26 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Automatically detect the Debian multibyte patch to
groff.
Mon Jan 7 01:14:39 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (options, parse_opt): Accept -d/--debug.
* src/lexgrog_test.c (options, parse_opt): Likewise.
* src/zsoelim.l (options, parse_opt): Likewise.
* docs/NEWS: Document this.
Mon Jan 7 01:08:39 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/zsoelim.l (options): Fix incorrect description of -C.
Sun Jan 6 15:01:08 GMT 2008 Colin Watson <cjwatson@debian.org>
sigaction is specified as non-interruptible; there is no need to
wrap it with EINTR detection.
* lib/xsigaction.c: Remove.
* include/manconfig.h.in (xsigaction): Remove prototype.
* lib/Makefile.am (libman_a_SOURCES): Remove xsigaction.c.
* lib/README: Remove xsigaction.c.
* lib/cleanup.c (sighandler, trap_signal, untrap_signal): Call
sigaction rather than xsigaction.
* lib/pipeline.c (pipeline_start, pipeline_wait,
pipeline_install_sigchld, pipeline_pump): Call sigaction rather
than xsigaction.
Sun Jan 6 14:46:36 GMT 2008 Colin Watson <cjwatson@debian.org>
* po/nl.po: Update with msgmerge.
Sun Jan 6 14:45:09 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/Rules.man, man/de/Makefile.am, man/es/Makefile.am,
man/fr/Makefile.am, man/it/Makefile.am, man/ja/Makefile.am: Use
LINGUA rather than LANGUAGE to name the manual page language, as
setting LANGUAGE causes 'make' output to be translated.
Sun Jan 6 14:34:15 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/de.UTF-8, man/es.UTF-8, man/fr.UTF-8, man/it.UTF-8,
man/ja.UTF-8: Rename to ...
* man/de, man/es, man/fr, man/it, man/ja: ... these.
* .bzrignore, configure.ac, man/de/Makefile.am, man/es/Makefile.am,
man/fr/Makefile.am, man/it/Makefile.am, man/ja/Makefile.am,
man/po4a/po4a.cfg, man/THANKS: Adjust for new directory names.
Sun Jan 6 10:20:19 GMT 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Upgrade to Debian 20080104-1. Import the unsetenv module.
* src/man.c, src/whatis.c: No longer #include "setenv.h".
Sun Jan 6 09:57:51 GMT 2008 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Sat Jan 5 23:15:23 GMT 2008 Ming Hua <minghua-guest@users.alioth.debian.org>
* po/zh_CN.po: Update from Translation Project (trivial).
Sat Jan 5 23:06:14 GMT 2008 Colin Watson <cjwatson@debian.org>
* configure.ac: Define NLS Automake conditional from USE_NLS.
* man/Makefile.am (SUBDIRS): Define only if NLS.
Sat Jan 5 22:54:05 GMT 2008 Colin Watson <cjwatson@debian.org>
* man/Makefile.am, man/de.UTF-8/Makefile.am,
man/es.UTF-8/Makefile.am, man/fr.UTF-8/Makefile.am,
man/it.UTF-8/Makefile.am, man/ja.UTF-8/Makefile.am: Declare
man*_files rather than man*_MANS. Using the MANS primary causes
Automake's incorrect manual page rules to be used.
* man/Rules.man (CLEANFILES, install-data-local, uninstall-local,
dist-hook): Expect man*_files rather than man*_MANS.
(all-am): Depend on $(man*_files).
* man/Rules.man (install-data-local, uninstall-local): Stop
stripping leading "man*/" from install location.
Sat Jan 5 21:49:40 GMT 2008 Colin Watson <cjwatson@debian.org>
* m4/man-gcc-warning.m4: New file.
* configure.ac: Test whether each -W option (other than -Wall) that
we want to add is supported, rather than adding it
unconditionally. Reported by Peter Breitenlohner.
Sat Jan 5 14:12:33 GMT 2008 Ivan Shmakov <oneingray@gmail.com>
* configure.ac: Test for existence of
"$srcdir/gnulib/po/Makefile.in.in" rather than just
gnulib/po/Makefile.in.in in order to work for VPATH builds. Also
reported by Peter Breitenlohner.
Fri Jan 4 16:03:57 GMT 2008 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/man.c (display): Stop -W printing blank lines for manual pages
without corresponding cat pages.
Fri Jan 4 15:59:41 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/Makefile.am: Install globbing and manconv in
$(libexecdir)/@PACKAGE@ rather than in $(pkglibdir). Reported by
Peter Breitenlohner.
Fri Jan 4 12:44:34 GMT 2008 Peter Breitenlohner <peb@mppmu.mpg.de>
* libdb/db_btree.c (dbstore): Rename basename argument to base to
avoid clashing with the function of the same name.
* libdb/db_storage.h (dbstore): Update prototype.
* libdb/mydbm.h (dbver_wr, dbver_rd), src/security.h
(do_system_drop_privs): Update prototype argument names to match
definition.
Fri Jan 4 11:52:22 GMT 2008 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/man.c: Make prompt_string const. Avoids "discards qualifier"
warning when building without NLS.
Thu Jan 3 21:39:27 GMT 2008 Colin Watson <cjwatson@debian.org>
* gnulib: Import the lib-ignore module, to have the linker ignore
unused libraries.
Wed Jan 2 23:30:33 GMT 2008 Colin Watson <cjwatson@debian.org>
* lib/decompress.c (decompress_zlib), lib/linelength.c
(get_line_length), lib/pipeline.c (passthrough), src/lexgrog.l
(find_name), src/man.c (set_term, get_term, main,
make_roff_command, format_display_and_save, format_display,
display_catman, display), src/manconv.c (main), src/zsoelim.l
(open_file): Use STDIN_FILENO, STDOUT_FILENO, and STDERR_FILENO
macros rather than calling fileno.
Wed Jan 2 16:46:46 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (main), src/catman.c (main), src/globbing_test.c
(main), src/lexgrog_test.c (main), src/man.c (main), src/manconv.c
(main), src/mandb.c (main), src/manpath.c (main), src/whatis.c
(main), src/wrapper.c (main), src/zsoelim.l (main): Bind the
"man-db-gnulib" textual domain as well as "man-db".
Wed Jan 2 00:12:48 GMT 2008 Benno Schulenberg <benno@vertaalt.nl>
* po/nl.po: New from Translation Project.
* po/LINGUAS: Add nl.
* man/THANKS: Add translator credit.
Tue Jan 1 15:36:23 GMT 2008 Colin Watson <cjwatson@debian.org>
* README, src/man.c: Update copyright years.
Tue Jan 1 15:27:51 GMT 2008 Ming Hua <minghua-guest@users.alioth.debian.org>
* po/zh_CN.po: Update.
Tue Jan 1 12:34:10 GMT 2008 Colin Watson <cjwatson@debian.org>
* src/man.c (options): Add -s as an alias for -S (Debian bug
#458499).
(parse_opt): Accept it.
(get_section_list): Allow the section list to be separated by
commas as well as colons.
* man/man1/man.man1 (OPTIONS): Document -s and comma-separation.
* docs/NEWS: Document this.
Mon Dec 31 22:13:00 GMT 2007 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Coding style): Expand.
Mon Dec 31 22:01:35 GMT 2007 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in: Remove obsolete definitions of VERSION and
DATE and declaration of ver.
* src/zsoelim.l: Remove obsolete definition of STATIC_VER.
Mon Dec 31 17:00:19 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (hash_lookup_structure): New function; same as
previous hash_lookup but returns a struct nlist * rather than the
value.
(hash_lookup): Rewrite in terms of hash_lookup_structure.
(hash_install): Use hash_lookup_structure rather than hash_lookup
(thanks, Ivan Shmakov; should fix Debian bug #374708).
Mon Dec 31 16:15:26 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (hash_install): Fix head comment to match reality
(thanks, Ivan Shmakov).
Mon Dec 31 15:45:31 GMT 2007 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): Mention that the bzr archive now
requires bzr 0.15 or later.
Mon Dec 31 15:31:08 GMT 2007 Colin Watson <cjwatson@debian.org>
* Version: 2.5.1-pre1.
* po/man-db.pot, po/*.po: Update.
Mon Dec 31 10:02:28 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (passthrough): New helper function.
(pipeline_connect): Add special (kludge) handling for zero-command
sinks.
(pipeline_pump): Add minor commentary.
* src/man.c (options, parse_opt): New -R/--recode option.
(make_roff_command): If --recode is used, suppress external
formatters and all processing filters, and force the output
encoding to the argument to --recode.
(display): If --recode is used, force display to stdout and
suppress cat pages.
(try_section, display_filesystem, display_database): Don't show
cat pages or follow .so links for --recode.
* src/util.c (lang_dir): Handle relative filenames starting with
"man/".
* man/man1/man.man1 (OPTIONS): Document --recode.
* docs/NEWS: Document this.
Fri Dec 14 10:06:21 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/whatis.c (options): Note that --exact is for apropos only.
Fri Dec 14 09:39:06 GMT 2007 Colin Watson <cjwatson@debian.org>
Convert from getopt to argp for option parsing. This invalidates
many translations, but this should be the last time; in future, a
changes in a single option will only affect translations of the help
strings for that option, not the program's entire help string.
* gnulib: Import the argp and lock modules.
* autogen.sh: Hack around a tools/config.rpath clash between Gnulib
and gettext.
* configure.ac (CFLAGS): Add -Wno-missing-field-initializers for
GCC.
* .bzrignore: Add gnulib/lib/strings.h, po/remove-potcdate.sed, and
tools/config.rpath.*.
* src/version.c: Remove in favour of argp's --version handling.
* po/POTFILES.in: Remove src/version.c.
* src/Makefile.am (accessdb_SOURCES, catman_SOURCES,
globbing_SOURCES, lexgrog_SOURCES, man_SOURCES, manconv_SOURCES,
mandb_SOURCES, manpath_SOURCES, whatis_SOURCES, wrapper_SOURCES,
zsoelim_SOURCES): Remove version.c.
* src/accessdb.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, doc, options, parse_opt,
help_filter, argp): Add.
(main): Switch from getopt_long to argp_parse. Use error (FATAL)
for database read errors rather than error (0); usage (FAIL).
* src/catman.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, options, parse_opt, argp): Add.
(catman, do_catman, parse_for_sec): Rename argp to args.
(main): Switch from getopt_long to argp_parse.
* src/globbing_test.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, options, parse_opt, argp): Add.
(main): Switch from getopt_long to argp_parse.
* src/lexgrog_test.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, doc, options, parse_opt, argp):
Add.
(main): Switch from getopt_long to argp_parse.
* src/man.c (long_options, args, usage, man_getopt): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, options, parse_opt, help_filter,
argp): Add.
(do_extern): Adjust iteration over arguments.
(main): Switch from getopt_long to argp_parse. Initialise
html_pager early for use in --help.
* src/man.h (man_getopt): Remove prototype.
* src/manconv.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, options, parse_opt, argp): Add.
(main): Switch from getopt_long to argp_parse.
* src/mandb.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, options, parse_opt, argp): Add.
(main): Switch from getopt_long to argp_parse.
* src/manpath.c (long_options, args, usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, options, parse_opt, argp): Add.
(main): Switch from getopt_long to argp_parse.
* src/whatis.c (long_options, args, apropos_usage, whatis_usage,
usage): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, apropos_doc, options, parse_opt,
apropos_argp, whatis_argp): Add.
(main): Switch from getopt_long to argp_parse. Suppress --exact
and --and options in the whatis case.
* src/zsoelim.l (long_options, args, usage, ver): Remove.
(argp_program_version, argp_program_bug_address,
argp_err_exit_status, args_doc, options, parse_opt, argp): Add.
(main): Switch from getopt_long to argp_parse.
* po/POTFILES.in: Add zsoelim.l.
Thu Dec 13 17:20:51 GMT 2007 Colin Watson <cjwatson@debian.org>
* autogen.sh: Permit gnulib-tool to be missing; in that case, just
run autoreconf.
Thu Dec 13 11:36:26 GMT 2007 Colin Watson <cjwatson@debian.org>
* configure.ac (AM_GNU_GETTEXT_VERSION): Upgrade to gettext 0.17.
* gnulib: Upgrade to Debian 20071201+dfsg-1.
* README (Copyright and licensing): New section. Explain the
implications of Gnulib components being distributed under GPL v3.
* .bzrignore: Ignore gnulib/lib/fcntl.h.
Mon Nov 26 08:37:30 GMT 2007 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Utility functions to use): Rename to ...
(Facilities and portability): ... this. Add comments on Gnulib and
C89/C99.
Sun Nov 25 21:11:34 GMT 2007 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): Add advice on docs/ChangeLog
practice in branches.
Sun Nov 25 21:01:22 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_roff_encoding): Just use the fallback
encoding if device is NULL, rather than crashing. Bug reported by
Ivan Shmakov.
Sun Nov 25 18:51:16 GMT 2007 Ivan Shmakov <oneingray@gmail.com>
* man/Rules.man: replace.sed lives in $(top_builddir)/man, not
$(top_srcdir)/man.
Sat Nov 24 10:45:50 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): If the environment variable
MANROFFOPT is set, append its contents to the *roff command line
(thanks, Ivan Shmakov; Debian bug #451187).
* man/man1/man.man1 (ENVIRONMENT): Document MANROFFOPT.
* docs/NEWS: Document this.
Mon Nov 19 19:41:18 GMT 2007 Colin Watson <cjwatson@debian.org>
* configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.10. Ming Hua
reported that Automake 1.9 doesn't have the MKDIR_P feature we
depend on.
Tue Nov 13 22:10:51 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/whatis.c (use_grep, do_whatis, word_fnmatch, search, main):
Rename regex to regex_opt, as Solaris' <libgen.h> defines a regex
function (thanks to the Nexenta developers).
Mon Nov 12 19:24:00 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (main), src/globbing_test.c (main),
src/lexgrog_test.c (main), src/zsoelim.l (main): Enable
localisation (Debian bug #448395).
Sun Nov 11 05:43:16 GMT 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Issue a useful error message if
gnulib/po/Makefile.in.in does not exist (reported by Ming Hua).
Mon Oct 22 00:04:45 BST 2007 Colin Watson <cjwatson@debian.org>
Bruno Haible notes in
http://lists.gnu.org/archive/html/groff/2005-12/msg00061.html that
setlocale is supported on all known systems, and it is in C89. Use
it unconditionally.
* configure.ac: Don't check for setlocale.
* src/catman.c (parse_for_sec), src/man.c (main), src/manp.c
(add_nls_manpath), src/whatis.c (main): Remove HAVE_SETLOCALE
conditionals.
Sun Oct 21 21:56:02 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Forbid output tokens beginning with "MAN_".
Sun Oct 21 21:52:43 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Rationalise use of comments. Use more vertical
whitespace.
Sun Oct 21 21:12:46 BST 2007 Colin Watson <cjwatson@debian.org>
* gnulib: Import .po files (--po-base=gnulib/po --po-domain=man-db).
* configure.ac (AC_CONFIG_FILES): Generate gnulib/po/Makefile.in.
* Makefile.am (SUBDIRS): Build gnulib/po.
* .bzrignore: Ignore gnulib/po. This is contrary to our usual
practice, since this is generated by autogen.sh; but gnulib-tool
gives us full .po files which are then stripped down to just the
parts of Gnulib we use by make, so adding them to bzr is
inconvenient.
Sun Oct 21 19:46:26 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (man_getopt): Fix reversed handling of -f and -k in the
"incompatible options" message.
Sun Oct 21 19:43:27 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac (CFLAGS): Add -Wformat-security.
* src/man.c (man_getopt): Use %s as the format string for the
"incompatible options" message since the message itself is not a
string literal. (This is only a security problem in the presence
of hostile translators.)
Sun Oct 21 17:59:13 BST 2007 Colin Watson <cjwatson@debian.org>
* man/Rules.man (SED_ARGS): Move to ...
* man/replace.sin: ... here.
* man/Rules.man (.man1.1, .man5.5, .man8.8): Use replace.sed to
shorten build output.
* configure.ac (AC_CONFIG_FILES): Generate man/replace.sed from
man/replace.sin.
* .bzrignore: Ignore man/replace.sed.
Sun Oct 21 13:38:09 BST 2007 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (purge_missing): If there is no content, that
might just be because the key was already freed while purging an
earlier multi key, so skip to the next key rather than breaking
out of the loop.
Sun Oct 21 13:33:38 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Check for gdbm_exists in DBLIBS as well as LIBS.
Remove unused gdbm_setopt check.
Sun Oct 21 01:25:00 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac (AC_INIT): Pass a BUG-REPORT argument.
Sat Oct 20 18:27:13 BST 2007 Colin Watson <cjwatson@debian.org>
* gnulib/lib/xmalloc.c (xstrdup): Explicitly tolerate a NULL
argument, returning NULL in that case. (Also sent to Gnulib
upstream.)
* gnulib/lib/xmalloc.patch: Add, with the above change in patch
format.
* autogen.sh: Apply xmalloc.patch after updating Gnulib.
Sat Oct 20 18:20:07 BST 2007 Colin Watson <cjwatson@debian.org>
* gnulib/lib/asnprintf.c, gnulib/lib/asprintf.c,
gnulib/lib/float+.h, gnulib/lib/float_.h,
gnulib/lib/printf-args.c, gnulib/lib/printf-args.h,
gnulib/lib/printf-parse.c, gnulib/lib/printf-parse.h,
gnulib/lib/size_max.h, gnulib/lib/stdio_.h,
gnulib/lib/vasnprintf.c, gnulib/lib/vasnprintf.h,
gnulib/lib/vasprintf.c, gnulib/lib/xasprintf.c,
gnulib/lib/xsize.h, gnulib/lib/xvasprintf.c,
gnulib/lib/xvasprintf.h, gnulib/m4/eoverflow.m4,
gnulib/m4/float_h.m4, gnulib/m4/intmax_t.m4,
gnulib/m4/inttypes_h.m4, gnulib/m4/size_max.m4,
gnulib/m4/stdarg.m4, gnulib/m4/stdint_h.m4, gnulib/m4/stdio_h.m4,
gnulib/m4/vasnprintf.m4, gnulib/m4/vasprintf.m4,
gnulib/m4/wchar_t.m4, gnulib/m4/xsize.m4, gnulib/m4/xvasprintf.m4:
Import the Gnulib xvasprintf module.
* .bzrignore: Update.
* libdb/mydbm.h: Add MYDBM_RESET_DSIZE and MYDBM_SET convenience
macros, to obsolete most direct uses of MYDBM_SET_DPTR and
MYDBM_DSIZE. Code that just wants to put a string in a datum
should use MYDBM_SET.
* libdb/db_btree.c (dbstore), libdb/db_delete.c (dbdelete): Use
MYDBM_SET.
* libdb/db_lookup.c (make_multi_key): Use MYDBM_SET and xasprintf.
(make_content): Likewise. Collapse ANSI_SPRINTF #ifdef, no longer
needed.
(dblookup): Use MYDBM_SET.
* libdb/db_ndbm.c (ndbm_flopen): Use xasprintf.
* libdb/db_store.c (dbstore): Use MYDBM_SET and xasprintf.
* libdb/db_ver.c (dbver_rd, dbver_wr): Use MYDBM_SET.
* src/check_mandirs.c (update_db_time): Use MYDBM_SET and xasprintf.
(reset_db_time, update_db): Use MYDBM_SET.
* src/filenames.c (make_filename): Use xasprintf.
* src/man.c (setenv_less): Use xasprintf.
* m4/man-ansi-sprintf.m4, configure.ac (MAN_FUNC_ANSI_SPRINTF):
Remove.
Sat Oct 20 14:30:44 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Remove redundant check for getcwd.
Thu Oct 18 01:51:06 BST 2007 Colin Watson <cjwatson@debian.org>
* src/wrapper.c: Include "config.h" right at the top and with a
HAVE_CONFIG_H guard, like other files.
Thu Oct 18 01:41:41 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/pathsearch.c, src/man.c, src/mandb.c, src/manp.c: Include
"xgetcwd.h" rather than <xgetcwd.h>, as suggested by gnulib-tool.
Thu Oct 18 01:37:22 BST 2007 Colin Watson <cjwatson@debian.org>
* src/manp.c (cat_manpath): Whitespace adjustments.
Thu Oct 18 01:15:25 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c: PIPE_BUF is no longer used, so don't define it.
Wed Oct 17 22:34:32 BST 2007 Colin Watson <cjwatson@debian.org>
* gnulib/lib/minmax.h, gnulib/m4/minmax.m4: Import the Gnulib minmax
module.
* src/man.c (duplicate_candidates): Use it.
* src/util.c: Remove unused definition of MAX.
Regenerate all build system files. (Future ChangeLog entries will
not mention this.)
Wed Oct 17 22:22:25 BST 2007 Colin Watson <cjwatson@debian.org>
* gnulib/lib/strerror.c, gnulib/m4/strerror.m4: Import the Gnulib
strerror module.
Regenerate all build system files.
Wed Oct 17 21:05:50 BST 2007 Colin Watson <cjwatson@debian.org>
Use the Gnulib portability library.
* lib/alloca.c, lib/basename.c, lib/error.c, lib/error.h,
lib/fnmatch.c, lib/fnmatch_.h, lib/getcwdalloc.c,
lib/getcwdalloc.h, lib/getopt.c, lib/getopt1.c, lib/getopt_.h,
lib/glob.c, lib/glob_.h, lib/memcmp.c, lib/mkdtemp.c,
lib/mkstemp.c, lib/putenv.c, lib/realpath.c, lib/rename.c,
lib/setenv.c, lib/setenv.h, lib/strcspn.c, lib/strnlen.c,
lib/strsep.c, lib/tempname.c, lib/unsetenv.c, lib/xmalloc.c,
lib/xstrdup.c, lib/xstrndup.c, m4/man-fnmatch.m4, m4/setenv.m4,
m4/tempname.m4: Remove.
* gnulib/*, tools/link-warning.h: Import atexit, canonicalize,
dirname, error, fnmatch-gnu, getopt, glob, memcmp, mkdtemp,
mkstemp, regex, rename, setenv, strcspn, strsep, sys_select,
xalloc, xgetcwd, and xstrndup modules.
* .bzrignore: Update.
* Makefile.am (SUBDIRS): Build gnulib/lib.
(ACLOCAL_AMFLAGS): Add -I gnulib/m4.
* autogen.sh: Add gnulib-tool --update.
* configure.ac: Call gl_EARLY and gl_INIT.
Remove calls to AC_AIX and AC_MINIX.
Stop checking for unistd.h, regex.h, libgen.h, string.h, and
strings.h headers.
Stop checking for alloca, memcmp, strcoll, vprintf, getwd, atexit,
on_exit, canonicalize_file_name, regcomp, re_comp, globfree,
getopt_long, putenv, realpath, rename, basename, strsep, strcspn,
strnlen, mkdtemp, mkstemp, setenv, and __gen_tempname functions.
Generate gnulib/lib/Makefile.
* docs/HACKING: Document policy on generated files in revision
control.
* include/manconfig.h.in: Replace xmalloc, xrealloc, xstrdup, and
xstrndup declarations with inclusions of xalloc.h and xstrndup.h.
Stop defining basename, strsep, and getcwd.
* lib/Makefile.am (libman_a_CPPFLAGS): Include headers from
gnulib/lib.
(libman_a_SOURCES): Remove error.c, error.h, getcwdalloc.c,
getcwdalloc.h, setenv.h, xmalloc.c, xstrdup.c, and xstrndup.c.
(libman_a_LIBADD): Remove $(ALLOCA).
(BUILT_SOURCES, MOSTLYCLEANFILES, EXTRA_DIST, fnmatch.h, getopt.h,
glob.h): Remove; replaced by Gnulib.
* lib/README: Alphabetise, update file list, and update authors.
* libdb/Makefile.am (libmandb_a_CPPFLAGS): Include headers from
gnulib/lib.
* src/Makefile.am (AM_CPPFLAGS): Include headers from gnulib/lib.
(LIBMAN): Link with gnulib/lib/libgnu.a.
* lib/cleanup.c: Assume <unistd.h> and atexit.
* lib/decompress.c, lib/flock.c: Assume <unistd.h>.
* lib/pathsearch.c: Assume <unistd.h>.
(pathsearch): Use xgetcwd.
* lib/pipeline.c: Assume <sys/select.h> and <unistd.h>. Remove
duplicate <fcntl.h> inclusion.
(command_new): Use base_name.
* lib/tempfile.c, lib/xstrsignal.h: Assume <unistd.h>.
* libdb/db_btree.c: Assume <unistd.h>.
* libdb/db_btree.c, libdb/db_lookup.c: Assume <unistd.h> and strsep.
* libdb/db_ndbm.c: Assume <unistd.h>.
* libdb/db_store.c: Assume <unistd.h> and strsep.
* src/accessdb.c (main): Use base_name.
* src/catman.c: Assume <unistd.h>.
(main): Use base_name.
* src/check_mandirs.c: Assume <unistd.h>, strpbrk, and time.
(test_manfile): Use base_name. Rename existing base_name variable
to manpage_base.
(reset_db_time): Use dir_name.
* src/compression.c, src/convert_name.c: Assume <unistd.h>.
* src/filenames.c: Remove unused <libgen.h> inclusion.
* src/globbing_test.c (main): Use base_name.
* src/lexgrog.l, src/lexgrog.l-2.3.8, src/lexgrog.l-2.4a,
src/lexgrog.l.new: Assume <unistd.h>.
* src/lexgrog_test.c (main): Use base_name.
* src/man.c: Assume <unistd.h>.
(gripe_no_man): Use unsetenv rather than putenv.
(local_man_loop): Use base_name.
(main): Use base_name and xgetcwd.
(make_roff_command): Use setenv rather than putenv.
(format_display): Use xgetcwd and base_name.
* src/manconv.c: Assume <unistd.h>.
(main): Use base_name.
* src/mandb.c: Assume <unistd.h>.
(main): Use base_name and xgetcwd.
* src/manp.c: Assume <unistd.h>.
(add_dir_to_path_list): Use xgetcwd.
* src/manpath.c: Assume <unistd.h>.
(main): Use base_name.
* src/security.c: Assume <unistd.h>.
* src/straycats.c: Assume <unistd.h>.
(check_for_stray): Use base_name. Assume canonicalize_file_name.
* src/ult_src.c: Assume <unistd.h>.
(ult_softlink): Use canonicalize_file_name.
* src/ult_src.c: Assume <unistd.h>.
* src/whatis.c: Assume <unistd.h> and <sys/types.h>.
(use_grep, parse_name, parse_whatis, search, main): Assume POSIX
regex functions (provided by Gnulib's regex module).
(main): Use base_name.
* src/wrapper.c (main): Use base_name.
* src/zsoelim.l: Assume <unistd.h>.
(main): Use base_name.
* docs/NEWS: Document this.
Drop remaining bits of pre-C89 compatibility.
* lib/ansidecl.h, lib/strspn.c, lib/strstr.c: Remove.
* configure.ac: Stop checking for strstr and strspn.
* include/manconfig.h.in: Remove VOID definition.
* lib/Makefile.am (libman_a_SOURCES): Remove ansidecl.h.
* lib/appendstr.c, lib/decompress.c, lib/flock.c, lib/hashtable.c,
lib/pathsearch.c, lib/tempfile.c, libdb/db_btree.c,
libdb/db_delete.c, libdb/db_gdbm.c, libdb/db_lookup.c,
libdb/db_ndbm.c, libdb/db_store.c, libdb/db_ver.c, src/accessdb.c,
src/catman.c, src/check_mandirs.c, src/compression.c,
src/convert_name.c, src/descriptions.c, src/descriptions_store.c,
src/encodings.c, src/fake_security.c, src/filenames.c,
src/globbing.c, src/globbing_test.c, src/lexgrog.l,
src/lexgrog.l-2.3.8, src/lexgrog.l-2.4a, src/lexgrog.l.new,
src/lexgrog_test.c, src/man.c, src/manconv.c, src/mandb.c,
src/manp.c, src/manpath.c, src/security.c, src/straycats.c,
src/ult_src.c, src/util.c, src/version.c, src/whatis.c,
src/zsoelim.l: Assume C89 declaration syntax, headers, and
functions.
* docs/NEWS: Document this.
* configure.ac (--enable-mandirs): Improve grammar.
Regenerate all build system files using autogen.sh.
Mon Oct 15 10:15:48 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document previous change.
Mon Oct 15 10:13:57 BST 2007 Colin Watson <cjwatson@debian.org>
* src/manconv.c (check_preprocessor_encoding): Allow only
alphanumerics and "-_/:.()" in encoding names (Debian bug
#446055). This matches everything in 'iconv --list' on my system.
(try_iconv): Include encoding names in error message if iconv_open
fails.
Mon Oct 15 10:06:51 BST 2007 Colin Watson <cjwatson@debian.org>
* man/Rules.man (.man1.1, .man5.5, .man8.8): Use $(MKDIR_P) rather
than hardcoding mkdir -p.
* man/Makefile.in, man/de.UTF-8/Makefile.in,
man/es.UTF-8/Makefile.in, man/fr.UTF-8/Makefile.in,
man/it.UTF-8/Makefile.in, man/ja.UTF-8/Makefile.in: Regenerate.
Sun Oct 14 02:39:43 BST 2007 Colin Watson <cjwatson@debian.org>
* src/Makefile.am (AM_CPPFLAGS): Fix SOELIM definition.
* src/Makefile.in: Regenerate.
Sun Oct 14 01:20:07 BST 2007 Colin Watson <cjwatson@debian.org>
* .bzrignore: Restore some ignores needed in intl/.
Sun Oct 14 01:16:23 BST 2007 Colin Watson <cjwatson@debian.org>
Add most files generated by autogen.sh to revision control, as it
makes it easier to keep track of what the Autotools are doing.
autom4te.cache and po/Makevars.template are explicitly still
ignored; the former is junk and the latter is only necessary in the
gettext-tools package.
* ABOUT-NLS, aclocal.m4, config.h.in, configure, intl/ChangeLog,
intl/Makefile.in, intl/VERSION, intl/bindtextdom.c,
intl/config.charset, intl/dcgettext.c, intl/dcigettext.c,
intl/dcngettext.c, intl/dgettext.c, intl/dngettext.c,
intl/eval-plural.h, intl/explodename.c, intl/export.h,
intl/finddomain.c, intl/gettext.c, intl/gettextP.h, intl/gmo.h,
intl/hash-string.c, intl/hash-string.h, intl/intl-compat.c,
intl/intl-exports.c, intl/l10nflist.c, intl/langprefs.c,
intl/libgnuintl.h.in, intl/loadinfo.h, intl/loadmsgcat.c,
intl/localcharset.c, intl/localcharset.h, intl/locale.alias,
intl/localealias.c, intl/localename.c, intl/lock.c, intl/lock.h,
intl/log.c, intl/ngettext.c, intl/os2compat.c, intl/os2compat.h,
intl/osdep.c, intl/plural-exp.c, intl/plural-exp.h, intl/plural.c,
intl/plural.y, intl/printf-args.c, intl/printf-args.h,
intl/printf-parse.c, intl/printf-parse.h, intl/printf.c,
intl/ref-add.sin, intl/ref-del.sin, intl/relocatable.c,
intl/relocatable.h, intl/textdomain.c, intl/vasnprintf.c,
intl/vasnprintf.h, intl/vasnwprintf.h, intl/version.c,
intl/wprintf-parse.h, intl/xsize.h, m4/codeset.m4, m4/gettext.m4,
m4/glibc2.m4, m4/glibc21.m4, m4/iconv.m4, m4/intdiv0.m4,
m4/intl.m4, m4/intldir.m4, m4/intmax.m4, m4/inttypes-pri.m4,
m4/inttypes_h.m4, m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4,
m4/lib-prefix.m4, m4/lock.m4, m4/longdouble.m4, m4/longlong.m4,
m4/nls.m4, m4/po.m4, m4/printf-posix.m4, m4/progtest.m4,
m4/size_max.m4, m4/stdint_h.m4, m4/uintmax_t.m4, m4/ulonglong.m4,
m4/visibility.m4, m4/wchar_t.m4, m4/wint_t.m4, m4/xsize.m4,
po/Makefile.in.in, po/Rules-quot, po/boldquot.sed,
po/en@boldquot.header, po/en@quot.header, po/insert-header.sin,
po/quot.sed, po/remove-potcdate.sin, tools/config.rpath,
tools/depcomp, tools/missing, tools/ylwrap: New files.
* .bzrignore: Update.
Sun Oct 14 01:04:41 BST 2007 Colin Watson <cjwatson@debian.org>
* autogen.sh: Use 'autoreconf -i' rather than reinventing the wheel.
Sun Oct 14 00:53:14 BST 2007 Colin Watson <cjwatson@debian.org>
* po/man-db.pot, po/*.po: Update.
Sun Oct 14 00:49:31 BST 2007 Colin Watson <cjwatson@debian.org>
* man/Rules.man (clean-local): Remove; we don't need to worry about
removing empty directories in separated build trees.
* man/Makefile.in, man/de.UTF-8/Makefile.in,
man/es.UTF-8/Makefile.in, man/fr.UTF-8/Makefile.in,
man/it.UTF-8/Makefile.in, man/ja.UTF-8/Makefile.in: Regenerate.
Sun Oct 14 00:40:26 BST 2007 Colin Watson <cjwatson@debian.org>
* man-db.lsm: Move to ...
* docs/man-db.lsm: ... here.
* Makefile.am, docs/Makefile.am: Move man-db.lsm reference.
* Makefile.in, docs/Makefile.in: Regenerate.
Sun Oct 14 00:33:10 BST 2007 Colin Watson <cjwatson@debian.org>
* README: Remove several restrictions lifted by the conversion to
Automake. Remove documentation of how to install native language
manual pages, since this is now done unconditionally. Remove
documentation of the update target, which no longer exists and
should no longer be needed.
* docs/NEWS: Document conversion to Automake.
Sun Oct 14 00:22:31 BST 2007 Colin Watson <cjwatson@debian.org>
Convert to Automake. This fixes VPATH builds, fixes a number of bugs
in areas such as dependency generation, provides new features such
as 'make distcheck', moves complexity into autogenerated code, and
prepares the way for using Gnulib more effectively.
* makefile.in, include/Defines.in: Remove.
* GNUmakefile.in, lib/Makefile.in, libdb/Makefile.in,
man/Makefile.in, manual/Makefile.in, src/Makefile.in: Translate to
Automake and move to ...
* Makefile.am, lib/Makefile.am, libdb/Makefile.am, man/Makefile.am,
manual/Makefile.am, src/Makefile.am: ... here.
* docs/Makefile.am, tools/Makefile.am: Build these directories
separately.
* man/Rules.man, man/de.UTF-8/Makefile.am, man/es.UTF-8/Makefile.am,
man/fr.UTF-8/Makefile.am, man/it.UTF-8/Makefile.am,
man/ja.UTF-8/Makefile.am: Build manual pages recursively, as it
makes VPATH builds easier.
* Makefile.in, docs/Makefile.in, lib/Makefile.in, libdb/Makefile.in,
man/Makefile.in, man/de.UTF-8/Makefile.in,
man/es.UTF-8/Makefile.in, man/fr.UTF-8/Makefile.in,
man/it.UTF-8/Makefile.in, man/ja.UTF-8/Makefile.in,
manual/Makefile.in, src/Makefile.in, tools/Makefile.in: Add
generated files.
* README: Remove mention of include/Defines.
* autogen.sh: Call automake-1.10 --add-missing --copy.
* m4/man-trans-subst.m4: New macro.
* configure.ac: Various changes for Automake. AC_SUBST man_owner,
and set man_mode rather than man_install_flags. Set
config_file_dirname. Calculate transformed versions of program
names (using MAN_TRANS_SUBST) here for use in Automake variables.
* docs/HACKING (Directory layout): Mention automake.
Arrange that each file only needs to be built once.
* src/globbing.c: Split main program out to ...
* src/globbing_test.c: ... here.
* src/lexgrog.l: Split main program out to ...
* src/lexgrog_test.c: ... here.
* po/POTFILES.in: Add src/globbing_test.c and src/lexgrog_test.c.
* src/whatis.c (args, long_options): Include -a/--and
unconditionally.
(usage): Replace with a wrapper selecting between ...
(apropos_usage, whatis_usage): ... these.
(apropos, whatis): Rename to ...
(do_apropos, do_whatis): ... these, respectively.
(use_grep, do_whatis, parse_name, match, do_apropos, search,
main): Use run-time conditionals rather than compile-time
conditionals.
(main): Detect whether we are being invoked as "apropos" or
"whatis" and adjust behaviour accordingly.
* src/Makefile.am: Adjust for the above. Make apropos a symlink to
whatis.
Make VPATH builds work, and simplify some includes.
* configure.ac, m4/man-fnmatch.m4: Define FNMATCH_H, GETOPT_H, and
GLOB_H to the respective header names if system versions do not
exist.
* lib/hashtable.h: Remove unnecessary libdb includes.
* lib/decompress.h, lib/glob.c, libdb/db_btree.c, libdb/db_delete.c,
libdb/db_gdbm.c, libdb/db_lookup.c, libdb/db_ndbm.c,
libdb/db_storage.h, libdb/db_store.c, libdb/db_ver.c,
src/accessdb.c, src/catman.c, src/check_mandirs.c,
src/check_mandirs.h, src/compression.c, src/convert_name.c,
src/descriptions.h, src/descriptions_store.c, src/encodings.c,
src/fake_security.c, src/filenames.c, src/filenames.h,
src/globbing.c, src/lexgrog.l, src/lexgrog.l-2.3.8,
src/lexgrog.l-2.4a, src/lexgrog.l.new, src/man.c, src/manconv.c,
src/mandb.c, src/manp.c, src/manpath.c, src/security.c,
src/straycats.c, src/ult_src.c, src/util.c, src/version.c,
src/whatis.c, src/wrapper.c, src/zsoelim.l: Remove lib/ and libdb/
prefixes from includes. Include <fnmatch.h>, <getopt.h>, and
<glob.h> directly rather than using a forest of #ifdefs, since the
copies in lib/ are now not built if a system version exists.
* .bzrignore: Update.
Sat Oct 13 15:04:06 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/popen.c, m4/man-pclose.m4: Remove; we no longer need popen or
pclose.
* configure.ac: Remove call to MAN_FUNC_PCLOSE.
Sat Oct 13 11:55:21 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Add --with-sections option to change the default
value of SECTION.
* src/man_db.conf.in: Use its output.
* docs/NEWS: Document this.
Fri Oct 12 12:22:52 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Start 2.5.1.
Fri Oct 12 11:57:50 BST 2007 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): If we need to try the next encoding in
the list, make sure to do that before writing the output buffer.
Fri Oct 12 10:21:07 BST 2007 Colin Watson <cjwatson@debian.org>
* src/whatis.c (use_grep): Add trailing newline to debugging output.
Fri Oct 12 01:47:49 BST 2007 Colin Watson <cjwatson@debian.org>
* src/manconv.c (try_iconv): Improve debugging output slightly.
Fri Oct 12 01:43:25 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display_and_save, format_display,
display_catman): Only discard stderr from formatting processes if
stdout is a terminal.
Fri Oct 12 01:32:52 BST 2007 Colin Watson <cjwatson@debian.org>
* src/encodings.c (device_table): groff's ascii device only supports
ASCII input, not ISO-8859-1.
(compatible_encodings): If the output is ASCII, this is probably
because the caller explicitly asked for it, so allow recoding to
it unconditionally.
Fri Oct 12 00:48:42 BST 2007 Colin Watson <cjwatson@debian.org>
* src/whatis.c (main): locale is a constant pointer; free
internal_locale instead (Debian bug #446302).
Thu Oct 11 01:40:51 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (display): Free format_cmd on two more early return
paths.
Thu Oct 11 00:53:31 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (display): I don't think it's possible for decomp to be
NULL on the display_to_stdout path, but better safe than sorry.
Thu Oct 11 00:38:56 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (display): Connect up the decompression pipeline in the
display_to_stdout case too (Debian bug #446189).
(checked_system): Remove, no longer used.
Thu Oct 11 00:21:49 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Perform input encoding conversion
for troff output as well as nroff output.
Wed Oct 10 09:39:53 BST 2007 Colin Watson <cjwatson@debian.org>
* man/man8/mandb.man8 (DATABASE CACHES): Fix "occured" typo (thanks,
Alfie Costa; Debian bug #446044).
Mon Oct 8 02:24:19 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/popen.c (popen), src/descriptions.c (parse_descriptions),
src/man.c (add_candidate), src/manp.c (add_dir_to_path_list): Use
xmalloc instead of malloc.
* lib/pipeline.c (get_block): Use xrealloc instead of realloc.
Mon Oct 8 02:15:47 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/HACKING: Minor release process adjustment now that we're no
longer using CVS.
Mon Oct 8 02:13:15 BST 2007 Colin Watson <cjwatson@debian.org>
* README: Building the manual requires running ./configure now.
Mon Oct 8 02:09:55 BST 2007 Colin Watson <cjwatson@debian.org>
The strappend function is in the namespace reserved by C99
7.26.10/7.26.11; rename it to appendstr.
* lib/strappend.c: Rename to ...
* lib/appendstr.c: ... this. Rename function.
* lib/Makefile.in (ALLSRCS, ALL): Build appendstr instead of
strappend.
* lib/README: Update credit.
* include/manconfig.h.in: Update prototype.
* lib/decompress.c, lib/pathsearch.c, lib/pipeline.c,
lib/tempfile.c, libdb/db_delete.c, src/accessdb.c, src/catman.c,
src/check_mandirs.c, src/compression.c, src/convert_name.c,
src/encodings.c, src/filenames.c, src/globbing.c,
src/lexgrog.l.new, src/man.c, src/manconv.c, src/mandb.c,
src/manp.c, src/straycats.c, src/ult_src.c, src/util.c,
src/whatis.c, src/zsoelim.l: Update all callers.
* docs/HACKING: Update reference.
* docs/TODO: Remove item for this.
Mon Oct 8 01:21:10 BST 2007 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (_man): Ship po4a files.
(dist): Create the necessary directories.
Mon Oct 8 01:16:07 BST 2007 Colin Watson <cjwatson@debian.org>
Build the manual automatically. This avoids problems trying to do a
distclean (distclean at the top level runs ./config.status --recheck
and regenerates manual/Makefile, but manual/Makefile requires
include/Defines to exist, so there is no way to distclean both the
top level and manual/).
* GNUmakefile.in (EVERYTHING, ALL): Add manual.
(_subdirs): Remove manual, now included in $(EVERYTHING).
Sun Oct 7 17:05:54 BST 2007 Colin Watson <cjwatson@debian.org>
* Version: 2.5.0.
* configure.ac, docs/NEWS, man-db.lsm: Update.
Sun Oct 7 17:01:47 BST 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (ja_name): Add another possible translation.
Sun Oct 7 15:19:15 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/Makefile.in (distclean): Remove Makefile.
Sun Oct 7 14:28:27 BST 2007 Colin Watson <cjwatson@debian.org>
* po/man-db.pot, po/*.po: Update.
Sun Oct 7 14:24:31 BST 2007 Ming Hua <minghua-guest@users.alioth.debian.org>
* po/zh_CN.po: New translation.
* po/LINGUAS: Add zh_CN.
* man/THANKS: Add translator credit.
Wed Sep 26 17:57:44 BST 2007 Colin Watson <cjwatson@debian.org>
* src/util.c (escape_shell): '=' is conceivably a shell
metacharacter if used in the first word of a command (although I
can't see anywhere in man-db where this might actually happen,
barring very unlikely settings of $BROWSER).
Wed Sep 26 17:51:45 BST 2007 Colin Watson <cjwatson@debian.org>
* src/globbing.c (look_for_file): Don't escape the hierarchy path;
it isn't necessary and it causes problems for paths containing
metacharacters (Debian bug #444187).
* src/globbing.h (look_for_file): Update prototype.
Tue Sep 18 11:29:26 BST 2007 Colin Watson <cjwatson@debian.org>
* man/po4a/po4a.cfg: Add po4a mechanism for manual page translation,
as the Simplified Chinese translator would like to use this.
* man/po4a/po/man-db.pot: Add generated file.
* man/man1/apropos.man1, man/man1/lexgrog.man1, man/man1/man.man1,
man/man1/manconv.man1, man/man1/manpath.man1,
man/man1/whatis.man1, man/man1/zsoelim.man1,
man/man5/manpath.man5, man/man8/accessdb.man8,
man/man8/catman.man8, man/man8/mandb.man8: Some strings should not
be translated. Use the ".if !'po4a'hide'" idiom to mark them.
* man/man1/man.man1 (OVERVIEW): Adjust some spacing.
Tue Sep 18 08:59:55 BST 2007 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Switch Simplified Chinese to
GBK by default. Ming Hua points out that GBK is a superset of
EUC-CN, and indeed all Simplified Chinese manual pages I can find
can be recoded from GBK without hassle. I'm less certain about
changing the output encoding, but for CJK encodings it's best for
these to be the same at the moment.
Mon Sep 17 16:13:37 BST 2007 Daniel Nylander <po@danielnylander.se>
* po/sv.po: Update from Translation Project.
Mon Sep 17 14:27:15 BST 2007 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Mon Sep 17 00:34:17 UTC 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (ja_name): Oops; make the first translation keep
working!
Mon Sep 17 00:26:27 UTC 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (ja_name): Add another possible translation.
Mon Sep 17 00:11:38 UTC 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Break after execvp, otherwise we
segfault if execvp fails.
Sun Sep 16 23:15:27 BST 2007 Colin Watson <cjwatson@debian.org>
* Version: 2.5.0-pre2.
* man-db.lsm (Keywords): Add manconv.
Sun Sep 16 20:41:36 BST 2007 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (__distclean): Remove config.status.lineno.
* .bzrignore: Ignore ./config.status.lineno.
Sun Sep 16 20:38:32 BST 2007 Colin Watson <cjwatson@debian.org>
* man/Makefile.in: Deal more neatly with manual pages without
complete sets of translations.
Sun Sep 16 20:25:24 BST 2007 Colin Watson <cjwatson@debian.org>
Add more intelligent guessing of manual page encodings. Thanks to
Adam Borowski for discussion leading to this.
* src/manconv.c: New program.
* man/man1/manconv.man1: Document it.
* .bzrignore: Ignore src/manconv.
* include/Defines.in (manconv): Add.
* man/Makefile.in (manconv, thmanconv, manconv.1): Add.
(process_manpage): Add manconv and thmanconv.
(allmanpages): Add ./man1/manconv.1.
(nlsinstall): Install manconv.1.
(nlsuninstall): Uninstall manconv.1.
* src/Makefile.in (PRIVTOOLS, all): Add manconv.
* po/POTFILES.in: Add src/manconv.c.
* po/man-db.pot, po/*.po: Update.
* src/man.c (PP_COOKIE): Move to ...
* include/manconfig.h.in (PP_COOKIE): ... here.
* src/encodings.c (add_manconv): New function to use manconv instead
of iconv where appropriate.
* src/encodings.h (add_manconv): Add prototype.
* src/lexgrog.l (find_name): Use it.
* src/man.c (make_roff_command): Use it. Remove coding: preprocessor
string handling, as manconv deals with that now.
* src/straycats.c (check_for_stray): Use it.
* src/Makefile.in (DEFS_encodings.o): Add, defining location of
manconv.
* docs/NEWS: Document this.
Sun Sep 16 12:41:05 BST 2007 Colin Watson <cjwatson@debian.org>
* src/catman.c (main), src/globbing.c (main), src/lexgrog.l (main),
src/man.c (man_getopt), src/mandb.c (main), src/manpath.c (main),
src/whatis.c (main), src/zsoelim.l (main): Pass NULL as the fifth
argument to getopt_long rather than requiring an unused variable.
Tue Sep 11 13:49:33 BST 2007 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Mon Sep 10 10:29:40 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/TODO: Miscellaneous updates.
Mon Sep 10 10:26:57 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/INSTALL.autoconf: Update to instructions from Autoconf 2.61.
Mon Sep 10 10:20:23 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/misc.me (NLS message catalogues): Update Translation
Project URL.
Mon Sep 10 10:17:43 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/Makefile: Rename to ...
* manual/Makefile.in: ... this. Write out a version file with the
current version of man-db.
* manual/man_db.me: Use the automatically-generated version file
rather than hardcoding the version. Set the manual version to
simply the version of man-db.
* configure.ac (AC_CONFIG_FILES): Add manual/Makefile.
* GNUmakefile.in (_manual): Distribute manual/Makefile.in rather
than manual/Makefile.
* .bzrignore: Update.
Mon Sep 10 09:17:17 BST 2007 Colin Watson <cjwatson@debian.org>
* Version: 2.5.0-pre1. I mistakenly used version 2.4.5-pre1 earlier.
Mon Sep 10 09:11:05 BST 2007 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Mon Sep 10 00:15:31 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac (AM_GNU_GETTEXT_VERSION): Upgrade to gettext 0.16.1.
* .bzrignore: Update ignores.
Sun Sep 9 23:49:37 BST 2007 Daniel Nylander <po@danielnylander.se>
* po/sv.po: Update from Translation Project.
Sun Sep 9 22:50:22 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/format.me (Format scripts): Adjust for renaming of
tools/mandb_[nt]fmt-script to tools/mandb_fmt-script.
Sun Sep 9 21:03:25 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/comp.me (Compressed manual pages): Using compressed manual
pages is perfectly reasonable these days; stop recommending
against it.
Sun Sep 9 20:57:16 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/files.me (Displaying latin1 characters on a Linux virtual
terminal): Rename to ...
(Displaying non-ASCII characters on a Linux virtual terminal): ...
this. Mention console-tools as an alternative to kbd. Remove
detailed advice on configuring kbd as it is now woefully out of
date. Recommend the UTF-8 encoding again.
Sun Sep 9 20:49:59 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/files.me (NLS manual pages): Update for new per-locale
directory handling. Recommend UTF-8 encoding.
Sun Sep 9 19:39:36 BST 2007 Colin Watson <cjwatson@debian.org>
* manual/intro.me (The manual page system): Refer to /usr/share/man
rather than /usr/man.
* manual/sec.me (Package specific manual page sections): Likewise.
* manual/files.me (Manual page hierarchies, Other OS's manual pages,
NLS manual pages): Likewise.
* manual/leader.me: Update copyright years.
Sun Sep 9 19:24:56 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Reorder, roughly by importance.
Sun Sep 9 09:01:30 BST 2007 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (_root): Add autogen.sh to the distribution; it's
useful if you need to change autotools input files.
Sun Sep 9 08:37:04 BST 2007 Colin Watson <cjwatson@debian.org>
* Version: 2.4.5-pre1 (for translators).
* po/man-db.pot, po/*.po: Update.
Mon Sep 3 14:34:06 BST 2007 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_nls_manpath): Handle the POSIX locale the same way
as C.
Mon Sep 3 13:48:13 BST 2007 Colin Watson <cjwatson@debian.org>
* man/man1/whatis.man1 (OPTIONS): Refer to whatis rather than
apropos in description of --manpath.
Mon Sep 3 13:45:30 BST 2007 Nicolas François <nicolas.francois@centraliens.net>
* man/man1/apropos.man1 (ENVIRONMENT): Remove stray space in
description of POSIXLY_CORRECT. Patch from Debian bug #281811.
Mon Sep 3 13:26:19 BST 2007 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Bulgarian -> CP1251 and
Vietnamese -> TCVN5712-1.
* src/lexgrog.l (bg_name, vi_name): Add.
Mon Sep 3 12:15:55 BST 2007 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (test_manfile): Fix comment typos and
formatting.
Mon Sep 3 12:01:36 BST 2007 Colin Watson <cjwatson@debian.org>
* .bzrignore: Update for manual directory renaming.
* GNUmakefile.in (nls_man): Likewise.
Mon Sep 3 11:56:58 BST 2007 Colin Watson <cjwatson@debian.org>
* man/de_DE.88591, man/es_ES.88591, man/fr_FR.88591,
man/it_IT.88591, man/ja_JP.eucJP: Rename to ...
* man/de.UTF-8, man/es.UTF-8, man/fr.UTF-8, man/it.UTF-8,
man/ja.UTF-8: ... these. Recode all contents to UTF-8.
* man/Makefile.in (NLS): Adjust directory search.
* man/THANKS: Update credits.
Mon Sep 3 11:38:11 BST 2007 Colin Watson <cjwatson@debian.org>
Create and use databases for non-English manual hierarchies (Debian
bug #29448). Extensive changes elsewhere to support this by means of
better UTF-8 handling and knowledge of more languages.
* src/check_mandirs.c (make_database_directory): New function.
(create_db, update_db): Use it.
(purge_missing): Check that the database exists before starting.
* src/mandb.c (process_manpath): New function, split out from main.
Make the single_filename check aware that the file might be in a
per-locale subdirectory that we aren't processing right now.
(main): Use it. Move man_owner, purged, and strays to file scope.
Build databases for all per-locale subdirectories.
* src/straycats.c (straycats): Constify manpath argument.
* src/whatis.c (main): Sync locale handling with src/man.c, in order
to look up per-locale databases correctly. Based on a patch by
Nicolas François (Debian bug #281811).
* include/manconfig.h.in (straycats): Update prototype.
* src/man.c (duplicate_candidates): New function to determine
whether candidates are substantially duplicated, and if so in
which direction. The logic is better than before: it now knows how
to compare locales and pick the best available candidate for each
language, and prefers UTF-8 candidates if everything else is
equal.
(add_candidate): Move duplication logic to duplicate_candidates.
Adjust insertion handling so that we can drop old candidates in
favour of new candidates.
* src/manp.c (check_and_give): Remove.
(unpack_locale_bits): New function, inspired by _nl_explode_name
in libintl.
(free_locale_bits): New function.
(add_nls_manpath): Instead of trying individual directories (which
doesn't work so well with character set aliasing), iterate over
all subdirectories of each manpath entry and add all those
matching the current locale's language and (if specified)
territory. This now includes ll.CODESET as well as more
conventional locale names.
* src/manp.h: Declare 'struct locale_bits'. Prototype
unpack_locale_bits and free_locale_bits.
* src/man.c (lang_dir): Move to ...
* src/util.c (lang_dir): ... here.
* src/lexgrog.l (long_options, args, main): New -E/--encoding
option.
(usage): Document it.
(cs_name, hu_name, ja_name, ru_name): Recode to UTF-8.
(find_name): Add encoding argument. Guess the page's encoding from
its filesystem location (or use encoding if supplied), and add an
iconv command to recode it to UTF-8.
* man/man1/lexgrog.man1 (SYNOPSIS, OPTIONS): Document --encoding.
* src/straycats.c (check_for_stray): Guess the page's encoding from
its filesystem location, and add an iconv command to recode it to
UTF-8.
* src/whatis.c (simple_convert): New function to simplify iconv
handling.
(display): Convert output from UTF-8 to locale charset.
(main): Initialise iconv descriptor.
* include/manconfig.h.in (find_name): Update prototype.
(lang_dir): Add prototype.
* configure.ac: Call AM_ICONV.
* src/Makefile.in (mandb, lexgrog): Add encodings.o.
* src/Makefile.in (whatis, apropos): Add encodings.o and
$(LIBICONV).
* src/encodings.c (directory_table): Add Serbian -> ISO-8859-5.
* src/lexgrog.l (cs_name, hu_name): Expand character classes
containing non-ASCII characters into the form (a|b|...); flex
doesn't understand Unicode well enough to deal with them
otherwise.
(cs_name, ru_name): Add more possible translations.
(ko_name, sk_name, sr_name, tr_name, zh_CN_name, zh_TW_name): Add.
(find_name_decompressed): Ignore exit status from decompressor
pipeline; iconv may exit non-zero on misencoded pages, but if we
manage to extract a whatis from it anyway then it doesn't really
matter.
* src/whatis.c (usage): Document -L/--locale.
* man/man1/apropos.man1 (SYNOPSIS, OPTIONS): Likewise.
* man/man1/whatis.man1 (SYNOPSIS, OPTIONS): Likewise.
* docs/NEWS: Document this.
Sun Sep 2 01:21:11 BST 2007 Colin Watson <cjwatson@debian.org>
Add limited character set aliasing support.
* src/encodings.c (charset_alias_table): New table for common
character set aliases.
(get_canonical_charset_name): New function to inspect
charset_alias_table.
(get_page_encoding): Use get_canonical_charset_name. Adjust FHS
commentary, since we now support its craziness.
(get_standard_output_encoding): Use get_canonical_charset_name.
(get_locale_charset): Likewise.
* src/encodings.h: Prototype get_canonical_charset_name.
* src/encodings.c (directory_table): Use EUC-CN rather than GB2312
and BIG5HKSCS rather than BIG5-HKSCS (canonical names according to
glibc's /usr/lib/gconv/gconv-modules).
(charset_table): Likewise.
(compatible_encodings): Likewise.
Sun Sep 2 00:49:27 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/decompress.c (decompress_open, decompress_fdopen): Don't start
the returned pipeline.
* lib/decompress.h (decompress_open, decompress_fdopen): Note that
the caller must start the returned pipeline.
* src/lexgrog.l (find_name): Start the decompressor pipeline.
* src/man.c (display): Likewise.
* src/ult_src.c (ult_src): Likewise.
* src/zsoelim.l (open_file): Likewise.
* src/straycats.c (check_for_stray): Append 'col -bx' to the
decompressor pipeline rather than connecting two pipelines
together. Don't call pipeline_wait by hand as pipeline_free will
do this for us now.
Fri Aug 31 14:52:22 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (maybe_update_file): Only recache pages automatically if
--update was given.
Fri Aug 31 04:54:45 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_free): Call pipeline_wait if the pipeline
is still running.
* lib/pipeline.h (pipeline_free): Document that this may happen.
Fri Aug 31 04:46:04 BST 2007 Colin Watson <cjwatson@debian.org>
* src/zsoelim.l (main): Call pipeline_install_sigchld.
Wed Aug 29 17:12:52 BST 2007 Lars Wirzenius <liw@iki.fi>
* po/fi.po: Adjust translation of "No manual entry for %s" (Debian
bug #320108).
Wed Aug 29 15:22:54 BST 2007 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
Wed Aug 29 15:18:34 BST 2007 Daniel Nylander <po@danielnylander.se>
* po/sv.po: Update from Translation Project.
Wed Aug 29 12:07:38 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Reorganise slightly. Document mandb --quiet fixes.
Wed Aug 29 11:57:59 BST 2007 Colin Watson <cjwatson@debian.org>
Add an option to apropos to display only items matching all keywords
(thanks, Alfie Costa; Debian bug #259340).
* src/whatis.c (args, long_options, main): New -a/--and option for
apropos.
(usage): Document it.
(apropos): Store a count of how many times each item has been seen
in the hashtable. If --and was given, only display an item if its
count equals the number of supplied keywords.
(main): Store the number of supplied keywords. Adjust hash free
function.
* man/man1/apropos.man1 (SYNOPSIS, OPTIONS): Document --and.
* docs/NEWS: Document this.
Wed Aug 29 11:09:31 BST 2007 Colin Watson <cjwatson@debian.org>
* m4/man-path-progs.m4: Rename to ...
* m4/man-check-progs.m4: ... this. Use AC_CHECK_PROGS rather than
AC_PATH_PROGS.
* configure.ac: Use AC_CHECK_PROGS rather than
AC_PATH_PROG/AC_PATH_PROGS, and MAN_CHECK_PROGS rather than
MAN_PATH_PROGS. This fixes problems due to system utilities moving
around on $PATH (Debian bug #385651).
Wed Aug 29 10:42:08 BST 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Move bogus makefile content ...
* makefile.in: ... here.
Wed Aug 29 10:15:33 BST 2007 Colin Watson <cjwatson@debian.org>
* m4/man-path-progs.m4: Define HAVE_WITH-ARG if the program is
found.
* configure.ac: Rely on the above rather than setting HAVE_GZIP,
HAVE_COMPRESS, and HAVE_BZIP2 here.
Wed Aug 29 09:41:51 BST 2007 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Revert inadvertently-committed debugging
change to straycats logic.
Wed Aug 29 09:34:50 BST 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Add Indonesian translation of NAME.
Wed Aug 29 09:29:36 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document previous apropos change.
Wed Aug 29 09:26:23 BST 2007 Colin Watson <cjwatson@debian.org>
* src/whatis.c (apropos): Add output keys to a hashtable, and skip
any that have already been seen (Debian bug #259338).
(main): Create the hashtable on startup and free it on exit.
Tue Aug 28 19:16:18 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display): Wait for the decomp pipeline in the
!format_cmd case too.
Tue Aug 28 19:07:53 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (display_catman): Take a decompressor pipeline argument.
Connect it to format_cmd.
(display): Update call to display_catman.
Tue Aug 28 18:38:31 BST 2007 Colin Watson <cjwatson@debian.org>
Add a configuration file flag (NOCACHE) to disable cat page caching
(thanks, Ralph Corderoy; Debian bug #196642).
* src/manp.c (add_to_dirlist): Recognise NOCACHE.
* src/man.c (display): Don't save a cat page if NOCACHE is set.
* src/man_db.conf.in: Document NOCACHE.
* man/man5/manpath.man5 (FORMAT): Document NOCACHE.
* docs/NEWS: Document this.
Tue Aug 28 17:23:26 BST 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Bump to 2.5.0; I think there's now enough to justify
that.
Tue Aug 28 17:19:16 BST 2007 Colin Watson <cjwatson@debian.org>
Implement and use a decompression library. This allows cat pages to
be saved in the background (Debian bug #18452) and operation with a
read-only /tmp (Debian bug #165499).
* lib/pipeline.h (struct command): Add support for commands that
consist of calling a function rather than executing a process.
(struct pipeline): Add want_infile and want_outfile members. Note
that infile and outfile default to NULL. Add source, buffer,
buflen, bufmax, line_cache, and peek_offset members.
(command_new_function, command_dump, command_tostring,
pipeline_connect, pipeline_pump, pipeline_read, pipeline_peek,
pipeline_peek_size, pipeline_peek_skip, pipeline_readline,
pipeline_peekline): New prototypes.
(pipeline_join): Update description for want_infile and
want_outfile.
* lib/pipeline.c (command_new, command_dup, command_arg,
command_argv, command_args, command_argstr, command_free): Update
for 'struct command' changes.
(command_new_function, command_dump, command_tostring): New
functions.
(pipeline_new, pipeline_join, pipeline_dump, pipeline_tostring):
Update for 'struct pipeline' changes.
(pipeline_dump): Use command_dump.
(pipeline_tostring): Use command_tostring.
(pipeline_start): Implement want_infile, want_outfile, and
function commands. Make zero-command case work properly (read
directly from input file). Flush all pending stdio output so that
subprocesses don't inherit it.
(pipeline_connect, pipeline_pump, get_block, pipeline_read,
pipeline_peek, pipeline_peek_size, pipeline_peek_skip, get_line,
pipeline_readline, pipeline_peekline): New functions.
* lib/decompress.c, lib/decompress.h: New files, implementing a
decompression abstraction layer.
* lib/Makefile.in: Always compile decompress.c.
* src/lexgrog.l (YY_INPUT): Define to read from a 'struct pipeline'.
(find_name): Use decompress_open/decompress_fdopen rather than
older decompression methods. Split handling once we have a
decompressor pipeline out to ...
(find_name_decompressed): ... here.
* src/check_mandirs.c (test_manfile): Remove decompression code;
find_name will handle this itself now.
* src/compression.c (create_ztemp, decompress, remove_ztemp,
get_ztemp): Remove.
* src/man.c (checked_popen): Remove.
(local_man_loop): Remove decompression code.
(get_preprocessors_from_file): Convert to peeking the first line
from a pipeline.
(get_preprocessors): Adjust arguments and
get_preprocessors_from_file call.
(remove_stdintmp, create_stdintmp): Remove.
(make_roff_command): Remove special handling of stdin, now handled
by peeking a pipeline.
(open_cat_stream): Don't start the returned pipeline.
(close_cat_stream): Remove unnecessary COMP_CAT special case.
(format_display_and_save): Take a decompressor pipeline argument.
Simplify by using pipeline_connect and pipeline_pump.
(format_display): Take a decompressor pipeline argument. Use
pipeline_connect and pipeline_pump.
(display): Use decompress_open/decompress_fdopen rather than older
decompression methods.
(display_filesystem, display_database): Drop remove_ztemp calls.
* src/straycats.c (check_for_stray): Use decompression layer.
Rearrange control flow a bit to reduce duplication. Remove use of
temporary file; use find_name_decompressed instead. Only increment
strays if find_name_decompressed succeeds.
(straycats): Remove temporary file creation.
* src/ult_src.c (ult_src): Use pipeline and decompression layers
rather than older decompression methods.
* src/zsoelim.l (YY_INPUT): Define to read from a 'struct pipeline'.
(<so>\"?[^ \t\n\"]+\"?): Call open_file only once; let it worry
about compression extensions. Decrement so_stack_ptr here if
open_file fails rather than having it do it.
(<lfname>\"?[^ \t\n\"]+\"?): Free the old value of NAME, if set.
(<<EOF>>): Clean up used pipeline and free NAME. Remove so_delete
handling.
(main): Let open_file handle stdin.
(open_file): Use decompress_open/decompress_fdopen rather than
older decompression methods. Don't decrement so_stack_ptr here on
failure.
* configure.ac: Remove decompressor variable. Check for gzopen in
libz.
* include/manconfig.h.in (DECOMPRESSOR): Remove.
(comp_list): Declare extern here.
(create_tempfile): Remove.
(decompress, remove_ztemp, get_ztemp): Remove.
(find_name_decompressed): Add prototype.
* lib/tempfile.c (create_tempfile): Remove. We now only need
temporary directory creation.
* src/man_db.conf.in (decompressor): Remove.
* docs/TODO: Update.
* docs/NEWS: Document this.
Tue Aug 28 11:14:53 BST 2007 Colin Watson <cjwatson@debian.org>
* tools/mandb_[nt]fmt-script: Rename to tools/mandb_fmt-script,
which is a rather less hostile filename.
* tools/README: Update.
* GNUmakefile.in: Update.
Tue Aug 28 10:36:20 BST 2007 Colin Watson <cjwatson@debian.org>
* src/straycats.c (check_for_stray): Drop privileges while opening
temporary file (previously created with dropped privileges).
Tue Aug 28 10:31:03 BST 2007 Colin Watson <cjwatson@debian.org>
* src/straycats.c (straycats): Regain privileges on the error path
too.
Mon Aug 27 20:13:09 BST 2007 Colin Watson <cjwatson@debian.org>
* src/compression.c (comp_file): Free compfile if returning NULL.
Mon Aug 27 20:02:17 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Re-raise SIGINT or SIGQUIT if they
terminate a subprocess.
Mon Aug 27 19:58:19 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Return 1 if we fail to close the
pipeline's output.
Sun Aug 26 23:33:23 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display): Check whether format_cmd is NULL
before discarding stderr from it.
Sun Aug 26 21:20:45 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (checked_popen): Remove unnecessary SECURE_MAN_UID
guard; drop_effective_privs/regain_effective_privs already check
this.
* src/security.c (remove_with_dropped_privs): Likewise. The uid !=
ruid check is no longer necessary now that
drop_effective_privs/regain_effective_privs handle nesting
correctly.
Sun Aug 26 19:40:12 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): If MAN_KEEP_FORMATTING is set in
the environment, don't strip formatting characters with col
(Debian bug #340673).
* man/man1/man.man1 (ENVIRONMENT): Document MAN_KEEP_FORMATTING.
* docs/NEWS: Document this.
Sun Aug 26 16:40:50 BST 2007 Colin Watson <cjwatson@debian.org>
Suppress warnings in --quiet mode (thanks, Martin Dorey; Debian bugs
#348008, #378428, and #411220).
* src/check_mandirs.c (test_manfile): Suppress "bad symlink" warning
under --quiet.
* src/ult_src.c (ult_hardlink): Suppress "can't search directory"
warning under --quiet.
(ult_softlink): Suppress "dangling symlinks" and "can't resolve"
warnings under --quiet.
(ult_src): Suppress "can't resolve", "is self referencing", and
"can't open" warnings under --quiet.
* src/lexgrog.l: Declare global quiet variable.
Sun Aug 26 16:10:26 BST 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (main): Skip descriptions with NULL name or whatis.
This causes pages with no description to be flagged as parse
failures, so that automatic scanners can pick them up more easily.
Sun Aug 26 15:08:45 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (is_section): Disallow sectional extensions of
alphabetic sections, e.g. n and l from the default configuration
(Debian bug #391977). Also disallow sectional extensions beginning
with a digit (Debian bug #421481).
Mon Aug 20 00:10:49 BST 2007 Colin Watson <cjwatson@debian.org>
Discard stderr from formatting processes when outputting to a pager,
to avoid visual corruption from any error messages (thanks, Vincent
Lefevre; Debian bug #372939).
* lib/pipeline.h (struct command): Add discard_err member.
* lib/pipeline.c (command_new, command_dup): Initialise discard_err.
(pipeline_start): Redirect the child's stderr to /dev/null if
discard_err is set.
* src/man.c (discard_stderr): New function to set discard_err on all
commands in a pipeline.
(format_display_and_save, format_display): Use it on format_cmd.
* docs/NEWS: Document this.
Sun Aug 19 21:04:24 BST 2007 Colin Watson <cjwatson@debian.org>
* src/descriptions.c (parse_descriptions): Skip name tokens
containing whitespace, as they are almost never useful as manual
page names.
* man/man1/lexgrog.1 (WHATIS PARSING), docs/NEWS: Document this.
Sun Aug 19 21:00:20 BST 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Skip over .ft font change requests, and the .Vb and
.Ve definitions used by pod2man to begin and end verbatim mode.
This handles some POD-generated pages better.
Sun Aug 19 20:48:42 BST 2007 Colin Watson <cjwatson@debian.org>
Truncate apropos/whatis output to the terminal width by default
(thanks, Dan Jacobson; Debian bug #411721).
* lib/linelength.c: New file for terminal line length detection,
split out from src/man.c. Unlike the previous implementation, this
does its own memoisation rather than requiring explicit
initialisation.
* lib/linelength.h: Prototype get_line_length.
* lib/Makefile.in: Always compile linelength.c.
* src/man.c (line_length, store_line_length): Remove.
(get_roff_line_length): Use get_line_length.
(main): We no longer need to call store_line_length.
* src/whatis.c (args, long_options, main): New -l/--long option.
(usage): Document it.
(display): Truncate names and descriptions to fit within the
terminal width.
* man/man1/apropos.man1 (SYNOPSIS, OPTIONS, ENVIRONMENT): Document
--long and the MANWIDTH override.
* man/man1/whatis.man1 (SYNOPSIS, OPTIONS, ENVIRONMENT): Likewise.
* docs/NEWS: Document this.
Tue Jun 26 10:48:45 BST 2007 Colin Watson <cjwatson@debian.org>
* man/de_DE.88591/man1/man.man1 (UMGEBUNG),
man/de_DE.88591/man8/catman.man8 (BESCHREIBUNG): MANSEC -> MANSECT
(thanks, Holger Kubiak; Debian bug #430635).
Mon Jun 18 10:19:22 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/cleanup.c (do_cleanups): Split out signal-safe processing ...
(do_cleanups_sigsafe): ... here.
(sighandler): Call do_cleanups_sigsafe rather than do_cleanups.
(push_cleanup): Add sigsafe argument to allow cleanup functions to
be flagged as non-signal-safe (e.g. freeing memory).
* lib/cleanup.h: Update prototypes.
* libdb/db_gdbm.c (man_gdbm_firstkey): hash_free cleanup is not
signal-safe.
* src/globbing.c (update_directory_cache): hash_free cleanup is not
signal-safe.
(look_for_file): globfree cleanup is not signal-safe.
* src/man.c (open_cat_stream, display_catman): unlink cleanup is
signal-safe.
* src/mandb.c (cleanup): Split out signal-safe processing ...
(cleanup_sigsafe): ... here.
(main): Call cleanup_sigsafe as well as cleanup.
* src/manp.c (read_config_file): free_config_file cleanup is not
signal-safe.
Mon Jun 18 08:03:30 BST 2007 Colin Watson <cjwatson@debian.org>
* lib/xstrsignal.c: Include config.h.
Mon Jun 18 07:50:56 BST 2007 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c (btree_close, btree_flopen, btree_replace,
btree_insert, btree_fetch, btree_exists, btree_findkey,
btree_firstkey, btree_nextkey, btree_nextkeydata): Rename dbf to
db to avoid shadowing a global variable.
* libdb/mydbm.h: Update prototypes and btree macros likewise.
Sat May 26 10:58:11 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (gripe_no_name): On reflection, borrowing the error
message from gripe_no_man is clearer if a possible section name
was specified.
* po/man-db.pot, po/*.po: Update.
Sat May 26 10:53:58 BST 2007 Colin Watson <cjwatson@debian.org>
* po/man-db.pot: Add to revision control.
Sat May 26 10:52:01 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (gripe_no_name): Resolve ambiguous error message when
asking for a nonexistent manual page that might also be a section
name (Debian bug #421481).
* po/*.po: Update.
Sat May 26 10:46:56 BST 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (gripe_no_name): Complete renaming of section to sect.
Fri May 25 21:23:05 BST 2007 Colin Watson <cjwatson@debian.org>
Add (untested) zh_HK support. Thanks to Alex Lau for advice.
* src/encodings.c (directory_table): Add zh_HK, defaulting to the
BIG5-HKSCS encoding.
(charset_table): Add BIG5-HKSCS, defaulting to the nippon driver.
(compatible_encodings): Recognise BIG5-HKSCS encoding.
(get_roff_encoding): Add special case for zh_HK.UTF-8 locale.
Wed Apr 11 04:37:35 BST 2007 Colin Watson <cjwatson@debian.org>
Add MANPAGER support. Thanks to Faidon Liambotis for the suggestion.
* src/man.c (main): Support MANPAGER, overriding PAGER.
* man/man1/man.man1 (OPTIONS, ENVIRONMENT): Document MANPAGER.
* docs/NEWS: Document this.
Thu Apr 5 18:00:00 BST 2007 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Break whatis definitions at .IP, .HP, .RS, and .RE
(thanks to Ori Avtalion for the report).
Mon Mar 5 10:02:01 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/man_db.conf.in (MANDATORY_MANPATH): Remove /usr/X11R6/man
(Debian bug #413349).
Sun Mar 4 10:40:49 GMT 2007 Colin Watson <cjwatson@debian.org>
* libdb/db_gdbm.c (gdbm_exists): Rename dbf to file.
Sun Mar 4 10:39:14 GMT 2007 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (dbstore): Rename basename to base.
Sun Mar 4 00:51:30 GMT 2007 Colin Watson <cjwatson@debian.org>
Eliminate variable and function shadowing.
* configure.ac (CFLAGS): Add -Wshadow if the compiler is GCC.
* src/manp.c: Don't declare manpathlist here, as it's never used in
this file.
* src/catman.c, src/man.c, src/mandb.c, src/whatis.c: Declare it
here instead.
* lib/pipeline.c (pipeline_start): Remove duplicate declarations of
set and oset.
* libdb/db_ver.c (dbver): Merge into ...
(dbver_rd): ... this, eliminating a global variable.
(dbver_rd, dbver_wr): Rename dbf to dbfile.
* src/accessdb.c (main): Don't redeclare dbf locally.
* src/check_mandirs.c (gripe_rwopen_failed): Use global database
rather than passing it as an argument. Update all callers.
* src/man.c (gripe_no_name): Rename section to sect.
(add_roff_line_length): Rename save_cat to save_cat_p.
(make_roff_command): Declare cmd only once.
(make_browser): Rename command to pattern.
(display): Rename pause to prompt.
* src/manp.c (get_manpath): Rename to ...
(get_manpath_from_path): ... this. Update all callers.
(manpath): Rename to ...
(get_manpath): ... this. Update all callers.
(add_system_manpath): Rename system to one_system.
* src/manp.h (manpath): Rename to ...
(get_manpath): ... this.
* src/ult_src.c (ult_hardlink): Rename link to base.
(ult_src): Rename basename to base.
* src/whatis.c (apropos): Rename match to got_match.
(search): Return found rather than setting the global variable
status based on it.
(main): Use search's return value, eliminating a global variable.
* src/zsoelim.l (usage): Rename status to exit_status.
(open_file): Rename decompress to decomp.
Sat Mar 3 22:35:31 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/manp.c: Declare tmplist as static.
Wed Feb 28 22:04:04 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Close inputs and outputs from
other active pipelines in all subprocesses.
Wed Feb 28 21:57:24 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Don't ignore SIGPIPE in
subprocesses; this has undesirable consequences in some
situations.
(pipeline_wait): Flatten SIGPIPE exit statuses to zero instead.
Tue Feb 27 20:58:31 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Save previous value of SIGQUIT
such that it gets restored as SIGQUIT, not as SIGINT.
Wed Feb 14 12:20:28 GMT 2007 Colin Watson <cjwatson@debian.org>
* m4/man-path-progs.m4: New file with MAN_PATH_PROGS macro.
* configure.ac: Use MAN_PATH_PROGS where reasonable (browser, pager,
nroff, eqn, neqn, tbl, col, vgrind, refer, grap, pic, gzip,
compress, bzip2) to allow overriding the default search for
auxiliary program locations.
* docs/NEWS: Document this.
Wed Feb 14 10:41:28 GMT 2007 Colin Watson <cjwatson@debian.org>
* acinclude.m4: Remove and split into ...
* m4/man-ansi-sprintf.m4, m4/man-bdb.m4, m4/man-fnmatch.m4,
m4/man-gnu-nroff.m4, m4/man-pclose.m4, m4/man-strsignal.m4: ...
these new files.
* configure.ac (AC_CONFIG_SRCDIR): Use src/man.c rather than
acinclude.m4.
Wed Feb 14 10:32:28 GMT 2007 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (make_content): Restore (size_t) cast in
assertion.
Wed Feb 14 10:30:52 GMT 2007 Colin Watson <cjwatson@debian.org>
* libdb/db_gdbm.c (man_gdbm_nextkey): Fix MYDBM_DPTR vs. MYDBM_DSIZE
typo.
Wed Feb 14 09:52:15 GMT 2007 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c (test_insert): Use debug function.
* libdb/mydbm.h (GDBM, NDBM, BTREE): Add MYDBM_DPTR, MYDBM_SET_DPTR,
and MYDBM_DSIZE accessor macros.
(BTREE): Make datum be a typedef for DBT rather than our own
struct, fixing "dereferencing type-punned pointer will break
strict-aliasing rules" warnings from GCC. Adjust MYDBM_DELETE
definition accordingly.
* libdb/db_btree.c (test_insert, btree_findkey, dbstore, dblookup):
Use MYDBM_DPTR, MYDBM_SET_DPTR, and MYDBM_DSIZE macros instead of
accessing dptr and dsize members directly.
* libdb/db_delete.c (dbdelete): Likewise.
* libdb/db_gdbm.c (parent_sortkey_hash_free, sortkey_compare,
man_gdbm_firstkey, man_gdbm_nextkey, gdbm_exists): Likewise.
* libdb/db_lookup.c (copy_datum, make_multi_key, make_content,
dblookup): Likewise.
* libdb/db_store.c (replace_if_necessary, dbstore): Likewise.
* libdb/db_ver.c (dbver, dbver_wr, dbver_rd): Likewise.
* src/accessdb.c (main): Likewise.
* src/catman.c (add_arg, parse_for_sec): Likewise.
* src/check_mandirs.c (update_db_time, reset_db_time, update_db,
purge_pointers, purge_missing): Likewise.
* src/whatis.c (apropos): Likewise.
* libdb/db_btree.c (btree_fetch, btree_findkey, dbstore, dblookup):
Make sure that datum structures allocated on the stack are zeroed
properly.
* libdb/db_delete.c (dbdelete): Likewise.
* libdb/db_lookup.c (make_multi_key, make_content, dblookup):
Likewise.
* libdb/db_store.c (dbstore): Likewise.
* libdb/db_ver.c (dbver, dbver_wr): Likewise.
* src/check_mandirs.c (update_db_time, reset_db_time, update_db):
Likewise.
Tue Feb 13 11:02:08 GMT 2007 Colin Watson <cjwatson@debian.org>
* zsoelim/README: Rename to ...
* src/README.zsoelim: ... this.
* zsoelim/zsoelim.l: Rename to ...
* src/zsoelim.l: ... this.
* zsoelim/Makefile.in: Remove.
* src/Makefile.in: Build, install, and clean zsoelim.
* GNUmakefile.in: Remove references to zsoelim directory. Distribute
src/README.zsoelim.
* configure.ac: Stop producing zsoelim/Makefile.
* docs/HACKING: Remove description of zsoelim directory.
* .bzrignore: Update ignores.
Tue Feb 13 10:52:33 GMT 2007 Colin Watson <cjwatson@debian.org>
* zsoelim/zsoelim.l (yywrap): Remove; use %option noyywrap instead.
* zsoelim/Makefile.in (LDLIBS): zsoelim doesn't need to be linked
with LEXLIB any more.
Mon Feb 12 18:06:42 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/Makefile.in (LFLAGS), zsoelim/Makefile.in (LFLAGS),
zsoelim/zsoelim.l: Set options using %option rather than using
command-line options.
Mon Feb 12 17:52:11 GMT 2007 Colin Watson <cjwatson@debian.org>
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fi.po,
po/fr.po, po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/ro.po,
po/ru.po, po/sv.po, po/vi.po: Update.
Mon Feb 12 17:44:48 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/debug.c: New file for debugging functions.
* include/manconfig.h.in: debug -> debug_level; prototype debug and
debug_error.
* lib/Makefile.in (ALL): Add debug.o.
* Update all emissions of debugging messages to use the new
functions where possible; otherwise, debug -> debug_level.
Mon Feb 12 13:00:42 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Change "No databases updated" to "No databases
created" now that we're no longer string-frozen.
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fi.po,
po/fr.po, po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/ro.po,
po/ru.po, po/sv.po, po/vi.po: Update.
Mon Feb 12 12:58:10 GMT 2007 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Add src/descriptions_store.c.
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fi.po,
po/fr.po, po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/ro.po,
po/ru.po, po/sv.po, po/vi.po: Update.
Mon Feb 12 12:42:44 GMT 2007 Colin Watson <cjwatson@debian.org>
* man/es_ES.88591/man1/man.man1 (OPCIONES),
man/it_IT.88591/man1/man.man1 (OPZIONI),
man/ja_JP.eucJP/man1/man.man1 (オプション): Fix soft-hyphen
declarations to avoid error messages from groff.
Mon Feb 12 10:35:14 GMT 2007 Colin Watson <cjwatson@debian.org>
* Version: 2.4.4.
* configure.ac, docs/NEWS, man-db.lsm: Update.
Mon Feb 12 09:20:09 GMT 2007 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (OPTIONS): Stop claiming that -d does not
display any manual pages (thanks, Dan Jacobson; Debian bug
#340910).
Mon Feb 12 09:04:17 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Treat an empty LANGUAGE environment variable as
equivalent to it being unset.
Sun Feb 11 10:31:04 GMT 2007 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Add forgotten item about SIGCHLD handling.
Sat Feb 3 10:08:03 GMT 2007 Giuseppe Sacco <eppesuig@debian.org>
* man/it_IT.88591/man1/man.man1: Update translation.
* man/THANKS: Update translator credit.
Mon Jan 29 10:51:09 GMT 2007 Valéry Perrin <valery.perrin.debian@free.fr>
* man/fr_FR.88591: Add French man page translations.
* .bzrignore: Add ignores under man/fr_FR.88591.
* GNUmakefile.in (nls_man): Add fr_FR.88591.
* man/THANKS: Add translator credit.
Mon Jan 8 13:31:15 GMT 2007 Colin Watson <cjwatson@debian.org>
Partial update of tempname module from gnulib. (Once we switch to
automake, it will be possible to import it properly.)
* m4/tempname.m4: New file.
* configure.ac: Use gl_FUNC_GEN_TEMPNAME.
Mon Jan 8 13:06:42 GMT 2007 Colin Watson <cjwatson@debian.org>
* docs/ToDo: Rename to ...
* docs/TODO: ... this for consistency with other projects.
* GNUmakefile.in (_docs), docs/README, docs/HACKING: Update
references.
Mon Jan 8 12:45:33 GMT 2007 Colin Watson <cjwatson@debian.org>
* configure.ac (AC_PREREQ): Require autoconf 2.59, for gnulib.
Mon Jan 8 12:37:12 GMT 2007 Colin Watson <cjwatson@debian.org>
Update setenv module from gnulib.
* m4/setenv.m4: New file.
* .bzrignore: Ignore only gettextize-generated files in m4
directory.
* autogen.sh: Pass '-I m4' option to aclocal.
* configure.ac: Use gt_FUNC_SETENV.
* lib/setenv.c, lib/unsetenv.c: Update.
Mon Jan 8 12:14:59 GMT 2007 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_FUNC_STRSIGNAL): Include <string.h> for
strsignal.
Mon Jan 8 12:10:08 GMT 2007 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_FUNC_FNMATCH): New macro to check whether
fnmatch supports the FNM_CASEFOLD flag (a GNU extension).
* configure.ac: Use it.
Mon Jan 8 10:39:24 GMT 2007 Colin Watson <cjwatson@debian.org>
* lib/xsigaction.c: New file: sigaction with EINTR checking.
* include/manconfig.h.in: Add prototype.
* lib/Makefile.in: Build xsigaction.
* lib/cleanup.c (sighandler, trap_signal, untrap_signal): Use
xsigaction instead of bare sigaction.
* lib/pipeline.c (pipeline_start, pipeline_wait,
pipeline_install_sigchld): Use xsigaction instead of
sigaction-plus-EINTR-check.
Mon Jan 8 09:55:48 GMT 2007 Colin Watson <cjwatson@debian.org>
* configure.ac: Rename lynx variable to browser. Check for
www-browser (as on Debian) before lynx.
* include/manconfig.h.in: Rename lynx variable to browser.
Mon Jan 8 09:15:04 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): If no database changes were necessary, then:
don't bother committing database changes or running straycats;
only exit non-zero if the -c option was given; only emit "No
databases updated" message (should be "No databases created" now)
if the -c option was given but not -q, to help automatic
invocation from man.
Sun Jan 7 23:54:18 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Don't try to pass -X or -P-g
options to eqn, only troff (Debian bug #327772).
Sun Jan 7 21:16:57 GMT 2007 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (SYNOPSIS, OPTIONS): Document -X option (thanks,
Sam Morris; Debian bug #360112).
Sun Jan 7 20:58:16 GMT 2007 Colin Watson <cjwatson@debian.org>
Add cross-references to mandb in apropos and whatis documentation
(thanks, Phil Endecott; Debian bug #388755).
* man/man1/apropos.man1 (DESCRIPTION): Mention that the database is
updated by mandb.
(SEE ALSO): Refer to mandb(8).
* man/man1/whatis.man1 (DESCRIPTION, SEE ALSO): Likewise.
Sun Jan 7 20:51:27 GMT 2007 Colin Watson <cjwatson@debian.org>
* src/globbing.c (parse_layout): Actually check upper-cased version
of layout rather than creating it and then ignoring it.
Sun Jan 7 20:48:58 GMT 2007 Colin Watson <cjwatson@debian.org>
Fix a slew of memory leaks, including a nasty per-search leak in
apropos (Debian bug #368749).
* include/manconfig.h.in (ATTRIBUTE_UNUSED): Define to an attribute
marking a variable as unused if using GCC 2.4 or newer.
* lib/error.c (error): Free program_name before exiting.
* src/accessdb.c (main): Put program_name in allocated memory.
* src/wrapper.c (main): Likewise.
* src/Makefile.in: Link wrapper against libman.
* libdb/db_gdbm.c (man_gdbm_firstkey): Register cleanup function to
free parent_sortkey_hash on exit.
* src/globbing.c (update_directory_cache): Register cleanup function
to free dirent_hash on exit.
(look_for_file): Register cleanup function to free gbuf on exit.
Move freeing of gbuf before each search to ...
(match_in_directory): ... here.
* src/manp.c (free_config_file): New function.
(read_config_file): Register cleanup function to free
configuration file structures on exit.
* lib/cleanup.c (do_cleanups): Free the stack after processing it.
* lib/hashtable.c (hash_free): Free ht->hashtab as well.
* libdb/db_lookup.c (free_mandata_elements): Add TODO comment about
strange memory handling.
* src/catman.c (parse_for_sec): Free entry.
(main): Free various variables before exiting.
* src/check_mandirs.c (count_glob_matches): Free info.name.
(purge_missing): Free entry rather than just content.dptr (==
entry.addr).
* src/globbing.c (parse_layout): Free upper_layout.
(match_in_directory): Free pattern_start.pattern in early return
case.
* src/man.c (main): Free various variables before exiting.
* src/mandb.c (finish_up, cleanup, mandb, main): Free various
database file names properly.
(main): Remember to assign the result of getcwd_allocated
somewhere. Free various variables before exiting.
* src/manp.c (add_sections): Free section_list; comment was
incorrect.
(add_nls_manpath): Free temp_locale.
(guess_manpath): Constify path. Free result of get_manpath before
returning.
(get_manpath): Constify path. Free tmplist elements.
(create_pathlist): Free result of xstrndup.
(free_pathlist): New function.
* src/manp.h (free_pathlist): Add prototype.
* src/util.c (mkdbname): Don't allocate mkdbname statically; it's
less confusing just to free it each time.
* src/whatis.c (apropos): Initialise and free info.
(search): Free database.
(main): Free regular expression after each search. Free various
variables before exiting.
Wed Dec 27 13:34:23 GMT 2006 Colin Watson <cjwatson@debian.org>
Teach lexgrog front-end about pages with multiple name/description
pairs (Debian bug #342834).
* src/descriptions.c (parse_descriptions): Allow base_name to be
NULL to suppress ensuring that base_name is in the returned list.
(gripe_bad_store, store_descriptions): Move to ...
* src/descriptions_store.c: ... here.
* src/lexgrog.l (main): Use parse_descriptions to split lg.whatis up
into its component descriptions, and display each on a separate
line.
* src/Makefile.in (mandb, lexgrog): Adjust object lists for the
above.
* docs/NEWS: Document this.
Tue Dec 26 20:52:50 GMT 2006 Colin Watson <cjwatson@debian.org>
* src/man.c (local_man_loop): Fail with an error message if argv is
a character or block device, as we may well hang trying to read
from it and it almost certainly isn't what the caller intended
anyway (Debian bug #341706).
Tue Dec 26 20:11:04 GMT 2006 Colin Watson <cjwatson@debian.org>
* docs/HACKING (Revision control): New section.
* docs/NEWS: Refer to docs/HACKING for bzr archive location.
Tue Dec 26 20:04:32 GMT 2006 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in: Distribute configure.ac and docs/HACKING.
Tue Dec 26 15:06:06 GMT 2006 Colin Watson <cjwatson@debian.org>
* Version: 2.4.4-pre1 (for translators).
Tue Dec 26 15:02:33 GMT 2006 Colin Watson <cjwatson@debian.org>
* po/*.po: Update.
Tue Dec 26 14:49:56 GMT 2006 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c, libdb/db_ver.c: Correct gettext.h inclusions.
Tue Dec 26 14:47:36 GMT 2006 Colin Watson <cjwatson@debian.org>
* libdb/Makefile.in, src/Makefile.in: Remove .depend directory on
clean, not distclean.
Tue Dec 26 14:34:25 GMT 2006 Colin Watson <cjwatson@debian.org>
* autogen.sh: Upgrade to aclocal 1.10.
Tue Dec 26 14:27:59 GMT 2006 Colin Watson <cjwatson@debian.org>
* configure.ac (AM_GNU_GETTEXT_VERSION): Upgrade to gettext 0.15.
* lib/gettext.h: Copy from gettext 0.15.
* lib/README: Mention the above.
* lib/pipeline.c, libdb/db_delete.c, libdb/db_lookup.c,
libdb/db_store.c, libdb/db_ver.c, src/accessdb.c, src/catman.c,
src/check_mandirs.c, src/compression.c, src/convert_name.c,
src/descriptions.c, src/encodings.c, src/fake_security.c,
src/filenames.c, src/globbing.c, src/lexgrog.l, src/lexgrog.l.new,
src/man.c, src/mandb.c, src/manp.c, src/manpath.c, src/security.c,
src/straycats.c, src/ult_src.c, src/version.c, src/whatis.c,
src/wrapper.c, zsoelim/zsoelim.l: Include "gettext.h" rather than
<libintl.h>. Make sure not to include <locale.h> before
"gettext.h", for portability to Solaris.
* src/wrapper.c: Drop ENABLE_NLS test, now handled by gettext.h.
Tue Nov 7 11:00:14 PST 2006 Colin Watson <cjwatson@debian.org>
* src/man.c (make_browser): Remove unnecessary check for browser
being NULL.
* docs/NEWS: Add CVE identifier.
Mon Nov 6 09:45:49 PST 2006 Colin Watson <cjwatson@debian.org>
* configure.ac, include/manconfig.h.in: Only prepend "exec " to
WEB_BROWSER if configure found a web browser.
Mon Nov 6 09:01:13 PST 2006 Colin Watson <cjwatson@debian.org>
* src/globbing.c: _GNU_SOURCE is defined throughout now, so don't
redefine it.
Mon Nov 6 08:40:54 PST 2006 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document switch to bzr.
Mon Nov 6 08:34:57 PST 2006 Colin Watson <cjwatson@debian.org>
* src/man.c (make_browser): Fix buffer overrun if BROWSER contains
multiple %s expansions. Thanks to Jochen Voß for the report.
* docs/NEWS: Document this.
Sun Nov 5 23:41:45 PST 2006 Colin Watson <cjwatson@debian.org>
* configure.ac: Call AC_GNU_SOURCE before AC_PROG_CC, as autoconf
objects otherwise (due to macros called by AM_GNU_GETTEXT). Let's
hope using _GNU_SOURCE for everything doesn't break anything ...
Sat Nov 4 17:24:27 GMT 2006 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in, docs/HACKING: Update references to configure.in to
say configure.ac instead.
Sat Nov 4 17:04:54 GMT 2006 Colin Watson <cjwatson@debian.org>
* configure.ac: Use AS_HELP_STRING throughout.
(AC_PREREQ): Bump to 2.53.
Sat Nov 4 16:52:20 GMT 2006 Colin Watson <cjwatson@debian.org>
* configure.in: Rename to configure.ac.
Sat Nov 4 16:41:59 GMT 2006 Colin Watson <cjwatson@debian.org>
* autogen.sh: Force the use of aclocal-1.8; at least 1.4 won't work
correctly.
Fri Oct 20 12:46:41 BST 2006 Colin Watson <cjwatson@debian.org>
* tools/config.guess: Update to 2006-07-02.
* tools/config.sub: Update to 2006-09-20.
Sun Sep 17 09:20:33 BST 2006 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Ignore SIGPIPE in child processes
(Debian bug #387864).
* docs/NEWS: Document this.
Thu Aug 10 17:23:03 BST 2006 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_default_device): Always use utf8 if preconv
is available.
(get_roff_encoding): Skip CJK UTF-8 hack if preconv is available.
* src/man.c (make_roff_command): Use preconv if available to recode
input even if the encoding is detected by means other than looking
at the preprocessor line. Skip iconv preprocessing in that case.
Thu Aug 10 17:00:21 BST 2006 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_groff_preconv): New function, moved from
src/man.c because other functions here are going to need it.
* src/encodings.h (get_groff_preconv): Prototype it.
* src/man.c (make_roff_command): Use it.
Wed Aug 9 14:58:50 BST 2006 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Set page_encoding to pp_encoding if
available. Plug a memory leak.
Wed Aug 9 14:45:13 BST 2006 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (GNUC_PREREQ): Check for __GNUC_MINOR__,
not __GNUC_MINOR.
Wed Aug 9 14:10:57 BST 2006 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Recognise preprocessor encoding
declarations like "-*- coding: utf8 -*-". Invoke the "preconv"
preprocessor for these if available.
Mon Jul 3 04:54:13 BST 2006 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (make_content): Break up dsize calculation
differently for legibility.
Tue Mar 21 11:08:55 GMT 2006 Colin Watson <cjwatson@debian.org>
Improve portability to Solaris and other systems without setenv.
* lib/setenv.c, lib/setenv.h, lib/unsetenv.c: Copied from gnulib
0.0.20051110-1.
* lib/Makefile.in (ALLSRCS): Add setenv.c and unsetenv.c.
* lib/README: Mention the above.
* configure.in: Check for setenv and unsetenv and use the gnulib
versions if they are unavailable.
* src/man.c, src/whatis.c: Include lib/setenv.h.
Thu Mar 9 08:08:39 GMT 2006 Daniel Nylander <po@danielnylander.se>
* po/sv.po: Update from Translation Project.
* man/THANKS: Add translator credit.
Wed Feb 22 09:44:02 GMT 2006 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_new_argstr): Skip "exec" at the start of a
command, to make old configuration files work (Debian bug
#353959).
* docs/NEWS: Document this.
Mon Feb 20 09:33:18 GMT 2006 Henning Makholm <henning@makholm.net>
* src/lexgrog.l: Add Danish translation of NAME.
Sun Jan 22 19:02:43 GMT 2006 Clytie Siddall <clytie@riverland.net.au>
* po/vi.po: Update from Translation Project.
* po/LINGUAS: Add vi.
* man/THANKS: Add translator credit.
Sun Jan 22 18:49:16 GMT 2006 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1, man/es_ES.88591/man1/man.man1,
man/it_IT.88591/man1/man.man1: Fix mistaken use of .l instead of
.I (thanks, Valéry Perrin).
Thu Jan 19 10:15:33 GMT 2006 Karl Eichwalder <ke@suse.de>
* po/de.po: Update from Translation Project.
* man/THANKS: Add translator credit.
Sat Dec 31 16:30:44 GMT 2005 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (hash_free): Update function name in debug
message.
Sun Dec 18 08:57:01 GMT 2005 Yuri Kozlov <kozlov.y@gmail.com>
* src/lexgrog.l: Change encoding of Russian translation of NAME to
KOI8-R.
Sat Dec 10 17:31:45 CET 2005 Giuseppe Sacco <eppesuig@debian.org>
* Updated italian translation po/it.po
Mon Nov 14 11:02:54 GMT 2005 Yuri Kozlov <kozlov.y@gmail.com>
* src/lexgrog.l: Add Russian translation of NAME.
Tue Oct 4 10:34:03 BST 2005 Colin Watson <cjwatson@debian.org>
* tools/chconfig: Start with "#! /" rather than "#!/", for 4.2BSD.
Wed Sep 21 10:56:22 BST 2005 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Queue SIGCHLD for the whole time
we're collecting child process statuses; we need to keep a careful
count of processes. Forget any previous errno before calling
reap_children. Should fix Debian bug #326488.
Wed Sep 21 10:47:51 BST 2005 Nicolas Velin <nsv@fr.st>
* po/fr.po: Update from Rosetta.
* man/THANKS: Add translator credit.
Wed Sep 21 10:36:19 BST 2005 Ondřej Surý <ondrej@sury.org>
* po/cs.po: Update from Rosetta.
* man/THANKS: Add translator credit.
Wed Sep 21 10:33:13 BST 2005 Colin Watson <cjwatson@debian.org>
* man/THANKS: Recode to UTF-8.
Wed Sep 21 10:10:12 BST 2005 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start, pipeline_wait): Ignore SIGINT and
SIGQUIT in the parent while running subprocesses (Debian bug
#328982).
* docs/NEWS: Document this.
Wed Sep 21 10:04:42 BST 2005 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Start 2.4.4.
Wed Sep 21 09:45:48 BST 2005 Colin Watson <cjwatson@debian.org>
* configure.in: Substitute basename of config_file as
config_file_basename.
* src/man_db.conf.in: Use @config_file_basename@ in header comment.
Thu Sep 1 14:10:07 BST 2005 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (argstr_get_word): Use an enum for quotemode rather
than magic numbers.
Thu Sep 1 14:04:29 BST 2005 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (ATTRIBUTE_WARN_UNUSED_RESULT): Define to a
function attribute enabling unused result checking if using GCC
3.4 or newer.
(xmalloc, xrealloc, strappend): Use it.
Wed Aug 31 01:23:55 BST 2005 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Simplified Chinese ->
GB2312 and Traditional Chinese -> BIG5.
(charset_table): Use the nippon device for BIG5, GB2312, and GBK.
(device_table): Assume that the nippon device is
encoding-agnostic, since it handles several encodings now.
(compatible_encodings, get_roff_encoding): Extend the ja_JP.UTF-8
hack to cover zh_CN.UTF-8, zh_SG.UTF-8, and zh_TW.UTF-8 too.
Sun Jul 31 16:34:15 BST 2005 Colin Watson <cjwatson@debian.org>
* docs/COPYING, docs/COPYING.LIB: Update from www.gnu.org to pick up
the FSF's new address.
* Update all other GPL and LGPL notices with the new address (apart
from those in externally-maintained files).
Wed Jul 27 11:29:02 BST 2005 Colin Watson <cjwatson@debian.org>
* src/man.c (gripe_no_man): Don't emit a different message in the
troff case; it's extra translation load and nobody really cares
about the distinction. Avoid splitting up a sentence into two
translatable pieces (Debian bug #320111).
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fi.po,
po/fr.po, po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/ro.po,
po/ru.po, po/sv.po: Update with msgmerge.
Tue Jul 26 00:05:02 BST 2005 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Use 'col -b -p -x' rather than just
'col -b' when stdout is not a terminal.
Tue Jul 12 02:08:41 BST 2005 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (ATTRIBUTE_MALLOC): Define to a function
attribute enabling malloc return value checking if using GCC 2.96
or newer.
(xmalloc, xrealloc, xstrdup, xstrndup): Use it.
Tue Jul 12 01:59:10 BST 2005 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (GNUC_PREREQ): Helper macro borrowed from
glibc.
(ATTRIBUTE_FORMAT_PRINTF): Define to a function attribute enabling
printf-style format string checking if using GCC 2.0 or newer.
(ATTRIBUTE_SENTINEL): Use GNUC_PREREQ. Use __sentinel__ rather
than sentinel to avoid possible clashes with other macros.
* lib/error.h (error): Add printf format attribute.
* lib/xmalloc.c: Include "error.h" rather than redeclaring error.
Mon Jul 11 18:12:58 BST 2005 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Emit a debugging message.
Mon Jul 11 14:41:52 BST 2005 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in: Define ATTRIBUTE_SENTINEL to a function
attribute enabling sentinel checking if using GCC 4.0 or newer.
(strappend): Use it.
* lib/pipeline.h (command_new_args, command_args,
pipeline_new_commands, pipeline_command_args, pipeline_commands):
Likewise.
Mon Jul 11 14:38:30 BST 2005 Colin Watson <cjwatson@debian.org>
* lib/Makefile.in, libdb/Makefile.in, src/Makefile.in,
zsoelim/Makefile.in: Stop using -I-; it's deprecated in GCC 4.0,
and it doesn't seem worth the effort of switching to the -iquote
replacement.
Mon Jul 11 12:02:57 BST 2005 Colin Watson <cjwatson@debian.org>
* src/man.c (usage): Fix "gditview" typo (Debian bug #317696).
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fi.po,
po/fr.po, po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/ro.po,
po/ru.po, po/sv.po: Unfuzzy all translations.
Fri Jul 8 13:12:29 BST 2005 Ralph Corderoy <ralph@inputplus.co.uk>
* src/man.c (display): Drop "Reformatting %s, please wait..."
message; it's been years since processing power was low enough for
this to be relevant.
Mon Jul 4 00:49:36 BST 2005 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (EVERYTHING, ALL): List intl before lib, since
intl/Makefile runs config.status and thus recreates lib/Makefile
after lib has been distcleaned.
Sun Jul 3 22:14:02 BST 2005 Colin Watson <cjwatson@debian.org>
* Version: 2.4.3.
* configure.in, docs/NEWS, man-db.lsm: Update.
* man-db.lsm: Correct primary download location.
Sun Jul 3 20:55:13 BST 2005 Colin Watson <cjwatson@debian.org>
* configure.in: Define HAVE_GZIP, HAVE_COMPRESS, and HAVE_BZIP2 as
appropriate.
* include/comp_src.h.in: Conditionalise compressor list on
HAVE_GZIP, HAVE_COMPRESS, and HAVE_BZIP2 rather than on GUNZIP,
UNCOMPRESS, and BUNZIP2; if a compressor isn't detected, the
latter will end up as empty strings, not undefined. Thanks to Paul
Slootman (Debian bug #196097).
* docs/NEWS: Document this.
Sun Jul 3 18:58:14 BST 2005 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (__distclean): Remove po/Makevars.template.
Sun Jul 3 18:11:56 BST 2005 Colin Watson <cjwatson@debian.org>
* docs/NEWS: List more language support since 2.4.2.
Sun Jul 3 17:45:18 BST 2005 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Minor clarification.
Sun Jul 3 17:41:20 BST 2005 Robert Luberda <robert@debian.org>
* po/pl.po: Update.
Sun Jul 3 17:39:14 BST 2005 Yuri Kozlov <yuray@id.ru>
* po/ru.po: Update.
Tue Jun 21 13:58:37 BST 2005 Jordi Mallach <jordi@gnu.org>
* po/ca.po: Update from Translation Project.
* man/THANKS: Update e-mail address.
Mon Jun 20 14:46:22 BST 2005 Colin Watson <cjwatson@debian.org>
* tools/config.guess, tools/config.sub: Update to 2005-04-22.
Fri Jun 10 15:05:53 BST 2005 Colin Watson <cjwatson@debian.org>
* Version: 2.4.3-pre1 (for translators).
Fri Jun 10 14:53:52 BST 2005 Colin Watson <cjwatson@debian.org>
* man/THANKS: Add translator credits for it.po, ja.po, pt_BR.po, and
sv.po.
Fri Jun 10 14:36:36 BST 2005 Colin Watson <cjwatson@debian.org>
* po/LINGUAS: Add ro.
* man/THANKS: Add translator credit.
* po/fi.po, po/ro.po: Update with msgmerge.
Fri Jun 10 14:31:42 BST 2005 Eugen Hoanca <eugenh@urban-grafx.ro>
* po/ro.po: New from Translation Project.
Fri Jun 10 14:29:17 BST 2005 Jordi Mallach <jordi@sindominio.net>
* po/ca.po: Update from Translation Project.
Fri Jun 10 14:22:04 BST 2005 Colin Watson <cjwatson@debian.org>
* po/fi.po: New, from Lauri Nurmi via the Translation Project.
* po/LINGUAS: Add fi.
* man/THANKS: Add translator credit.
Mon Jun 6 02:15:07 BST 2005 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document various changes since this file was last
updated.
Sun Jun 5 15:47:10 BST 2005 Jeremy C. Reed <reed@reedmedia.net>
* configure.in: Add support for db4. Check for db3/db_185.h before
db_185.h.
Sat Jun 4 12:42:26 BST 2005 Colin Watson <cjwatson@debian.org>
* docs/manpage.example.mdoc: New file.
Sat Jun 4 12:23:15 BST 2005 Colin Watson <cjwatson@debian.org>
* po/ru.po: Update with msgmerge.
Sat Jun 4 12:21:17 BST 2005 Colin Watson <cjwatson@debian.org>
* po/ru.po: New, from Yuri Kozlov (Debian bug #268584).
* po/LINGUAS: Add ru.
* man/THANKS: Add translator credit.
Sat Jun 4 12:17:52 BST 2005 Colin Watson <cjwatson@debian.org>
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/sv.po: Update with
msgmerge.
Sat Jun 4 11:48:58 BST 2005 Colin Watson <cjwatson@debian.org>
* po/pl.po: Fix typo in Last-Translator e-mail address.
Sat Jun 4 11:46:13 BST 2005 Colin Watson <cjwatson@debian.org>
* po/pl.po: New, from Robert Luberda (Debian bug #245057).
* po/LINGUAS: Add pl.
* man/THANKS: Add translator credit.
Sat Jun 4 10:59:29 BST 2005 Colin Watson <cjwatson@debian.org>
* lib/getcwdalloc.c, lib/getcwdalloc.h: Fix header comments.
Sat Jun 4 10:55:47 BST 2005 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (MAN_NAME): Terminate NAME section parsing on
encountering a macro definition (Debian bug #275562).
Wed Jan 5 15:08:06 GMT 2005 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Turkish -> ISO-8859-9.
Sun Dec 12 21:48:04 CET 2004 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_sigchld): Don't bother saving and
restoring errno if SIGCHLD is being queued.
Mon Nov 8 09:57:27 GMT 2004 Colin Watson <cjwatson@debian.org>
* lib/pathsearch.c: New file, containing functions for searching
$PATH.
* lib/pathsearch.h: Prototype pathsearch_executable().
* lib/Makefile.in: Always compile pathsearch.c.
* src/man.c (find_in_path): Remove; replaced by
pathsearch_executable().
(gripe_no_man): Use pathsearch_executable() instead of
find_in_path().
Mon Nov 8 09:52:02 GMT 2004 Colin Watson <cjwatson@debian.org>
Get rid of plain getcwd(); this allows getting rid of most uses of
PATH_MAX.
* lib/getcwdalloc.c: New file, providing an allocating version of
getcwd().
* lib/getcwdalloc.h: Prototype it.
* lib/Makefile.in: Always compile getcwdalloc.c.
* src/man.c (main, format_display): Use getcwd_allocated() instead
of getcwd().
* src/mandb.c (main): Likewise.
* src/manp.c (add_dir_to_path_list): Likewise.
Mon Nov 8 09:40:07 GMT 2004 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (null_hash_free): No-op hash_free_ptr provider,
for convenience.
* lib/hashtable.h (null_hash_free): Prototype it.
Mon Nov 8 09:36:55 GMT 2004 Colin Watson <cjwatson@debian.org>
* acinclude.m4: Improve quoting to stop aclocal complaining. Improve
indentation. Get rid of unnecessary changequote().
Sun Nov 7 16:07:26 GMT 2004 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Close pipeline output before
reaping processes, so that writing processes get SIGPIPE.
Sun Nov 7 16:05:08 GMT 2004 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): Fix active process debugging
output to include processes without statuses.
Sun Nov 7 16:01:26 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/compression.c (decompress): Invalidate file_fd after closing
it.
Sun Nov 7 15:31:18 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Compare extensions' positions in
section_list at the same time as sections, but do the lexical
comparison fallback after comparing ids; this restores the
intended ability to use SECTIONS to move extensions out of order
with respect to their parent sections without breaking the earlier
workaround for Debian bug #204249.
Thu Jul 22 14:46:30 BST 2004 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (testmandirs): Always scan directory if last
is 0 (i.e. creating) to avoid problems on systems with badly
broken clocks set before the epoch.
Mon Jun 28 03:56:56 BST 2004 Colin Watson <cjwatson@debian.org>
* src/man.c (man): Free candidate list after displaying it.
Mon Jun 28 01:19:45 BST 2004 David Weinehall <tao@debian.org>
* tools/mkcatdirs: Replace XSIish uses of 'test' with more portable
code.
Thu Apr 1 05:10:50 BST 2004 Colin Watson <cjwatson@debian.org>
* src/encodings.c (charset_table): Use the latin1 device for
ISO-8859-15, even though that isn't exactly right.
Thu Apr 1 04:56:02 BST 2004 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_page_encoding, get_standard_output_encoding):
Remove trailing ,<version> and @<modifier> from locale names.
* src/encodings.h (get_page_encoding, get_standard_output_encoding):
Update prototypes: these no longer return const.
* src/man.c (make_roff_command): Free page_encoding and cat_charset.
Thu Apr 1 00:18:55 BST 2004 Colin Watson <cjwatson@debian.org>
* src/man.c (do_extern): Pass only options understood by
apropos/whatis, using the pipeline library (Debian bug #207436).
(main): Make optind global. Install SIGINT and SIGCHLD handlers
earlier. Update do_extern call.
* docs/NEWS: Document this.
Wed Mar 31 23:40:15 BST 2004 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): If stdout isn't a terminal, get rid
of formatting characters using GROFF_NO_SGR=1 and 'col -b'
(thanks, Adam Heath).
* docs/NEWS: Document this.
Thu Mar 25 19:31:02 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/whatis.c (apropos): Move warning-silencing code to the bottom
of the function, so that it doesn't interfere with declarations.
Sun Mar 14 03:52:12 UTC 2004 Giuseppe Sacco <eppesuig@debian.org>
* Updated italian translation (corrected three fuzzy strings)
Tue Mar 9 10:25:40 GMT 2004 Colin Watson <cjwatson@debian.org>
* zsoelim/zsoelim.l: Define debug for the benefit of pipeline.c.
(open_file): Use pipeline library.
Tue Mar 9 01:54:20 GMT 2004 Colin Watson <cjwatson@debian.org>
* zsoelim/zsoelim.l: Long-overdue style cleanup per docs/HACKING. No
functional changes.
Tue Mar 9 00:37:23 GMT 2004 Colin Watson <cjwatson@debian.org>
Roll out the new pipeline library in most programs.
* src/compression.c (decompress): Use pipeline library.
* src/fake_security.c (do_system_drop_privs): Likewise.
* src/lexgrog.l (main): Initialize pipeline library.
* src/man.c (checked_popen, gripe_system, checked_system, run_mandb,
format_display_and_save, format_display, display_catman, display):
Use pipeline library.
(add_roff_line_length): Append to a command structure rather than
using strappend.
(main): Initialize pipeline library.
(make_roff_command): Return a constructed pipeline instead of a
malloced string. This plugs various hitherto difficult leaks. Drop
support for changing the line length with groff < 1.18, as the
pipeline library can't handle compound commands in pipelines yet.
(make_browser): Return a constructed pipeline instead of a
statically allocated string. The pipeline construction is very
crude for now.
(make_display_command): Return a constructed pipeline instead of a
malloced string. The htmlout case is strange for now (return NULL
and let format_display sort it out).
(tmp_cat_filename): Handle debug > /dev/null here rather than in
open_cat_stream. Construct the temporary cat filename more
sensibly. Open the temporary file and record its file descriptor.
(open_cat_stream): Return a constructed (and started, if COMP_CAT
is defined) pipeline instead of a stream. This gets rid of a
fixed-size buffer associated with security problems in the past,
although it wasn't a vulnerability in itself.
(close_cat_stream): Clean up pipeline rather than stream.
(format_display): The htmlout case ignores disp_cmd and puts the
display pipeline together itself.
(display): When calling format_display_and_save, assert (disp_cmd)
to make sure we aren't in the htmlout case.
* src/man.h (make_roff_command): Drop unnecessary prototype.
* src/mandb.c (main): Initialize pipeline library.
* src/security.c (do_system_drop_privs): Take a pipeline rather than
a string.
* src/security.h (do_system_drop_privs): Update prototype.
* src/straycats.c (check_for_stray): Use pipeline library.
* src/util.c (do_system): Take a pipeline rather than a string. This
becomes a simple synchronous wrapper around pipeline_start and
pipeline_wait.
* src/whatis.c (use_grep): Use pipeline library.
(main): Initialize pipeline library.
* include/manconfig.h.in (struct pipeline): Declare opaquely.
(do_system): Update prototype.
* configure.in: Drop 'exec' from default pager; no longer needed
since the pipeline library obviates the use of /bin/sh -c.
* docs/NEWS: Document all this.
Mon Mar 8 16:45:27 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/compression.c (comp_info): If the new want_stem argument is
set, put a copy of the filename without extension in comp->stem
rather than a strange thing in comp->file. This is closer to what
most callers actually want, and removes a lot of memory management
confusion.
(comp_file): Use comp->stem instead of comp->file (previous usage
matched this semantically).
* include/manconfig.h.in (struct compression): Replace 'file' with
'stem'.
(comp_info): Update prototype.
* src/convert_name.c (convert_name): Update comp_info call.
* src/filenames.c (filename_info): Fix misuse of basename. Update
comp_info call.
* src/lexgrog.l (find_name): Update comp_info call.
* src/man.c (local_man_loop): Likewise.
* src/straycats.c (check_for_stray): Likewise.
* src/ult_src.c (ult_src): Likewise.
* zsoelim/zsoelim.l (open_file): Don't set comp->file. Add a
clone-and-hack warning.
Mon Mar 8 16:07:11 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/compression.c (decompress): Error out if decompression program
not found, as a temporary workaround for poor detection in
configure.
Mon Mar 8 15:59:29 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/manp.c (get_catpath): Use xstrdup and strappend rather than
doing memory management by hand.
Mon Mar 8 11:28:51 GMT 2004 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in: Protect against multiple inclusion.
Mon Mar 8 11:21:05 GMT 2004 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_dump): Show caller-supplied input and
output file descriptors.
* lib/pipeline.c (command_free, pipeline_free): Return safely if
argument is NULL.
* lib/pipeline.h (command_free, pipeline_free): Document NULL
arguments as a safe no-op, like free().
Mon Mar 8 09:33:08 GMT 2004 Colin Watson <cjwatson@debian.org>
* docs/manpage.example (DESCRIPTION): ".SS macros" -> ".SS macro".
Mon Mar 8 00:16:53 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Instead of comparing extensions
followed by ids, compare pure sections first, then ids, then
extensions. This works around the worst effects of Debian bug
#204249, in which we have an incorrect whatis ref xterm(1) in
/usr/share/man and a correct real xterm(1x) in /usr/X11R6/man.
Sun Mar 7 23:55:48 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Keep searching for more specific
extension matches in section_list even after finding one.
Wed Jan 28 00:15:00 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Add a terrifying hack to make '.B "..."' work in
NAME sections. lex is really the wrong tool for this job, I feel.
Tue Jan 27 23:37:58 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Attempt to fix problems with groff requests
immediately following .SH NAME. All patterns in the MAN_FILE and
MAN_NAME states need to avoid matching trailing newlines, since
they're needed by other patterns to detect beginning-of-line.
In order to ignore any excess whitespace following .SH NAME, which
is how this problem got created, introduce a MAN_PRENAME start
condition, which just skips over spacing. Some evil use of yyless
is needed to transition properly to the MAN_NAME start condition
from this without eating trailing newlines.
Tue Jan 27 21:19:41 GMT 2004 Colin Watson <cjwatson@debian.org>
* src/Makefile.in (LFLAGS): Add -d if LEXGROG_DEBUG=yes.
Wed Dec 24 10:29:16 UTC 2003 Giuseppe Sacco <eppesuig@debian.org>
* src/whatis.c (usage): Fix usage message for --section
* updated italian translation.
Wed Dec 24 10:10:16 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/whatis.c (usage): Fix usage message for --section, thanks to
Giuseppe Sacco.
Wed Dec 24 09:14:19 UTC 2003 Giuseppe Sacco <eppesuig@debian.org>
* Updated italian translation
Mon Nov 17 22:50:39 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/globbing.c (match_in_directory): Oops; stop decrementing
bsearched when it reaches the beginning of the cache->names array,
otherwise patterns beginning with a metacharacter cause a
segfault. (The decrement loop is necessary because bsearch()
doesn't specify which element it returns if there are multiple
matches.)
Mon Nov 17 05:04:54 GMT 2003 Colin Watson <cjwatson@debian.org>
Speed up mandb's purging functions further, from about 20 seconds to
about 2 seconds on my i386 laptop, by being more intelligent about
calling fnmatch().
* src/globbing.c (cache_compare): New function.
(update_directory_cache): Sort the cache.
(pattern_compare): New function.
(match_in_directory): Rather than scanning the whole cache, start
from a point matching the start of the pattern up to the first
metacharacter, and stop once this no longer matches.
* src/globbing.c (TEST): Include <libintl.h> and define _() so that
the test code compiles.
(main): Set program_name before any calls to usage().
Sun Nov 16 21:45:24 GMT 2003 Colin Watson <cjwatson@debian.org>
* docs/HACKING: Mention the new CTYPE() macro.
Sun Nov 16 21:29:35 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/convert_name.c (convert_name): Reorganize and clarify. The
alternate argument was confusing and is now gone. Add a new fsstnd
argument which controls whether the "man1" to "cat1" etc.
conversion is performed. That conversion now makes sure that the
directory name starts with "man" before blithely overwriting it.
Treat comp->file as const, since it will be soon.
* src/convert_name.h (convert_name): Update prototype.
* src/man.c (find_cat_file): New logic. First, check for existing
FSSTND cat files; then check for a cat dir based on the ultimate
source, if different from the original (Debian bug #129575); then
check for a cat dir based on the original man page path.
(display): Drop the !local_man_file case which tries to work out
whether to save a cat, as it's not a problem to try regardless of
whether there's already one in a FSSTND location.
(display_filesystem, display_database): Add extra argument to
find_cat_file() so that it knows the original man page path as
distinct from the ultimate source.
(display_filesystem): Remove debugging output, now in
find_cat_file().
* docs/ToDo: Remove entry about cleaning up cat file code, now done.
Sun Nov 16 19:28:38 GMT 2003 Colin Watson <cjwatson@debian.org>
Add an option to apropos and whatis to allow specification of a
section to search.
* src/whatis.c (args, long_options, main): New -s/--section option.
(usage): Document it.
(whatis): Tell dblookup_all() to look in the section named by
--section, if present.
(apropos): If --section was given, check that it matches either
info.sec or info.ext for each page. Use info.whatis rather than
parsing the whatis out manually.
* man/man1/apropos.man1 (SYNOPSIS, OPTIONS): Document --section.
* man/man1/whatis.man1 (SYNOPSIS, OPTIONS): Likewise.
* docs/NEWS: Start 2.4.3. Document the above.
Sun Nov 16 18:47:46 GMT 2003 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (CTYPE): New macro to help get <ctype.h>
calls right.
* libdb/db_lookup.c (name_to_key): Use it.
* src/globbing.c (parse_layout, look_for_file): Likewise.
* src/man.c (manopt_to_env, main): Likewise.
* src/manp.c (add_to_dirlist): Likewise.
* src/ult_src.c (ult_softlink, test_for_include): Likewise.
* src/whatis.c (lower, match, word_fnmatch): Likewise.
Sun Nov 16 17:06:29 GMT 2003 Colin Watson <cjwatson@debian.org>
Style cleanups; no functional changes.
* src/whatis.c (usage, match, apropos, search, main): Add a space
before the open parenthesis in several function calls.
(apropos): The nesting level has got out of control here. Use a
goto and a 'nextpage' label near the end of the loop instead.
Sun Nov 16 15:49:12 GMT 2003 Erik Andersen <andersen@codepoet.org>
* src/straycats.c (check_for_stray): Add missing open brace to
non-HAVE_CANONICALIZE_FILE_NAME case.
Tue Oct 28 16:24:41 GMT 2003 Colin Watson <cjwatson@debian.org>
* man/Makefile.in: Create new th* variables with capitalized
variants of program names for .TH lines.
* man/de_DE.88591/man1/*.man1, man/de_DE.88591/man5/*.man5,
man/de_DE.88591/man8/*.man8, man/es_ES.88591/man1/*.man1,
man/es_ES.88591/man5/*.man5, man/es_ES.88591/man8/*.man8,
man/it_IT.88591/man1/*.man1, man/it_IT.88591/man5/*.man5,
man/it_IT.88591/man8/*.man8, man/ja_JP.eucJP/man1/*.man1,
man/ja_JP.eucJP/man5/*.man5, man/ja_JP.eucJP/man8/*.man8,
man/man1/*.man1, man/man5/*.man5, man/man8/*.man8: Capitalize all
page titles in .TH lines.
* man/de_DE.88591/man5/manpath.man5: Fix typo: 'man' => 'manpath'.
Sun Sep 28 20:11:55 BST 2003 Colin Watson <cjwatson@debian.org>
* man-db.gnu: Remove. This is licensed under the GFDL, whose
freeness is under serious question. I'm not sure if the FSF
actually have standing to claim copyright over this file in the
first place, but it doesn't need to be in CVS here so I don't feel
like arguing about it.
Sun Sep 21 02:17:43 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Dump pipeline in debugging mode.
Sun Sep 21 02:15:17 BST 2003 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Add a forgotten entry for 2.4.2.
Sat Sep 20 18:35:54 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Galician -> ISO-8859-1,
Indonesian -> ISO-8859-1, Croatian -> ISO-8859-2, and Slovak ->
ISO-8859-2.
Sat Sep 20 11:57:58 BST 2003 Colin Watson <cjwatson@debian.org>
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po, po/pt_BR.po, po/sv.po: Update with msgmerge
(po/Makevars changed).
Sat Sep 20 01:07:24 BST 2003 Colin Watson <cjwatson@debian.org>
* Version: 2.4.2.
* configure.in, docs/NEWS, man-db.gnu, man-db.lsm: Update.
* man-db.gnu: Suggest libgdbm-dev rather than libdb3-dev.
* man-db.lsm: Suggest GDBM.
Sat Sep 20 00:11:14 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Don't recode output if an explicit
encoding was specified with -E.
Sat Sep 20 00:09:03 BST 2003 Colin Watson <cjwatson@debian.org>
* po/.cvsignore: Add stamp-po.
Fri Sep 19 22:49:14 BST 2003 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_CHECK_BDB): Temporarily add $lib to LIBS for
AC_TRY_LINK, not to DBLIBS; but add it to DBLIBS if the test
succeeds.
* configure.in: Simply set DBLIBS rather than appending to it.
Fri Sep 19 22:20:07 BST 2003 Colin Watson <cjwatson@debian.org>
* autogen.sh: Run aclocal after autopoint, in accordance with the
autopoint info documentation.
Fri Sep 19 22:17:18 BST 2003 Colin Watson <cjwatson@debian.org>
* configure.in (AM_GNU_GETTEXT_VERSION): Upgrade to gettext 0.12.1.
* po/Makevars (MSGID_BUGS_ADDRESS): Set to me.
* po/.cvsignore: Add Makevars.template.
Fri Sep 19 00:48:07 BST 2003 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (MAN_FILE): Accept blank lines immediately following
".SH NAME".
Fri Sep 19 00:06:02 BST 2003 Colin Watson <cjwatson@debian.org>
* man/man8/mandb.man8 (OPTIONS): Improve --filename wording a bit.
Wed Sep 17 07:17:22 BST 2003 Colin Watson <cjwatson@debian.org>
Fix case where a page explicitly encoded in UTF-8 has to be recoded
down to a non-ISO-8859-1 legacy encoding for processing by groff and
then back up to UTF-8 for display.
* src/encodings.c (get_page_encoding): New function, renamed from
get_source_encoding.
(get_source_encoding): Return only the canonical source encoding,
not any explicit encoding in the directory name. This allows us to
take account of differing explicit encoding and canonical encoding
of pages for the purposes of working out which device to use.
(get_roff_encoding): New source_encoding argument, now returned
instead of NULL.
(get_default_device): Pass source_encoding to get_roff_encoding().
(compatible_encodings): The roff encoding can no longer be NULL.
* src/encodings.h (get_page_encoding): Add prototype.
(get_roff_encoding): Update prototype.
* src/man.c (make_roff_command): Call get_page_encoding(), and
recode from that to roff_encoding, not from source_encoding to
roff_encoding. Pass source_encoding to get_roff_encoding().
roff_encoding can no longer be NULL.
Tue Sep 16 22:53:36 BST 2003 Colin Watson <cjwatson@debian.org>
Purge database entries corresponding to removed stray cat pages.
* src/check_mandirs.c (purge_normal, purge_whatis): Add TODO notes
for systems where the cat extension differs from the man
extension.
(purge_whatis): Rename manpath to path. New cat argument, passed
through to look_for_file().
(purge_missing): New catpath argument, passed to look_for_file()
and purge_whatis() in the STRAY_CAT and WHATIS_CAT cases, which
are now handled.
* src/check_mandirs.h (purge_missing): Update prototype.
* src/mandb.c (main): Pass catpath to purge_missing().
* docs/NEWS: Document this.
Tue Sep 16 22:37:33 BST 2003 Colin Watson <cjwatson@debian.org>
Work around the fact that GDBM's firstkey/nextkey interface doesn't
return ordered results.
* libdb/db_gdbm.c (man_gdbm_open_wrapper): New function. Wraps the
return value from gdbm_open() in a structure that remembers the
file name.
(parent_sortkey_hash_free, sortkey_hash_free): New functions to
free hashtables used here.
(sortkey_compare): New comparison function for qsort().
(man_gdbm_firstkey): New function. Retrieve all keys using
gdbm_firstkey() and gdbm_nextkey() in advance, sort them into an
ordered hashtable, remember that hashtable for later, and return
the first key.
(man_gdbm_nextkey): New function. Find the previously remembered
ordered hashtable and return the next element from it.
(man_gdbm_close): New function. Clean up remembered data.
* libdb/db_lookup.c (copy_datum): Define even if using GDBM.
(gripe_lock): Explain why this isn't used for GDBM.
* libdb/mydbm.h (man_gdbm_wrapper): New type.
(man_gdbm_open_wrapper, man_gdbm_firstkey, man_gdbm_nextkey,
man_gdbm_close): Add prototypes.
(MYDBM_FILE): Change to man_gdbm_wrapper for GDBM. Adjust all
other MYDBM_* macros to cope with this and use man_gdbm_*
functions where necessary.
(copy_datum): Declare for all database types. Remove __inline__.
* docs/NEWS: Document this.
Tue Sep 16 01:44:59 BST 2003 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (main): Free each key after listing it rather than
just leaking it.
Mon Sep 15 23:45:33 BST 2003 Byrial Ole Jensen <byrial@image.dk>
* po/da.po: Update from Translation Project.
Mon Sep 15 23:29:33 BST 2003 Colin Watson <cjwatson@debian.org>
* configure.in: Add --enable-mb-groff option, which defines
MULTIBYTE_GROFF for src/encodings.c.
* docs/NEWS: Document this.
Mon Sep 15 01:23:00 BST 2003 Colin Watson <cjwatson@debian.org>
* po/it.po: msgfmt doesn't like "charset=iso8859-1". Use
"charset=iso-8859-1" instead.
Sun Sep 14 17:48:38 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_source_encoding): If the language directory
is unknown (e.g. 'man -l'), guess based on the locale before
falling back to a default.
(get_standard_output_encoding): Likewise.
Sun Sep 14 16:58:34 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_source_encoding): Assume ISO-8859-1 source
encoding if it's unknown (e.g. 'man -l').
(get_default_device): source_encoding can no longer be NULL.
* src/man.c (make_roff_command): Likewise.
Sun Sep 14 16:45:43 BST 2003 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (EXAMPLES, ENVIRONMENT, HISTORY): Change a few
stray hyphens to dashes.
Sun Sep 14 16:37:56 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_source_encoding,
get_standard_output_encoding, get_default_device,
get_roff_encoding, get_output_encoding, get_less_charset):
Simplify using new table element struct types.
Sun Sep 14 16:24:00 BST 2003 Colin Watson <cjwatson@debian.org>
Make locales like ru_RU.UTF-8 that need the ascii8 device but UTF-8
output work. This involves a good deal of restructuring.
* src/encodings.c (directory_table): Remove a completed TODO
comment.
(directory_table, charset_table, device_table): Name array element
struct types in order to abbreviate code later.
(device_table): Split less_charset members out into a new table,
less_charset_table. They really depend on the locale charset, but
aren't quite appropriate for charset_table. Use "iso8859" rather
than "latin1", and add KOI8-R.
(device_table): Add output_encoding member, which is almost the
inverse of charset_table but slightly different for ascii8.
(compatible_encodings): New function to figure out if a source
encoding and a roff encoding are compatible.
(get_default_device): Take new source_encoding argument so that we
can make ru_RU.UTF-8 use the ascii8 device and an iconv pipe
rather than utf8 directly. Drop through to the fallback default
device if none of the predefined entries in charset_table are
compatible when considering the source encoding.
(get_roff_encoding): Split LESSCHARSET handling out into a new
function ...
(get_less_charset): ... here. The caller is expected to set
environment variables rather than having it done by the library.
(get_output_encoding): New function, returning the output encoding
produced by a device.
* src/encodings.h (get_default_device): Update prototype.
(get_output_encoding, get_less_charset): Add prototypes.
* src/man.c (make_roff_command): Update calls to encoding library
for these changes.
Sun Sep 7 23:10:01 BST 2003 Colin Watson <cjwatson@debian.org>
Fix decision about whether a given encoding is safe to save as a cat
page.
* src/encodings.c (directory_table): Add standard_output_encoding
member, used to set the default encoding for cat pages.
(fallback_locale_charset): Remove.
(get_standard_output_encoding): New function.
(get_locale_charset): New function, split out in modified form
from get_default_device().
(get_default_device): Take a character set as input rather than a
locale.
* src/encodings.h (get_standard_output_encoding,
get_locale_charset): Add prototypes.
(get_default_device): Update prototype.
* src/man.c (make_roff_command): Instead of comparing devices, test
that the default character set for this manual hierarchy is being
used, and don't save cat pages if it isn't.
Sun Sep 7 11:33:09 +0200 2003 Giuseppe Sacco <eppesuig@debian.org>
* po/it.po: changed the header of the po file correcting the
charset and the transfer encoding.
Sat Sep 6 11:53:06 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (get_source_encoding): Implement encodings in
manual hierarchy directory names. Include a mini-rant about the
bizarre specification for these in FHS 2.1, which I've declined to
implement for now.
Sat Sep 6 11:28:46 BST 2003 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (purge_missing): Call MYDBM_REORG() after
deleting entries. Currently only useful for gdbm.
Sat Sep 6 00:23:03 BST 2003 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_CHECK_BDB): Append to DBLIBS rather than LIBS.
* configure.in: Likewise for gdbm and ndbm tests. Make DBLIBS an
output variable.
* src/Makefile.in: Link only the necessary programs with the
database library.
Sat Sep 6 00:15:37 BST 2003 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (make_content): Cast cont.dsize to size_t when
comparing it with the return value of strlen(). Avoids warning
when building with gdbm.
Thu Sep 4 20:22:21 BST 2003 Christian Rose <menthos@menthos.com>
* po/sv.po: Update from Translation Project.
Fri Aug 29 17:46:40 BST 2003 Michael Piefel <piefel@informatik.hu-berlin.de>
* po/de.po: Update from Translation Project.
Fri Aug 29 17:42:15 BST 2003 Giuseppe Sacco <eppesuig@debian.org>
* po/it.po: Updated after the revision in tp@linux.it.
Thu Aug 28 11:19:21 BST 2003 Christian Rose <menthos@menthos.com>
* po/sv.po: Update from Translation Project.
Thu Aug 28 00:45:50 BST 2003 Jordi Mallach <jordi@sindominio.net>
* po/ca.po: Update from Translation Project.
Thu Aug 28 00:43:33 BST 2003 Christian Rose <menthos@menthos.com>
* po/sv.po: Update from Translation Project.
Thu Aug 28 00:40:09 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Change "couldn't exec %s" to
"can't execute %s" in line with src/man.c, to make translators'
lives easier.
(pipeline_wait): Separate "%s: %s%s" into two translatable
strings: the "(core dumped)" portion should definitely be
translated.
* src/accessdb.c (usage): Clarify "man_database" to "(The) man
database".
Thu Aug 28 00:18:46 BST 2003 Colin Watson <cjwatson@debian.org>
* src/globbing.c (usage): Expand "sec" to "section".
Wed Aug 27 00:50:07 BST 2003 Giuseppe Sacco <eppesuig@debian.org>
* po/it.po: Remove all fuzzy translations and insert missed ones.
Now this translation will be reviewed by the Italian translation
project for proofreading.
Tue Aug 26 20:16:23 BST 2003 Colin Watson <cjwatson@debian.org>
* Version: 2.4.2-pre1 (for translators).
* docs/NEWS: Mention pipeline library.
Sat Aug 16 14:07:46 BST 2003 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (find_name): Report a sensible error if file is a
directory.
Fri Aug 15 18:11:06 BST 2003 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (test_manfile): file is const.
* src/check_mandirs.h (test_manfile): Update prototype.
* src/mandb.c (update_one_file): filename is const.
Fri Aug 15 18:05:37 BST 2003 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in: Remove incorrect prototype of basename()
which was hiding several bugs.
* configure.in: Check for <libgen.h>.
* lib/pipeline.c, src/accessdb.c, src/catman.c, src/check_mandirs.c,
src/filenames.c, src/lexgrog.l, src/man.c, src/mandb.c,
src/manpath.c, src/straycats.c, src/whatis.c, zsoelim/zsoelim.l:
Include <libgen.h> instead of relying on basename() prototype in
manconfig.h.
* src/check_mandirs.c (test_manfile), src/man.c (local_man_loop),
src/straycats.c (check_for_stray): Copy strings before calling
basename() on them.
Fri Aug 15 00:16:13 BST 2003 Colin Watson <cjwatson@debian.org>
* src/ult_src.c (ult_hardlink): Return a newly allocated string
rather than messily copying over an existing one (and possibly
corrupting the malloc arena). link and dir are now allocated
rather than being declared as arrays.
(ult_src): Update call to ult_hardlink(). Return 'const char *' to
make sure callers aren't messing about with our memory.
* src/ult_src.h (ult_src): Update prototype.
* src/check_mandirs.c (test_mandirs): ult is const.
* src/lexgrog.l (main): file is const.
* src/man.c (try_section): ult is const.
(display_filesystem, display_database): man_file is const.
Sat Aug 9 21:30:16 BST 2003 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Add lib/pipeline.c, src/descriptions.c,
src/filenames.c, and src/globbing.c.
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po, po/pt_BR.po, po/sv.po: Update with msgmerge.
Sat Aug 9 18:28:01 BST 2003 Colin Watson <cjwatson@debian.org>
Replace the old "wait() for one child at a time" approach with a
SIGCHLD-handling edifice that collects children's exit statuses as
they die.
* lib/pipeline.c (pipeline_new): Initialize statuses.
(pipeline_join): Set statuses to NULL in joined pipeline.
(pipeline_join, pipeline_get_infile, pipeline_get_outfile,
pipeline_start, pipeline_wait): Assert that statuses field is NULL
or non-NULL as appropriate.
(pipeline_free): Free statuses if necessary.
(pipeline_start): Add p to a new active_pipelines array, to be
used while reaping children. Initialize statuses elements to -1.
Block SIGCHLD while forking children.
(reap_children): New function. Delivers collected exit statuses
into statuses fields of entries in active_pipelines.
(pipeline_wait): Rather than wait()ing manually here, check
whether any statuses have been picked up by the SIGCHLD handler,
and if not call reap_children(). Remove now-obsolete TODO comment.
(pipeline_sigchld): New function, the SIGCHLD handler.
(pipeline_install_sigchld): New function, to be called once per
program.
(pipeline_start, pipeline_wait): Add minimal debugging
information.
* lib/pipeline.h: Prototype new functions.
(struct pipeline): New statuses member.
Sat Aug 9 17:00:12 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_dup): Copy cmd->nice.
(pipeline_command): Correct condition for growing commands array.
Mon Aug 4 20:44:16 BST 2003 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (HISTORY): Rearrange text to avoid having
"Wilf." at the end of a line, since groff thinks that's the end of
a sentence and adjusts spacing accordingly. (Alternatively, I
could have used \&.)
Mon Aug 4 19:35:26 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_dup): Terminate argv with a NULL.
(command_dup, command_arg): Assert that argc < argv_max after
changing either.
Mon Aug 4 19:30:22 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_dump): New function to dump a printable
representation of a pipeline to a stream.
(pipeline_tostring): Likewise, but to a newly allocated string.
* lib/pipeline.h: Prototype these.
Mon Aug 4 12:03:38 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (argstr_get_word): Plug some memory leaks.
Mon Aug 4 01:05:12 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_wait): The return value was a bit
groff-specific. Now just return the status of the last command in
the pipeline, as reported by wait().
Mon Aug 4 00:31:44 BST 2003 Colin Watson <cjwatson@debian.org>
Add support for getting stdio streams for input and output. Needs
library support because pipeline_wait() needs to know to close the
stream rather than the underlying file descriptor.
* lib/pipeline.h (struct pipeline): New infile and outfile members.
(pipeline_get_infile, pipeline_get_outfile): Add prototypes.
* lib/pipeline.c (pipeline_new): Initialize infile and outfile.
(pipeline_join): Likewise.
(pipeline_get_infile, pipeline_get_outfile): New functions.
(pipeline_wait): Check for infile and outfile and fclose() them in
preference to close()ing infd and outfd. Check for errors on
close().
Sun Aug 3 23:59:18 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Use dup2() instead of close()
then dup().
Sun Aug 3 23:52:14 BST 2003 Colin Watson <cjwatson@debian.org>
infd and outfd should now only be set by pipeline_start(). Positive
values in want_in and want_out now indicate caller-supplied file
descriptors, while negative values indicate a request for
pipeline_start() to create a pipe.
* lib/pipeline.h (struct pipeline): Document this.
* lib/pipeline.c (pipeline_start): Implement it. Caller-supplied
input and output file descriptors previously didn't work properly.
(pipeline_wait): Update TODO comment.
Sun Aug 3 21:07:46 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.h (struct command): New 'nice' member.
* lib/pipeline.c (command_new): Initialize nice.
(pipeline_start): Change child process priority if nice is set.
Sun Aug 3 20:50:35 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (pipeline_start): Pop all cleanups in child.
Sun Aug 3 20:47:24 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (argstr_get_word, command_new_argstr,
command_argstr, pipeline_command_argstr): New functions to handle
constructing commands from shell-quoted strings, such as those
found in man-db configuration files. They deliberately handle only
a safe subset of shell syntax.
* lib/pipeline.h: Prototype command_new_argstr(), command_argstr(),
and pipeline_command_argstr().
Sun Aug 3 19:09:59 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c (command_dup): New function to duplicate a command.
(pipeline_join): New function to join two pipelines together.
* lib/pipeline.h: Prototype these.
Sun Aug 3 18:00:59 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.h (struct pipeline): The writeto, readfrom, writefd,
and readfd names turn out to be confusing in calling code. Rename
to want_in, want_out, infd, and outfd respectively.
* lib/pipeline.c (pipeline_new, pipeline_start, pipeline_wait): Use
new names.
Sun Aug 3 16:35:24 BST 2003 Colin Watson <cjwatson@debian.org>
Add support in pipeline library for writing input to or reading
output from the whole pipeline.
* lib/pipeline.c (pipeline_new): Initialize writeto, readfrom,
writefd, and readfd.
(pipeline_start): Create extra pipes as necessary.
(pipeline_wait): Expand TODO comment. Close file descriptors from
extra pipes if necessary.
* lib/pipeline.h (struct pipeline): Add writeto, readfrom, writefd,
and readfd.
Sun Aug 3 11:15:17 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/pipeline.c: New pipeline library, adapted from that in groff.
The interface isn't complete yet; in particular, it can't be a
replacement for popen() at the moment.
* lib/pipeline.h: New file with pipeline library interface.
* lib/Makefile.in (ALLSRCS, ALL): Build pipeline.
Sun Aug 3 11:09:07 BST 2003 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_FUNC_STRSIGNAL): New macro to check for the GNU
extension strsignal().
* configure.in: Use it.
* lib/xstrsignal.c: New file, wrapping strsignal() or sys_siglist
depending on what's available (and with a saner return type than
strsignal()).
* lib/Makefile.in (ALLSRCS, XOBJS): Build xstrsignal.
* include/manconfig.h.in (xstrsignal): Add prototype.
Sun Aug 3 10:57:55 BST 2003 Colin Watson <cjwatson@debian.org>
* include/comp_src.h.in: Protect against multiple inclusions.
Sat Aug 2 19:32:04 BST 2003 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Document the recent security fixes.
Sat Aug 2 12:31:24 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/error.c (error_print_progname): Use a proper prototype.
Sat Aug 2 01:23:08 BST 2003 Colin Watson <cjwatson@debian.org>
* tools/checkman: Tolerate spaces in NAME sections, since they occur
in practice and confused checkman before this. Prompted by a
question from James B. Hiller.
Fri Aug 1 22:06:33 BST 2003 Colin Watson <cjwatson@debian.org>
Fix vulnerability due to over-permissiveness of DEFINE directive.
* src/manp.c (DEFINE_USER): New list flag.
(get_def): Note that this must not return DEFINEs set in
~/.manpath.
(get_def_user): New function, which may return DEFINEs set in
~/.manpath.
(add_def): Use DEFINE or DEFINE_USER depending on context.
(add_to_dirlist): Update call to add_def().
* src/manp.h (get_def_user): Add prototype.
* src/man.c (main): pager and cat are safe for the user to define.
(make_display_command): cat, tr, and decompressor are safe.
* src/straycats.c (check_for_stray): col and decompressor are safe.
* src/whatis.c (use_grep): whatis_grep_flags,
apropos_regex_grep_flags, apropos_grep_flags, and grep are safe.
Fri Aug 1 01:32:37 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Minor whitespace cleanups.
Fri Aug 1 01:05:42 BST 2003 Colin Watson <cjwatson@debian.org>
* src/manp.c (mkcatdirs): Allocate manname and catname dynamically.
Wed Jul 30 22:28:13 BST 2003 Colin Watson <cjwatson@debian.org>
Fix vulnerability 4 posted by Vade 79 <v9@fakehalo.deadpig.org> on
BugTraq, Message-ID:
<20030729210308.15518.qmail@www.securityfocus.com>. This fix is just
a stopgap measure for now; proper list handling will be added later.
* src/manp.c (gripe_overlong_list): New function.
(add_dir_to_list): Die gracefully if too many list entries are
added.
(add_dir_to_path_list): Likewise. Take an extra argument for the
head of the list so that we can spot this efficiently.
(create_pathlist): Update calls to add_dir_to_path_list().
Wed Jul 30 22:15:16 BST 2003 Colin Watson <cjwatson@debian.org>
* src/manp.c (gripe_reading_mp_config): This is a fatal error, so
shouldn't be conditional on quiet.
Wed Jul 30 20:48:57 BST 2003 Colin Watson <cjwatson@debian.org>
Fix vulnerability 1 posted by Vade 79 <v9@fakehalo.deadpig.org> on
BugTraq, Message-ID:
<20030729210308.15518.qmail@www.securityfocus.com>.
* src/manp.c (add_to_dirlist): Limit all sscanf() calls to the
appropriate buffer size. Leave a TODO to say that a replacement
that allocates its own memory would be welcome.
Wed Jul 30 20:38:40 BST 2003 Colin Watson <cjwatson@debian.org>
Fix vulnerabilities 2 and 3 posted by Vade 79
<v9@fakehalo.deadpig.org> on BugTraq, Message-ID:
<20030729210308.15518.qmail@www.securityfocus.com>.
* src/ult_src.c (ult_softlink): Return a newly allocated string
rather than copying into fullpath.
(test_for_include): Return a newly allocated string rather than
copying into rel (which was a pointer into part of basename in
ult_src(), and wasn't reallocated in the event that the .so text
was too large).
(ult_src): Allocate basename dynamically rather than using a
static buffer. relative is no longer needed. Update for changes in
ult_softlink() and test_for_include().
Wed Jul 30 12:33:25 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (close_cat_stream): The unlink(tmp_cat_file) cleanup is
only pushed if (!debug), so apply the same condition to popping
it.
Wed Jul 30 12:21:20 BST 2003 Colin Watson <cjwatson@debian.org>
* src/descriptions.c (parse_descriptions): Revert this part of
xstrdup(NULL) change from 28 April 2003; head->whatis is undefined
if the else branch was taken.
Wed Jul 30 10:40:06 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (find_in_path): Avoid leaking filename for each PATH
element.
Wed Jul 30 10:36:22 BST 2003 Colin Watson <cjwatson@debian.org>
* src/compression.c (decompress): Don't free command until after
printing the error message that includes it.
Wed Jul 30 10:23:50 BST 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Return non-zero with an error message if no
databases were updated. Required so that man knows not to call
mandb over and over again.
Sat Jun 28 01:26:55 BST 2003 Colin Watson <cjwatson@debian.org>
* man/it_IT.88591/man1/apropos.man1: Use %date% rather than
%date_it% (which the build system no longer supports).
Sat Jun 28 00:23:02 BST 2003 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1: Clarify section 3 as "program libraries" rather
than "system libraries".
Tue May 6 00:50:25 CEST 2003 Giuseppe Sacco <eppesuig@debian.org>
* Updated the apropos italian man page.
Mon May 5 19:47:07 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (set_term, get_term, store_line_length): Use the
fileno() of stdin and stdout respectively instead of literal 0 and
1.
* src/ult_src.c (ult_src): Use STRNEQ() instead of strncmp().
Mon May 5 18:35:02 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Czech -> ISO-8859-2.
Thu May 1 19:12:54 BST 2003 Colin Watson <cjwatson@debian.org>
* configure.in (CFLAGS): Add -Wpointer-arith and -Wstrict-prototypes
for gcc.
* src/man.h: Move prototype from convert_name.c to ...
* src/convert_name.h: ... here (new file).
* src/convert_name.c: Include "convert_name.h". Add some TODO
comments.
* src/man.c: Include "convert_name.h".
* lib/error.c: Include "error.h". Prototype strerror() fully.
* lib/tempfile.c: Include "manconfig.h" instead of prototyping
strappend() and xstrdup(). Prototype path_search() fully.
* lib/xmalloc.c: Remove most K&R compatibility, since it's not
really supported elsewhere in man-db.
* src/globbing.c: Include "globbing.h".
(match_in_directory): Add static.
* src/man.c (set_term, get_term): Add static.
(int_handler): Move above main(), and add static.
(main): Remove int_handler() prototype.
(make_roff_command, format_display_and_save): Prototype
old_handler fully.
(open_cat_stream, display_catman): Cast to cleanup_fun rather than
to an incomplete prototype.
* src/manp.c (guess_manpath): Add static.
* src/security.c (gripe_set_euid): Prototype fully.
* src/ult_src.c (realpath): Move prototype to the non-STDC_HEADERS
case.
* src/lexgrog.l: Add '%option warn'.
Thu May 1 17:39:55 BST 2003 Colin Watson <cjwatson@debian.org>
* configure.in (CFLAGS): Add -W for gcc.
* lib/hashtable.c (hash): Change array index type to size_t.
* src/globbing.c (dirent_hash_free, match_in_directory): Likewise.
* src/check_mandirs.c (purge_pointers): Remove unused manpath
argument.
* src/check_mandirs.h (purge_pointers): Update prototype.
* src/mandb.c (update_one_file): Update call to purge_pointers().
* src/catman.c (catman): Remove unused arg_no argument.
(do_catman): Update call to catman().
* src/man.c (make_roff_command): dir is unused except #ifdef
ALT_EXT_FORMAT.
* src/mandb.c (cleanup): dummy is unused.
* src/ult_src.c (ult_hardlink): Change type of inode to ino_t.
(ult_softlink): mantree is unused.
(ult_src): Update call to ult_softlink().
* src/whatis.c (apropos): lowpage is unused except #ifdef APROPOS.
* src/wrapper.c (main): argc is unused.
Thu May 1 16:52:44 BST 2003 Colin Watson <cjwatson@debian.org>
Remove all assumptions that string literals have type 'char *'
rather than 'const char *'.
* configure.in (CFLAGS): Add -Wwrite-strings for gcc.
* lib/tempfile.c (xstrdup): First argument is const.
(path_search): Return 'const char *'.
(create_tempfile, create_tempdir): Copy return value of
path_search() right away rather than after checking for NULL.
* libdb/db_ver.c (dbver): Take a private copy of VER_KEY.
(dbver_wr): Take private copies of VER_KEY and VER_ID.
* src/accessdb.c (cat_root): Add const.
* src/catman.c (parse_for_sec): Remove __inline__; add const to both
arguments. Take private copies of "man" and the basic options.
(main): Copy "C" for locale. Make sections etc. 'const char **',
since STD_SECTIONS is an array of 'const char *'.
* src/check_mandirs.c (update_db_time, reset_db_time, update_db):
Take a private copy of KEY.
* src/filenames.c (make_filename): Make type const.
* src/filenames.h (make_filename): Update prototype.
* src/globbing.c (extension, mandir_layout): Add const.
* src/lexgrog.l (fname): Add const.
(find_name): Make filename const.
(main): Set program_name here from argv[0] rather than from a
string literal.
* include/manconfig.h.in (find_name): Update prototype.
* src/man.c (lang_dir): Add static. Copy string literals into ld.
Use xstrndup() rather than copying and then inserting '\0'.
(extension, alt_system_name, section_list, preprocessors, pager,
locale, std_sections, external, gxditview, html_pager): Add const.
(add_roff_line_length): First argument is const. Return a copy of
it if necessary.
(gripe_no_man): Copy external before passing it to basename().
(main): Copy "C" for internal_locale. Reorganize locale
reinitialization slightly so that locale can be const.
(man_getopt): Set 'const char *' and 'char *' variables to NULL
separately.
(is_section, compare_candidates, man): Use a 'const char **' to
iterate through section_list.
(make_roff_command): Remove __inline__. Take a copy of "" for dev
so that dev is always allocated memory. Handle filter in a more
const-safe way (although there's still a memory leak).
(get_section_list): Remove __inline__. Return 'const char **'.
* src/man.h (get_section_list): Update prototype.
* src/manp.c (get_from_list): Make return value and first argument
const.
(get_def): Make return value and both arguments const.
(get_sections): Return const.
(cat_manpath): Make path and catdir const.
* src/manp.h (get_def, get_sections): Update prototypes.
* src/manpath.c (main): Make alt_system const.
* src/whatis.c (use_grep): Make flags and anchor const.
(main): Make manp and alt_systems const. Copy "C" for locale.
* zsoelim/zsoelim.l (main): Copy argv[0] basename for program_name,
as basename()'s return value may not be long-lived. Copy "-" for
so_name[0].
* src/mandb.c (main): Don't bother remembering the return value of
setlocale().
* src/manpath.c (main): Likewise.
Mon Apr 28 15:11:28 BST 2003 Colin Watson <cjwatson@debian.org>
* src/catman.c (main): Don't guard xstrdup() from NULL input, as it
checks itself.
* src/check_mandirs.c (test_manfile): Likewise.
* src/descriptions.c (parse_descriptions): Likewise.
* src/mandb.c (main): Likewise.
* src/whatis.c (main): Likewise.
Mon Apr 28 09:06:28 BST 2003 Colin Watson <cjwatson@debian.org>
Introduce a readdir() cache, which substantially speeds up mandb's
purging functions (from 2 minutes to under 45 seconds on my laptop,
and from about 280000 to about 13500 system calls).
* src/globbing.c (dirent_hash_free, update_directory_cache): New
functions.
(match_in_directory): Use update_directory_cache() rather than
reading the directory on every call.
* docs/NEWS: Document this.
Mon Apr 28 00:51:11 BST 2003 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (hash_lookup): Return the definition rather than
the hash entry structure. This turns out to be a lot more useful.
* lib/hashtable.h (hash_lookup): Update prototype.
* src/man.c (try_db): Simplify; in_cache is no longer needed. Just
assign to the target variable directly.
* src/check_mandirs.c (test_manfile): Likewise. xstrdup() already
checks for NULL input, so don't bother checking here.
Tue Apr 22 19:56:13 BST 2003 Colin Watson <cjwatson@debian.org>
* docs/HACKING: New prototypical document for developers.
Tue Apr 22 19:48:46 BST 2003 Colin Watson <cjwatson@debian.org>
* src/globbing.c (parse_layout, look_for_file): Add a BSD layout in
which cat pages have the extension .0 (Jeremy C. Reed). More work
is needed elsewhere so that man can write such cat pages, though.
* configure.in (--enable-mandirs): Add BSD layout.
* manual/intro.me (Arguments to configure): Document
--enable-mandirs=BSD.
* README: Sync with manual/intro.me.
Tue Apr 22 19:38:03 BST 2003 Colin Watson <cjwatson@debian.org>
* libdb/COPYING.LIB: Remove (obsoleted in favour of
docs/COPYING.LIB).
* GNUmakefile.in (_docs, _libdb): Include COPYING.LIB from docs/
rather than libdb/.
Tue Apr 22 19:34:30 BST 2003 Colin Watson <cjwatson@debian.org>
* tools/mandb_[nt]fmt-script: Correct "# !" to "#! " on the shebang
line.
Tue Apr 15 18:16:30 BST 2003 Colin Watson <cjwatson@debian.org>
* src/Makefile.in (LFLAGS): Provide -8 and -B as separate arguments.
flex 2.5.31 is stricter about this.
* zsoelim/Makefile.in (LFLAGS): Likewise.
Sun Apr 13 14:36:29 BST 2003 Colin Watson <cjwatson@debian.org>
* src/encodings.c (directory_table): Add Hungarian -> ISO-8859-2.
Sun Apr 13 13:39:38 BST 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Return 0 if the source file doesn't exist, so
that the caller can go on and silently create a non-existent
database rather than bailing out.
Sun Apr 13 12:49:33 BST 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c: Remove DO_CHOWN define and simply use SECURE_MAN_UID.
Thu Apr 10 23:51:43 BST 2003 Byrial Ole Jensen <byrial@image.dk>
* po/da.po: Update from Translation Project.
Mon Apr 7 09:12:27 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (man): Call local_man_loop() straight away if name
contains a slash. Make the number of pages found an output
argument rather than the return value, so that we can include
local_man_loop()'s return behaviour.
(main): Update throughout for new man() signature. Don't call
local_man_loop() if man() returns an error, as man() now sorts
that out for itself.
* src/man.h (man): Update prototype.
Mon Apr 7 08:09:08 BST 2003 Colin Watson <cjwatson@debian.org>
* include/Defines.in: Generate dependencies in .depend rather than
the current directory. Suppress echoing of dependency generation
commands.
* libdb/Makefile.in: Remove .depend directory on distclean. Always
use dependencies (except on clean), not just when --enable-debug
was passed to configure.
* src/Makefile.in: Likewise. Set up $(DEFS_*) variables so that the
correct flags are used when generating dependencies.
* libdb/.cvsignore, src/.cvsignore: Ignore .depend.
* configure.in: Remove now-redundant --enable-debug option. Remove
search for libefence if --enable-debug is used; using it with
LD_PRELOAD is generally more convenient anyway.
* README, manual/intro.me (Arguments to configure): Remove
documentation for --enable-debug.
* docs/NEWS: Document the removal.
Mon Apr 7 01:02:27 BST 2003 Colin Watson <cjwatson@debian.org>
* man/ja_JP.eucJP/man1/man.man1: Replace "%date%" with the Japanese
"ima", meaning "now" or "the present time" (thanks, Liyang Hu).
Mon Apr 7 00:04:30 BST 2003 Colin Watson <cjwatson@debian.org>
* configure.in: Don't generate language-specific date variants for
man pages, as that requires all the relevant locales to be
installed on the build machine. Use the ISO 8601 date format
instead.
* include/Defines.in: Remove obsolete substitutions of date_it,
date_es, date_de, and date_fr.
* man/Makefile.in: Likewise.
* man/de_DE.88591/man1/*.man1, man/de_DE.88591/man5/*.man5,
man/de_DE.88591/man8/*.man8, man/es_ES.88591/man1/*.man1,
man/es_ES.88591/man5/*.man5, man/es_ES.88591/man8/*.man8,
man/it_IT.88591/man1/*.man1, man/it_IT.88591/man5/*.man5,
man/it_IT.88591/man8/*.man8 (.TH): Replace "%date_de%",
"%date_es%", and "%date_it%" substitutions by plain "%date%".
* man/man1/man.man1 (HISTORY): "%date%" -> "present day".
* man/it_IT.88591/man1/man.man1 (STORIA): Similarly, "%date_it%" ->
"presente" (present day).
Sun Apr 6 21:39:36 BST 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Ignore LANGUAGE if a locale is explicitly
specified using the -L/--locale option.
Sun Apr 6 20:28:57 BST 2003 Colin Watson <cjwatson@debian.org>
Revamp locale encoding support. The old code made the incorrect
assumption that the source encoding of manual pages is dependent on
the locale.
If MULTIBYTE_GROFF is defined then man will assume that it is using
a version of groff with the multibyte patch applied, which supports
some additional locales.
* src/man.c (lang_table, determine_lang_table): Remove.
(lang_dir): Return "C" if there is no language directory element.
(make_roff_command): Find out the source encoding for the
requested man page and the default device for the current locale,
and use these to select a device more intelligently. Insert an
iconv pipe if the source encoding differs from the input *roff
encoding for the current device.
* src/encodings.c: New file. There are three tables replacing the
old lang_table: directory_table, charset_table, and device_table.
(get_source_encoding): New function, returning the assumed source
encoding for the current page from directory_table.
(get_default_device): New function, returning the default *roff
output device based on the current locale from charset_table.
(get_roff_encoding): New function, returning the input encoding
expected by *roff from device_table. This is always ISO-8859-1
unless MULTIBYTE_GROFF is defined (this is still a subject of some
debate, and will be UTF-8 for all devices in groff 2).
* src/encodings.h: Prototype new functions.
* src/Makefile.in (man): Add encodings.o.
* docs/NEWS: Document the above.
Sun Mar 30 23:14:47 BST 2003 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (SYNOPSIS): Both -H and -T take optional
arguments. The fact that they're optional means that no space is
allowed between the option and its argument (thanks to Peter Muir
for that observation).
(OPTIONS): Likewise. Document the 'browser' argument to -H.
Correct a couple of hyphens to dashes.
Fri Mar 28 09:23:19 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Protect ruid/euid debugging statement with
#ifdef SECURE_MAN_UID.
(commit_tmp_cat): Likewise for temporary cat ownership code.
* src/security.c (drop_effective_privs, regain_effective_privs):
priv_drop_count is only declared #ifdef SECURE_MAN_UID. Move the
corresponding directives so that these functions are no-ops if
that symbol isn't defined.
* docs/NEWS: Document this.
Wed Mar 26 15:04:00 GMT 2003 Colin Watson <cjwatson@debian.org>
* manual/format.me: Correct location of example external formatter
script.
Tue Mar 25 04:15:41 GMT 2003 Colin Watson <cjwatson@debian.org>
* configure.in: Use AC_MSG_NOTICE throughout rather than MAN_ECHO.
Move the definition of MAN_ECHO_VAR to just above its only uses.
Tue Mar 25 03:44:06 GMT 2003 Giuseppe Sacco <eppesuig@debian.org>
* po/it.po: Update.
Tue Mar 25 03:41:13 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/whatis.c (parse_name): Free lowdbname before returning.
Tue Mar 25 03:38:39 GMT 2003 Colin Watson <cjwatson@debian.org>
* lib/strappend.c, lib/xstrdup.c, lib/xstrndup.c: Remove unused
definitions of VOID.
Sun Mar 16 00:51:12 GMT 2003 Jeremy C. Reed <reed@reedmedia.net>
* configure.in (--enable-mandirs): Use 'mandirs' rather than
'mandir', as the latter clashes with an autoconf variable.
Wed Mar 12 13:17:45 GMT 2003 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (gripe_bad_multi_key): This function has been
unused since 24 June 2002 (noticed by Giuseppe Sacco). Remove.
* libdb/db_storage.h (gripe_bad_multi_key): Remove prototype.
Tue Mar 11 21:17:56 GMT 2003 Giuseppe Sacco <eppesuig@debian.org>
* po/it.po: Update.
Mon Mar 10 17:20:46 GMT 2003 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c, libdb/db_delete.c, libdb/db_gdbm.c,
libdb/db_lookup.c, libdb/db_ndbm.c, libdb/db_storage.h,
libdb/db_store.c, libdb/db_ver.c: Style cleanup (as with src/* on
28 May 2001). No functional changes.
Mon Mar 10 15:55:34 GMT 2003 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (EVERYTHING, ALL): Move intl ahead of libdb. (Not
'make -j'-clean, though ...)
* libdb/Makefile.in: Use '$(top_srcdir)' rather than '..'
throughout. Add $(top_srcdir)/intl to the include path if USE_NLS
is set.
Mon Mar 10 15:24:04 GMT 2003 Colin Watson <cjwatson@debian.org>
* configure.in (AC_CONFIG_HEADER): Generate config.h rather than
include/config.h. intl/Makefile.in is insistent on config.h being
in the top-level directory.
* GNUmakefile.in, manual/comp.me: Replace 'include/config.h' with
'config.h' throughout.
* .cvsignore, include/.cvsignore: Update for new config.h and
config.h.in locations.
Mon Mar 10 15:00:32 GMT 2003 Colin Watson <cjwatson@debian.org>
* lib/mkdtemp.c: Define __GT_DIR if necessary.
* lib/tempfile.c: Prototype mkstemp() and mkdtemp().
Mon Mar 10 14:46:39 GMT 2003 Colin Watson <cjwatson@debian.org>
* lib/tempname.c: Include "config.h" rather than <config.h>.
Mon Mar 3 22:00:03 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Remove silly calls to fclose() on null
pointers.
Sun Mar 2 20:37:08 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Save errno before performing operations that
might change it. Close ifp as well if an error occurs while
opening ofp.
Fri Feb 28 01:50:21 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (find_in_path): path needs to be preserved in order to
be freed safely, or else we segfault. Use a temporary variable for
strsep() instead.
Mon Feb 24 17:05:25 GMT 2003 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (OPTIONS): Only use the \[shc] character if it's
available, which is the case on groff's latin1 and utf8 devices
but not on others. Otherwise, use \(hy.
Mon Feb 24 00:17:39 GMT 2003 Colin Watson <cjwatson@debian.org>
* docs/manpage.example (OPTIONS): Move the note about '\-' versus
'-' from a comment into displayed text.
Sun Feb 23 00:34:12 GMT 2003 Alexandre Folle de Menezes <afmenez@terra.com.br>
* po/pt_BR.po: Update from Translation Project.
Sat Feb 22 18:32:58 GMT 2003 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_CHECK_BDB): Remove some extra calls to
AC_MSG_RESULT, since AC_CACHE_CHECK already calls that.
Sat Feb 22 18:10:14 GMT 2003 Morten Brix Pedersen <morten@wtf.dk>
* po/da.po: Translate a few more strings.
Sat Feb 22 18:06:09 GMT 2003 Alexandre Folle de Menezes <afmenez@terra.com.br>
* po/pt_BR.po: Update from Translation Project.
Sat Feb 22 17:50:55 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/Makefile.in: Fix typo ("developement" -> "development").
* src/manp.c (add_to_dirlist): Fix typo ("mach" -> "match").
Sat Feb 22 17:41:07 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/manp.c (read_config_file): If user_config_file is non-NULL,
use it instead of ~/.manpath. Programs can now set the user
configuration file to be used.
* src/catman.c, src/mandb.c, src/manpath.c, src/whatis.c
(long_options): Add -C/--config-file option.
(usage): Document it.
(main): Handle it.
* src/man.c (long_options): Add -C/--config-file option.
(usage): Document it, along with adding -i and -I to the synopsis.
(man_getopt): Handle it.
* man/man1/apropos.man1, man/man1/man.man1, man/man1/manpath.man1,
man/man1/whatis.man1, man/man8/catman.man8, man/man8/mandb.man8
(SYNOPSIS): Add -C.
(OPTIONS): Describe -C/--config-file.
* docs/NEWS: Document this addition.
Fri Feb 21 18:32:21 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/Makefile.in (man): lexgrog.o is no longer needed. Removing it
takes 24K off the size of a stripped man binary on Linux/i386.
Fri Feb 21 18:12:45 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Improve error handling.
(mandb): Since xcopy() now returns int, handle its return value.
Fri Feb 21 16:40:26 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (find_in_path): New function to look for executables on
the $PATH.
(gripe_no_man): Only emit the "undocumented" message if a
corresponding executable is found on the $PATH.
* docs/NEWS: Document this.
Fri Feb 21 16:26:00 GMT 2003 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Preliminary entries for 2.4.2.
Fri Feb 21 15:49:08 GMT 2003 Colin Watson <cjwatson@debian.org>
* zsoelim/zsoelim.l: Internationalize usage and error messages.
Fri Feb 21 15:46:04 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (gripe_bogus_manpage, make_filename,
filename_info): Move to ...
* src/filenames.c: ... here.
* src/check_mandirs.h: Move corresponding prototypes to ...
* src/filenames.h: ... here.
* src/check_mandirs.c (purge_pointers): New function to purge any
entries whose pointers refer to a given name.
* src/check_mandirs.h (purge_pointers): Add prototype.
* src/mandb.c (long_options): Add -f/--filename option.
(usage): Document it, along with -t/--test.
(update_one_file): New function to update a single file in an
existing database.
(update_db_wrapper): Call update_one_file() if using --filename.
(main): Handle --filename option. If using --filename, only call
mandb() if the manpath prefix matches.
* man/man8/mandb.man8 (SYNOPSIS): Improve *roff style and document
-p. Add separate call summary for when -f is used.
(OPTIONS): Document -f.
* lib/hashtable.c (hash_remove): New function to remove an entry
from a hash table.
* lib/hashtable.h (hash_remove): Add prototype.
* libdb/db_store.c (replace_if_necessary): Replace entries with ids
other than ULT_MAN too, so that their timestamps can be updated.
Add more debugging output.
* src/man.c (need_to_rerun): Remove.
(display_database): Remove code to check whether pages found in
databases are up to date. This is done elsewhere now.
(run_mandb): New function, used instead of updating databases
directly.
(main): Call run_mandb() instead of need_to_rerun().
(maybe_update_file): New function to check whether a page found in
a database is up to date. If not, use run_mandb() to recache it.
(try_db): Use run_mandb() rather than create_db(). Use #defines
for special return values rather than magic numbers. Check whether
pages are up to date as they're found.
(locate_page): If try_db() returns TRY_DATABASE_UPDATED (i.e.
mandb was called to update some pages), call it again.
(display_pages): Use a switch with named candidate types instead
of an if.
* src/Makefile.in (DEFS_man.o): Add definition for MANDB.
(man): Database code is no longer needed. Add filenames.o.
(mandb): Add filenames.o.
Mon Feb 17 23:28:55 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/manpath.c: Remove unused prototypes.
Tue Jan 21 01:42:16 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy, main): Minor whitespace cleanups.
* src/ult_src.c: Fix typo (loosing -> losing).
Mon Jan 6 03:25:16 GMT 2003 Colin Watson <cjwatson@debian.org>
* src/man.c (display_pages): Drop privileges if candp->path is a
user manpath. Inner code generally dropped privileges anyway,
certainly when running external commands, but the absence of this
drop meant that pages in non-world-readable user manpaths could
not be read.
Mon Jan 6 03:19:57 GMT 2003 Colin Watson <cjwatson@debian.org>
* lib/error.c (error): Print a backtrace if the BACKTRACE_ON_ERROR
symbol is defined. This undoubtedly isn't portable and is not
intended for production use; it's just a last-resort way to get a
backtrace when the usual methods fail, chiefly when running
setuid.
Tue Dec 31 04:39:03 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (man): If update is set, need_to_rerun() will always
have been called already by now. Remove this redundant code.
Tue Dec 31 04:26:50 GMT 2002 Colin Watson <cjwatson@debian.org>
* man/man1/apropos.man1, man/man1/lexgrog.man1,
man/man1/manpath.man1, man/man1/whatis.man1,
man/man1/zsoelim.man1: --version no longer displays author
information.
Sun Dec 29 19:57:55 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c, src/check_mandirs.h: Move page_description
interface functions to ...
* src/descriptions.c, src/descriptions.h: ... here (new files).
* src/Makefile.in (man, mandb): Link descriptions.o.
* libdb/db_storage.h: Include libdb/mydbm.h for the datum type.
Sun Dec 29 19:51:11 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Add commas between short and long options in usage
output.
* src/accessdb.c (main): Support -h/--help and -v/--version options.
(usage): Document them. Move MAN_DB outside translatable string.
* man/man8/accessdb.man8 (SYNOPSIS, OPTIONS): Document new options.
(AUTHOR): Add myself.
* src/globbing.c (long_options, args, main): Support -h/--help and
-v/--version options.
(usage): New function.
* zsoelim/zsoelim.l: Support long option forms of -C (--compatible),
-h (--help), and -V (--verbose).
* man/man1/zsoelim.man1: Document long options.
* src/Makefile.in: Link $(TOOLS) as well as $(PROGS) with version.o.
Sun Dec 29 19:40:46 GMT 2002 Colin Watson <cjwatson@debian.org>
Patch partly by Werner Fink <werner@suse.de>.
* src/whatis.c (args, long_options): Add -v/--verbose option.
(usage): Document it.
(get_whatis): Print pointer loop warnings only if --verbose.
(main): Handle --verbose option.
* man/man1/apropos.man1 (OPTIONS): Document --verbose.
* man/man1/whatis.man1 (OPTIONS): Likewise.
Sun Dec 22 23:30:12 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (test_manfile): Initialize the mandata struct
on the stack to zero.
(count_glob_matches): Likewise.
* src/straycats.c (check_for_stray): Likewise.
* src/man.c (try_section): Use infoalloc() (which initializes the
mandata struct to zero) rather than malloc(). This had caused
several uses of uninitialized memory (Debian bug #168584).
* src/check_mandirs (purge_whatis): Compare info->pointer against
"-", not just its first character.
Sun Dec 22 19:29:38 GMT 2002 Colin Watson <cjwatson@debian.org>
* Version: 2.4.1.
* docs/NEWS, man-db.gnu, man-db.lsm: Update.
Sun Dec 22 18:19:09 GMT 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c (btree_findkey): Cast key.dsize to int when using
it as an fprintf() field width.
Sun Dec 22 18:15:51 GMT 2002 Colin Watson <cjwatson@debian.org>
Patch inspired by part of SuSE's diff, although not identical.
* GNUmakefile.in: Export DESTDIR.
* man/Makefile.in, src/Makefile.in, zsoelim/Makefile.in: Honour
DESTDIR when installing and uninstalling files.
Sun Dec 22 14:14:37 GMT 2002 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (dist): Don't update .po files automatically, since
they're kept under revision control.
Sun Dec 22 13:59:23 GMT 2002 Colin Watson <cjwatson@debian.org>
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po, po/pt_BR.po, po/sv.po: Update with msgmerge.
Sun Dec 22 13:44:20 GMT 2002 Alexandre Folle de Menezes <afmenez@terra.com.br>
* po/pt_BR.po: Update from Translation Project.
Sat Dec 21 13:30:43 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (count_glob_matches): Exclude file names which
fail stat(), such as dangling symlinks.
Sat Dec 21 03:01:34 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (count_glob_matches): New function,
sanity-checking results from look_for_file(). This should probably
be done in look_for_file() itself eventually, but that requires
more widespread changes.
(purge_normal, purge_whatis): Use it.
* src/check_mandirs.c (gripe_bogus_manpage, gripe_rwopen_failed,
filename_info, purge_normal, purge_whatis): Constify arguments.
* src/check_mandirs.h (filename_info): Update prototype.
* docs/NEWS: Document --enable-mandirs guesswork.
* src/.cvsignore: Add the globbing test executable.
Fri Dec 20 15:38:48 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/globbing.c (main): Make the test program compile again, and
add full argument parsing.
* src/Makefile.in (globbing): Link with util.o.
Fri Dec 20 15:34:51 GMT 2002 Colin Watson <cjwatson@debian.org>
* configure.in: Guess the --enable-mandirs setting where possible if
it isn't specified explicitly.
Fri Dec 20 02:28:15 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (purge_missing): Match database entries
against real filenames using the name field where available, not
the lowercased field.
Fri Dec 20 02:15:21 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/mandb.c (mandb): If force_rescan is set, delete the database
and recreate it from scratch.
* src/check_mandirs.c (testmandirs): force_rescan is handled
elsewhere now.
(purge_normal, purge_whatis): Remove inline qualifier.
(check_multi_key): New function to check for broken multi keys
such as those generated by 2.4.0.
(purge_missing): Call check_multi_key() where necessary.
* src/lexgrog.l (find_name): Revert change of 27 November 2002, as
calling ult_src() inside find_name() breaks mandb (which already
calls ult_src() itself). Instead:
(main): Do the ult_src() resolution here for each element of argv.
* src/ult_src.c (ult_src): 'name' argument is const.
* src/lexgrog.l (find_name): 'file' argument is const.
* include/manconfig.h.in, src/ult_src.h: Update prototypes.
Mon Dec 16 05:28:34 GMT 2002 Colin Watson <cjwatson@debian.org>
From SuSE's diff:
* lib/error.c: Add 'extern' to prototypes.
* lib/strappend.c, lib/xstrdup.c, lib/xstrndup.c: #include
"manconfig.h" rather than using an explicit prototype.
* lib/xstrdup.c (xstrdup): 'string' should be const.
* po/cs.po: Fix a format string.
* src/lexgrog.l: Add Japanese translation of NAME.
* src/man.c: 'wd', 'cwd', and local_man_loop() are static.
Mon Dec 16 04:30:39 GMT 2002 Colin Watson <cjwatson@debian.org>
* configure.in: 'test "$foo"' => 'test -n "$foo"' throughout. Taken
from SuSE's diff.
Wed Dec 4 21:02:48 GMT 2002 Colin Watson <cjwatson@debian.org>
* man/man1/lexgrog.man1: Replace `, ', and - (for literal dash
rather than hyphen) with \(oq, \(cq, and \- respectively.
(NOTES): lexgrog attempts to handle .so requests now.
Tue Dec 3 01:39:54 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Only set multiple_locale if it's going to be
used. Look at multiple_locale rather than internal_locale when
performing special $LANGUAGE handling.
Mon Dec 2 14:08:08 GMT 2002 Michael Piefel <piefel@informatik.hu-berlin.de>
* po/de.po: Fix a missing newline.
Mon Dec 2 13:58:55 GMT 2002 Michael Piefel <piefel@informatik.hu-berlin.de>
* po/de.po: Update from Translation Project.
Fri Nov 29 15:40:21 GMT 2002 Jordi Mallach <jordi@sindominio.net>
* po/ca.po: Update from Translation Project.
Wed Nov 27 20:27:59 GMT 2002 Christian Rose <menthos@menthos.com>
* po/sv.po: Update from Translation Project.
Wed Nov 27 02:43:03 GMT 2002 Colin Watson <cjwatson@debian.org>
* Version: 2.4.1-pre1 (for translators).
* docs/NEWS: Update.
Wed Nov 27 02:29:42 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (find_name): Call ult_src() to resolve .so links.
* src/Makefile.in: Link ult_src.o into lexgrog.
Wed Nov 27 01:49:18 GMT 2002 Colin Watson <cjwatson@debian.org>
* release.sh: Don't pass --copy to autogen.sh, as it's a no-op now.
* po/.cvsignore, tools/.cvsignore: More ignored files.
Wed Nov 27 01:46:27 GMT 2002 Colin Watson <cjwatson@debian.org>
* tools/mkinstalldirs: Remove. It's more trouble than it's worth to
store something in CVS that autopoint thinks it controls.
Wed Nov 27 01:25:52 GMT 2002 Colin Watson <cjwatson@debian.org>
* po/da.po: Correct some minor typographical mistakes (mostly
missing spaces or newlines at the end of one piece of a string
concatenation).
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po, po/pt_BR.po, po/sv.po: Update with msgmerge.
Wed Nov 27 00:51:47 GMT 2002 Colin Watson <cjwatson@debian.org>
* man/man1/apropos.man1, man/man1/lexgrog.man1, man/man1/man.man1,
man/man1/manpath.man1, man/man1/whatis.man1,
man/man1/zsoelim.man1, man/man5/manpath.man5,
man/man8/accessdb.man8, man/man8/catman.man8, man/man8/mandb.man8:
Add a .pc request so that the % characters we use for
substitutions don't get translated into page numbers when
formatting the unsubstituted pages.
Wed Nov 27 00:37:29 GMT 2002 Colin Watson <cjwatson@debian.org>
* man/man1/lexgrog.man1 (WHATIS PARSING): Add an example of how NAME
sections should be written in mdoc.
Tue Nov 26 22:57:27 GMT 2002 Colin Watson <cjwatson@debian.org>
* .cvsignore: Ignore the m4 directory, created by autopoint.
* GNUmakefile.in (_subdirs, _m4): Add m4/*.m4 to the distribution.
(_root): There are no *.h files left in the top-level directory.
(nls_man): de_DE.ascii is gone.
(dist): Use 'cp -p' rather than 'ln', since ln notes that making a
hard link to a symbolic link is not portable.
Tue Nov 26 03:43:15 GMT 2002 Colin Watson <cjwatson@debian.org>
* po/pt_BR.po: New from Translation Project.
* po/LINGUAS: Add pt_BR.
Fri Nov 22 22:06:01 GMT 2002 Morten Brix Pedersen <morten@wtf.dk>
* po/da.po: Further updates.
Sat Nov 16 12:54:29 GMT 2002 Colin Watson <cjwatson@debian.org>
* docs/manpage.example: Clarify that dashes in options should be
written using '\-', not '-'.
Thu Nov 14 23:29:14 GMT 2002 Morten Brix Pedersen <morten@wtf.dk>
* po/da.po: Update.
Thu Nov 14 23:26:58 GMT 2002 Colin Watson <cjwatson@debian.org>
* configure.in: Implement --enable-undoc=COMMAND.
* src/man.c (gripe_no_man): If --enable-undoc=COMMAND was set, print
an additional message referring users to COMMAND. This is mostly
here to support Debian's undocumented(7) page in a nicer way, but
perhaps others will find it useful too.
Thu Nov 14 04:21:09 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/Makefile.in: Use @LIBINTL@ rather than @INTLLIBS@. The latter
is deprecated.
Thu Nov 14 04:17:49 GMT 2002 Colin Watson <cjwatson@debian.org>
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po, po/sv.po: Update with msgmerge.
Thu Nov 14 04:10:44 GMT 2002 Colin Watson <cjwatson@debian.org>
* acinclude.m4, configure.in: Include documentation in all calls to
AC_DEFINE and AC_DEFINE_UNQUOTED. Look for acinclude.m4 in
AC_CONFIG_SRCDIR rather than acconfig.h.
* acconfig.h: Remove; the above makes it unnecessary.
* GNUmakefile.in: Remove acconfig.h from stamp-h.in's dependencies.
* autogen.sh: Run autopoint, not gettextize. autogen.sh no longer
takes an optional --copy argument.
Thu Nov 14 04:06:41 GMT 2002 Colin Watson <cjwatson@debian.org>
* po/.cvsignore: Add messages.mo and remove-potcdate.sed.
* po/it.po: Add missing '=' in charset.
Thu Nov 14 03:53:22 GMT 2002 Colin Watson <cjwatson@debian.org>
* po/cs.po: Fix an incorrect C format string.
* po/da.po: Fix some out-of-sync C format strings and default PO
file headers. I've contacted the translator about these.
Thu Nov 14 01:57:42 GMT 2002 Colin Watson <cjwatson@debian.org>
* man-db.gnu, man-db.lsm: Document the switch from SourceForge to
Savannah.
Mon Nov 11 01:50:28 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (man): Update the count of found pages with the return
value of display_pages(). This should fix the situation where man
finds a matching entry in the database, discovers that it's
actually a dangling symlink, but fails to print an error message
to say that no page was found.
Mon Nov 11 00:47:38 GMT 2002 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (OPTIONS): Change \[char173] to \[shc]. The
former doesn't appear to display as anything useful these days.
* man/es_ES.88591/man1/man.man1, man/it_IT.88591/man1/man.man1,
man/ja_JP.eucJP/man1/man.man1: Likewise.
Thu Nov 7 02:18:44 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (display): Don't do access() checks on an empty man_file
in the display_to_stdout branch, to avoid problems when running
'man -X -l -'. Similar code is already in the other branch. Patch
from Peter Muir <iyhi@yahoo.com>.
Thu Nov 7 01:42:52 GMT 2002 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Further updates for 2.4.1.
* docs/ToDo: I think the new-style database is OK now.
Thu Nov 7 01:32:29 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/globbing.c (match_in_directory): Don't use FNM_NOESCAPE flag
to fnmatch().
(look_for_file): Escape paths and names before passing them to
match_in_directory().
* src/globbing.h: Update variable names in prototype.
Wed Oct 23 02:12:43 BST 2002 Colin Watson <cjwatson@debian.org>
* tools/README: Remove reference to install-manpage.
Wed Oct 23 02:10:15 BST 2002 Colin Watson <cjwatson@debian.org>
* tools/install-manpage: Remove. It doesn't work at all as far as I
can see, and at least as far as Debian is concerned dh_installman
does a better job.
* GNUmakefile.in: Remove reference to install-manpage.
Wed Oct 23 02:03:18 BST 2002 Colin Watson <cjwatson@debian.org>
Apply proper copyright and licence notices to all source files.
There are no functional changes here, either to the code or to the
applicable licences, merely clarifications.
* docs/COPYING.LIB: New file, containing version 2.1 of the GNU
LGPL.
Wed Oct 23 01:56:38 BST 2002 Colin Watson <cjwatson@debian.org>
* tools/install-sh: Update to the version in automake 1.4-p4, which
includes a full (MIT) licence notice.
Sat Oct 12 20:16:48 BST 2002 Colin Watson <cjwatson@debian.org>
A much-needed complete rewrite of splitline(). The previous version
was extremely difficult to debug (see http://bugs.debian.org/123130)
and got info->pointer and info->whatis wrong quite frequently. This
version is much simpler and I hope more correct.
* src/util.c (trim_spaces): New function.
* include/manconfig.h.in: Prototype trim_spaces().
* src/check_mandirs.c (gripe_bad_store): New function.
(splitline): Remove.
(parse_descriptions, store_descriptions, free_descriptions): New
functions, implementing the whatis parsing that used to be in
splitline() and test_manfile().
(test_manfile): Reduce the complicated loop over splitline() to
calls to the above three functions. Adjust the parsing failure
case to require less deeply nested indentation.
* src/check_mandirs.h: New page_description struct, used to
implement the above. Prototype new functions.
* src/straycats.c: Use the new page_description-based interface.
Wed Sep 25 00:39:16 BST 2002 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (DESCRIPTION): Clarify the purpose of section 7
as "Miscellaneous".
Tue Sep 24 00:22:36 BST 2002 Colin Watson <cjwatson@debian.org>
* lib/strnlen.c: Don't try to define a weak alias. We aren't libc.
Mon Sep 16 21:14:26 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/mydbm.h: datum.dsize must be size_t, not int.
Mon Sep 16 01:07:16 BST 2002 Colin Watson <cjwatson@debian.org>
* src/compression.c (decompress): If the decompressor fails, print
an error message and return NULL rather than exit()ing
immediately. This allows callers to behave more intelligently.
* src/lexgrog.l (find_name): Cope with decompress() returning NULL.
* src/man.c (local_man_loop): Likewise.
* src/ult_src.c (ult_src): Likewise.
Mon Sep 16 00:25:17 BST 2002 Clint Adams <schizo@debian.org>
* configure.in: Detect bzip2.
* include/comp_src.h.in (comp_list): Include bunzip2 support if
available.
* include/manconfig.h.in: Add BUNZIP2 definition.
Sun Sep 15 23:53:28 BST 2002 Colin Watson <cjwatson@debian.org>
Upgrade to gettext 0.11.5.
* configure.in: Remove ALL_LINGUAS. Add AM_GNU_GETTEXT_VERSION.
* po/LINGUAS: New file. Adds sv to the value of the old ALL_LINGUAS.
* po/Makevars: New file.
* po/POTFILES.in: Add src/fakesecurity.c. Change src/lexgrog.c to
src/lexgrog.l.
* tools/mkinstalldirs: Upgrade to current version.
Fri Sep 6 23:58:10 BST 2002 Colin Watson <cjwatson@debian.org>
* src/mandb.c (xcopy): Don't print the error from fopen() if it's
just ENOENT.
Tue Sep 3 21:53:56 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (list_extensions): Prevent a theoretical buffer
overflow by allocating names and ext as necessary rather than
using a fixed-length array.
(dblookup): Update callers.
* libdb/db_delete.c (dbdelete): Likewise.
* libdb/db_storage.h: Update prototypes. ENTRIES definition is now
redundant.
Tue Sep 3 20:26:22 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_delete.c (dbdelete): Construct new multi_content
correctly (names as well as extensions) when deleting some of its
elements.
Fri Aug 30 03:11:42 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (make_roff_command): Restore the fix from 13 July 2001
that got lost while implementing -E. We need to look up the
correct character set each time a page is displayed, but still
honour any device explicitly set by -E, so test different_encoding
rather than roff_device.
Thu Aug 29 01:14:19 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (setenv_less): Export the value of $MAN_PN for the
benefit of other pagers (suggestion from Jeff Sheinberg).
Thu Aug 29 00:50:54 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c: dbfilters is no longer a global variable.
(get_preprocessors, make_roff_command, display): Take an extra
dbfilters argument.
(local_man_loop, make_roff_command, display, display_filesystem):
Adjust callers.
(display_database): Likewise. Pass in->filter as the dbfilters
argument to display() rather than setting it globally (and
forgetting to set it back to NULL later).
* src/man.h: Update prototypes.
Sat Aug 17 21:53:38 BST 2002 Colin Watson <cjwatson@debian.org>
* src/straycats.c (check_for_stray): Initialize info.name and
info.filter. Remove unhelpful __inline__.
Tue Aug 13 18:25:13 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (usage): Document new option -W, --where-cat,
--location-cat.
(man_getopt): Accept -W.
(display): -w now just prints man_file, while -W prints cat_file.
If both are given, the two filenames are printed separated by a
space, as -w used to do.
* man/man1/man.man1, docs/NEWS: Document this.
Sat Aug 10 13:19:34 BST 2002 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Preliminary entries for 2.4.1.
Sat Aug 10 13:15:49 BST 2002 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c (plain_hash_free, hash_install, hash_free): Remove
the type argument and nlist element. All current users can just
use separate hashtables instead.
* lib/hashtable.h: Update prototypes and nlist declaration.
* libdb/db_btree.c: Don't pass dummy type argument to
hash_install().
* src/check_mandirs.c, src/man.c: Include "lib/hashtable.h" rather
than "hashtable.h".
* src/check_mandirs.c (test_manfile): Use hashtable functions on the
new static whatis_hash directly rather than the old functions
which implicitly operated on the global man_hash.
(testmandirs): Since we use full paths as hash keys, there's no
need to clear whatis_hash between hierarchies.
* src/man.c (db_hash_free): New function.
(main, try_db): Use hashtable functions on the new static db_hash
directly rather than the old functions which implicitly operated
on the global man_hash.
(try_db, man): Don't clear hashtables before creating a new
database. This used to segfault in some circumstances.
* src/hashtable.c, src/hashtable.h: Remove.
* src/Makefile.in: Remove mentions of hashtable.o.
Thu Aug 8 02:05:34 BST 2002 Colin Watson <cjwatson@debian.org>
* po/sv.po: New from Translation Project.
Mon Jul 22 01:20:28 BST 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (splitline): Check for pointer underflow when
trimming leading spaces.
Mon Jul 22 01:18:18 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_ver.c: Include <string.h> for strcmp().
Wed Jul 17 20:30:30 BST 2002 Colin Watson <cjwatson@debian.org>
* src/wrapper.c: Include <locale.h> even under --disable-nls.
Mon Jul 15 14:18:56 BST 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Allow EOF to terminate MAN_NAME cleanly.
Thu Jul 11 20:45:36 BST 2002 Colin Watson <cjwatson@debian.org>
* manual/man_db.me: Version 0.7. Remove version number from \*M
string. Set a default page width of 78 ens for nroff output. Add
myself as an author.
* manual/intro.me (man-db): Mention lexgrog.
(The format of manual pages): Ted and Werner now maintain groff.
* manual/sec.me (Specifying a section): Extensions don't have to be
listed unless a special ordering is desired.
* manual/files.me (Other OS's manual pages): --systems, not
--system.
(NLS manual pages): Likewise. Update Daniel Quinlan's e-mail
address. Correct "/usr/man/man" to "/usr/man" in example manpath
output.
(Displaying latin1 characters on a Linux virtual terminal): Set
sample script in a constant-width font.
(Local cat page directory caches): Modification times are now
compared for equality rather than for the cat file being more
recent.
* manual/format.me (GROFF): tools/nroff-script is no longer
provided.
(Pre-format processors (pre-processors)): Mention the lexgrog scan
for preprocessor hints.
* manual/db.me (Contents of an index database): Clarify where the
true case of a name is stored.
(Accessdb): accessdb is compiled by default now.
* manual/misc.me (NLS message catalogues): Point to the Translation
Project.
* manual/*.me: Minor wording improvements. Apply better *roff style
(newline at each sentence break).
* man/THANKS: Update Jordi Mallach's e-mail address.
Sun Jul 7 22:19:41 BST 2002 Colin Watson <cjwatson@debian.org>
* tools/config.guess: Update to 2002-05-29.
* tools/config.sub: Update to 2002-06-21.
* tools/README: Describe config.guess and config.sub.
* tools/nroff-script: Remove. groff has had this since 1992, and its
version is considerably more up-to-date.
* GNUmakefile.in, tools/README: Remove references to nroff-script.
* zsoelim/zsoelim.l: -Wall cleanup. Set the nounput option, since we
don't need yyunput().
(open_file): Make sure the compiler knows that compfile and comp
are always initialized.
Sat Jul 6 21:30:07 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (get_roff_line_length): Widen to match groff 1.18's
defaults.
(add_roff_line_length, make_roff_command): Simplify by using en
units rather than inches.
* src/man.c (main): Slight improvement in the error message for a
missing page. If the name doesn't begin with a digit, never use
gripe_no_name(): having the 'n' section shouldn't mean that 'man
nonexistent' says "What manual page do you want from section
nonexistent?".
* src/man.c (try_section): Check for ult_src() returning NULL.
Wed Jul 3 23:46:31 BST 2002 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_system_manpath): Make sure the loop that scans for
per-system manpaths always makes progress.
Wed Jul 3 23:14:42 BST 2002 David Martinez Moreno <ender@debian.org>
* man/THANKS: Update e-mail address.
* po/es.po: Update.
Sat Jun 29 14:58:08 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (main): If a section is given but the lookup fails,
check to see if the section is actually a page name. This allows
man page names that begin with a digit to work much more sanely.
(is_section): If a single-character entry in section_list is a
prefix of the requested section name, return successfully. This
means that e.g. '3tcl' is treated as a valid section even if only
'3' is in section_list.
* src/man.c (is_section), src/man.h (is_section): Constify argument
and return type.
* src/globbing.c (match_in_directory, look_for_file): Reduce
debugging chatter.
Wed Jun 26 20:07:56 BST 2002 Colin Watson <cjwatson@debian.org>
* src/whatis.c (get_whatis): "(unknown)" => "(unknown subject)",
mainly so that translators know the number and gender.
Wed Jun 26 19:49:49 BST 2002 Colin Watson <cjwatson@debian.org>
* src/catman.c (usage), src/man.c (usage), src/mandb.c (usage),
src/manpath.c (usage): Make --help output more consistent.
* src/whatis.c (usage): Likewise. "alternate systems" => "alternate
systems'".
Wed Jun 26 14:47:01 UTC 2002 Colin Watson <cjwatson@debian.org>
* Version: 2.4.0.
* README: Update or remove references to "man-db-2.3" and similar.
* man-db.gnu: Update and sync with GNU.
* man-db.lsm: Update.
* manual/man_db.me: Replace "2.3.x" with "2.4.x".
* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po,
po/it.po, po/ja.po: Update with msgmerge.
Wed Jun 26 14:09:25 BST 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (name_sec): Allow whitespace before any closing
double quote. (rman(1) uses '.SH "NAME "'.)
Tue Jun 25 00:29:22 BST 2002 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Translation credits are in man/THANKS.
* man/THANKS: Update.
* manual/.cvsignore: New file.
Mon Jun 24 02:53:00 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (dbstore): Use \t instead of . to separate
case-variant-names and extensions in multi keys.
* libdb/db_lookup.c (list_extensions): Take an extra 'names' array
argument, and split alternately into that and 'ext'.
(dblookup): Update and simplify accordingly; we don't need the
awkward '.' handling any more.
* libdb/db_delete.c (dbdelete): Likewise.
* libdb/db_storage.h (list_extensions): Update prototype.
* include/manconfig.h.in: Database format version 2.4.1.
* manual/db.me (Contents of an index database): Document
case-insensitive name storage format. Bring the documentation of
the database entry format up to date.
* manual/sec.me (Specifying a section): Mention the SECTION
configuration directive.
Fri Jun 21 10:50:40 UTC 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (make_filename): in->comp may be NULL.
* po/fr.po: Update from Translation Project.
Mon Jun 17 09:56:15 UTC 2002 Colin Watson <cjwatson@debian.org>
* configure.in (ALL_LINGUAS): Add ca.
* src/man.c: Update some comments.
* src/lexgrog.l: Treat \~ as a space. Treat \# as a comment. Treat
.ig as ending the whatis.
Thu Jun 13 18:16:46 BST 2002 Colin Watson <cjwatson@debian.org>
* po/ca.po: Some updates after review.
Wed Jun 12 18:29:18 BST 2002 Colin Watson <cjwatson@debian.org>
* docs/ToDo: Updates.
* po/ca.po: New from Translation Project.
Wed Jun 5 14:23:13 BST 2002 Colin Watson <cjwatson@debian.org>
* po/de.po: Update from Translation Project.
Tue Jun 4 13:15:09 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Return 0 when asked to compare two
candidates we can't distinguish, not -1. The latter broke
multilingual support.
Tue Jun 4 01:33:31 BST 2002 Colin Watson <cjwatson@debian.org>
* Version: 2.3.90 (for translators).
* docs/NEWS: More updates.
* po/cs.po, po/da.po, po/de.po, po/es.po, po/fr.po, po/it.po,
po/ja.po: Update with msgmerge.
Tue May 28 00:36:55 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (dblookup): Check the MATCH_CASE flag in the
case of a single entry as well as multiple entries.
Mon May 27 23:57:26 BST 2002 Colin Watson <cjwatson@debian.org>
* lib/hashtable.c, lib/hashtable.h: New files, containing the
generic parts of src/hashtable.{c,h}.
* lib/Makefile.in: Add hashtable.c.
* src/hashtable.c (hash, lookup, install): Remove. These functions
have been renamed and moved to lib/hashtable.c.
(free_defn): Rename to man_hash_free and update for new hashtable
API.
(free_hashtab): Update for new hashtable API.
* src/hashtable.h: Update prototypes.
* libdb/db_btree.c (btree_findkey): Check for entries we've seen
before in the current run. These indicate a corrupt database
containing a loop.
Thu May 23 01:50:53 BST 2002 Colin Watson <cjwatson@debian.org>
* lib/cleanup.h: #endif must not be followed by a token on the same
line.
Thu May 23 00:29:24 BST 2002 Colin Watson <cjwatson@debian.org>
* src/fake_security.c (get_man_owner): New fake function to match
the real one in src/security.c.
* src/manp.c (mkcatdirs): Chown newly created cat directories to the
MAN_OWNER when running as root.
* .cvsignore, intl/.cvsignore, po/.cvsignore: Ignore a few more
files.
* src/man_db.conf.in: Correct the heading.
Wed May 22 00:06:18 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (compare_ids): New function, replacing the
FAVOUR() macro. Without this, the last-but-one commit won't
compile ...
(replace_if_necessary): Use it.
* libdb/db_storage.h: Prototype it.
Mon May 20 03:07:24 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (setenv_less): New function to set up $LESS. This
honours the new environment variable $MANLESS, which overrides the
usual processing and is copied directly into $LESS.
(make_display_command): Use it.
* man/man1/man.man1 (OPTIONS): Mention $MANLESS alongside the
--prompt option.
(ENVIRONMENT): Document $MANLESS.
Mon May 20 02:16:43 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Compare id fields as a last
resort, so that, for example, real pages sort ahead of whatis-only
names.
(try_section): Set the id field based on the output of ult_src().
* src/man.c (man): When locating pages, don't stop when one is found
in a particular directory and -a wasn't given. That's now the job
of the display code.
Mon May 20 01:16:02 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (free_mandata_elements): New function, to be
used rather than freeing the addr field directly. This frees name
as well.
(free_mandata_struct): Use it.
* libdb/db_btree.c (dbstore, dblookup): Likewise.
* libdb/db_store.c (dbstore): Likewise.
* src/whatis.c (whatis): Likewise.
* libdb/db_storage.h: Prototype it.
* libdb/db_store.c (replace_if_necessary): Rename in and info to
newdata and olddata, which are more comprehensible. Don't check
that the name fields match here - the caller should do that.
(dbstore): Make sure in->name isn't set on entry, and instead set
it to the basename where necessary. Don't set the name field in
multi keys, which use the proper case.
* src/check_mandirs.c (filename_info): We don't need to examine the
case of base_name here.
Thu May 16 00:47:05 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_btree.c (btree_flopen): If O_CREAT isn't set, check
whether we're trying to open a zero-length database and, if so,
return immediately. This works around some pathological behaviour
in Berkeley DB.
Mon May 6 03:48:17 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c (FAVOUR): Parenthesize macro arguments.
(dbstore): In situation (3), use the old lookup key for the name
of the corresponding multi key, not the basename (which may be in
the wrong case).
Sun May 5 17:49:21 BST 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Accept DOS line-ending conventions.
Sun May 5 15:38:34 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_delete.c (dbdelete): Don't scribble over the list
returned by list_extensions(). We need it shortly afterwards to
construct the new multi key.
Fri May 3 19:43:52 BST 2002 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in (LESS_OPTS): Add the -R flag, which helps
with displaying the ANSI colour escapes generated by groff 1.18.
Fri May 3 19:27:40 BST 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (add_roff_line_length): New function, adding -rLL and
-rLT to the groff command line (supported in groff >= 1.18).
(make_roff_command): Call add_roff_line_length(). The old code to
set .ll and .lt remains for compatibility purposes.
Wed May 1 02:16:11 BST 2002 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (testmandirs): Include the subdirectory name
in the "Updating index cache" message.
Wed May 1 02:05:02 BST 2002 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c: Make sure the check for whether a replace is
necessary in situation (3) behaves as it did before the multi key
format changes.
* libdb/db_lookup.c (copy_if_set, dash_if_unset): Constify
arguments.
* libdb/db_storage.h: Likewise for prototypes.
* src/convert_name.c (gripe_converting_name): name should be const.
* src/manp.c (get_catpath): suffix should be const.
Wed May 1 00:14:20 BST 2002 Colin Watson <cjwatson@debian.org>
* src/globbing.c (match_in_directory): Close the directory after
reading through it.
Wed May 1 00:02:53 BST 2002 Colin Watson <cjwatson@debian.org>
Case-(in)sensitivity in database lookups should work properly now.
* libdb/db_lookup.c (gripe_bad_multi_key): New function.
(make_multi_key): Don't lowercase page any more - that happens
elsewhere.
(list_extensions): We now return names/extensions, not just
extensions.
(dblookup): Multi keys are now formed as "RealCase.1" rather than
just "1". Add a new MATCH_CASE flag which, if set, makes sure the
RealCase part matches. Otherwise the database lookup is
case-insensitive.
(dblookup_exact, dblookup_all): Pass through a match_case flag for
the above.
* libdb/db_delete.c (dbdelete): Cope with new multi key format.
* libdb/db_store.c (dbstore): Construct the multi key from the
original case of the name rather than the lowercased version. Add
the basename to the multi keys created here, as above.
* src/man.c (display_database): Pass match_case flag through to the
database lookup.
(try_db): Likewise.
* src/check_mandirs.c (test_manfile): Make sure lookups are
case-sensitive.
* src/straycats.c (check_for_stray): Likewise.
* src/whatis.c (get_whatis): Likewise.
(whatis): Use a case-insensitive lookup.
* libdb/db_storage.h (struct mandata): name is no longer const; it
should always be freeable if non-NULL. We no longer use "-" to
indicate it being the same as the requested name, except in the
database itself.
* libdb/db_lookup.c (copy_if_set, dash_if_unset): New functions.
(infoalloc): Zero the newly allocated structure.
(free_mandata_struct): Free name if it's set.
(dbprintf, split_content, make_content, dblookup): Cope with the
new convention for info->name.
* libdb/db_store.c (replace_if_necessary): Likewise.
* src/check_mandirs.c (filename_info): Likewise.
* src/man.c (compare_candidates, add_candidate, display_database):
Likewise.
* src/whatis.c (display): Likewise.
* libdb/db_storage.h: Update prototypes.
Mon Apr 29 00:13:58 BST 2002 Colin Watson <cjwatson@debian.org>
* src/whatis.c (display): Display page names in the correct case
using the new info->name field.
Mon Apr 29 00:00:38 BST 2002 Colin Watson <cjwatson@debian.org>
* src/whatis.c (use_grep): Put a space in the grep command before
the flags!
Sun Apr 28 23:50:22 BST 2002 Colin Watson <cjwatson@debian.org>
Pass through much of the code adding 'const' where appropriate. This
should help me avoid various memory management bugs.
Noteworthy changes from this:
* include/manconfig.h.in (struct compression): prog and ext
generally shouldn't be modified directly.
* libdb/db_lookup.c (make_content): dash really has to stay
constant, or the various things that point to it statically will
break other things badly.
* libdb/db_storage.h (struct mandata): The only pointers here that
should generally be modified directly are next and addr.
* libdb/db_store.c (dbstore): Remove debugging code left from
previous checkin.
* src/check_mandirs.c (splitline): Note that we're deliberately
modifying info->whatis here.
(filename_info): Modify to be more const-friendly.
* src/compression.c (comp_file): Add TODO for comp->file.
* src/man.c (find_cat_file): Drop unused sec argument, and update
callers.
* include/manconfig.h.in, libdb/db_storage.h, src/hashtable.h,
src/man.h, src/manp.h: Update prototypes for all of the above.
Fri Apr 26 01:59:46 BST 2002 Colin Watson <cjwatson@debian.org>
Add case-insensitivity support to the database.
* libdb/db_storage.h (struct mandata): Add 'name' element.
* libdb/db_lookup.c (dbprintf): Print name.
(split_content): Read name from start of data.
(make_content): Prepend name to each data element.
(name_to_key): New function, converting a name to lowercase for
use in database keys.
(make_multi_key): Use name_to_key().
(dblookup): Use name_to_key(). If info->name is "-", set it to the
requested key instead.
* libdb/db_delete.c (dbdelete): Use name_to_key().
* libdb/db_store.c (dbstore): Likewise.
* src/check_mandirs.c (make_filename): Use in->name if name is NULL.
(filename_info): Fill in info->name with either a new req_name
argument or the supplied base_name.
(test_manfile): Update calls to make_filename() and
filename_info().
* src/check_mandirs.h: Update prototype.
* src/man.c (struct candidate): Rename 'name' to 'req_name'.
(display_filesystem, display_database_check): Update accordingly.
(compare_candidates): Sort exact-case matches to the front.
(add_candidate): Update calls to compare_candidate() and
filename_info(). When comparing duplicates, check the name field
in the mandata rather than the requested name.
(try_section): The hack to get the name from info_buffer is no
longer required now that filename_info() fills that in.
(display_filesystem): Update calls to make_filename(). Use the
mandata name for the displayed title rather than the requested
name. Sanity-check in->name != "-".
* include/manconfig.h.in: Bump the database version to 2.4.0.
* lib/xstrndup.c: Prototype strnlen().
Mon Apr 22 00:00:08 BST 2002 Colin Watson <cjwatson@debian.org>
* src/globbing.c (match_in_directory): New function, implementing a
limited glob() with optional case-insensitivity.
(look_for_file): Use match_in_directory() rather than glob().
Accept new match_case argument.
* src/globbing.h: Update prototype.
* src/check_mandirs.c (purge_whatis, purge_missing): Update calls to
look_for_file().
* src/man.c (usage, man_getopt): Add --ignore-case and --match-case
arguments.
(try_section): Update calls to look_for_file().
(try_section, display_filesystem, display_database,
display_database_check, display_pages, man): Make sure to use the
candidate name rather than the requested name, so that
case-insensitive lookups work.
* man/man1/man.man1 (OPTIONS): Document --ignore-case and
--match-case.
* po/.cvsignore: Ignore man-db.pot rather than man_db.pot.
Thu Apr 18 11:15:11 BST 2002 Matej Vela <vela@debian.org>
* docs/manpage.example: Use .BR for links to other man pages.
Wed Apr 3 19:54:03 BST 2002 Colin Watson <cjwatson@debian.org>
* Rename package from man_db to man-db.
* docs/NEWS: Start updating for 2.4.0.
Wed Apr 3 18:44:04 BST 2002 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (distclean): Remove autom4te.cache.
Wed Apr 3 18:40:19 BST 2002 Colin Watson <cjwatson@debian.org>
* .cvsignore: Add autom4te.cache.
* configure.in: Use AC_LIBOBJ rather than setting LIBOBJS directly.
(--enable-setuid): Use quadrigraphs to get [ and ].
(--with-config-file): New option.
* include/Defines.in (config_file): Honour --with-config-file
setting.
Fri Mar 29 21:08:37 GMT 2002 dann frazier <dannf@dannf.org>
* docs/manpage.example.sgml: Update copyright year.
Thu Mar 21 16:22:58 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/man.c (main): Save the value of $LESS at startup to
$MAN_ORIG_LESS, and use that saved value in preference to $LESS.
This lets recursive invocations of man give less the correct page
titles.
Wed Mar 20 09:37:11 GMT 2002 Eirik Fuller <eirik@hackrat.com>
* src/check_mandirs.c (splitline): Don't create a copy of base_name
as pointer_name.
(test_manfile): Be more careful about pointer reuse across calls
to splitline().
Mon Feb 11 13:01:07 GMT 2002 Michael Piefel <piefel@debian.org>
* po/de.po: Corrections and updates; convert to UTF-8.
* man/THANKS: Add credit (the contributor of the previous de.po is
unidentified).
Sun Jan 27 03:31:11 GMT 2002 Colin Watson <cjwatson@debian.org>
* configure.in (ALL_LINGUAS): Add da. Reorder alphabetically.
Sat Jan 12 17:55:12 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Match a line at a time rather than a character at a
time after the end of the NAME section.
* src/check_mandirs.c (testmandirs): More --debug information.
* include/manconfig.h.in (LESS_OPTS): Prune duplicate -Pm option.
Set -PM too so it works even when $LESS contains -M.
* src/man.c (make_display_command): Substitute prompt_string into
LESS_OPTS twice to accommodate the above.
Mon Jan 7 16:16:02 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Another {blank_eol} fix, thanks to Peter Clay.
Sun Jan 6 19:05:46 GMT 2002 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Use {blank_eol}, not [blank_eol]. The latter
matches in entirely inappropriate places.
Sun Dec 23 06:17:47 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (long_options, usage, man_getopt): Add a new
-E/--encoding option. It behaves a little like -T, except that it
uses nroff instead of troff and outputs to a pager.
(make_roff_command): Only call determine_lang_table() if
roff_device isn't already set.
(display, try_section, display_filesystem, display_database):
Check for different_encoding.
* man/man1/man.man1 (DEFAULTS, OPTIONS): Document -E.
Sun Dec 23 05:23:05 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (compare_candidates): Compare sections according to
section_list before comparing them lexicographically.
(add_candidate): Do a better job of inserting each entry at the
right place in the list.
Sun Dec 23 04:47:02 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (determine_lang_table): Format man pages in UTF-8 if
that's the current locale's character set.
Sun Dec 23 02:35:24 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (popen, pclose): Move to a separate library file ...
* lib/popen.c: ... here.
* acinclude.m4 (MAN_FUNC_PCLOSE): Use AC_LIBOBJ to conditionally
compile this.
* acconfig.h: Remove BROKEN_PCLOSE definition.
Major rewrite of man's searching code to make it maintainable and to
prepare for better sorting of displayed man pages.
* src/man.c (add_candidate): New function to add an item to a list
of candidate pages.
(compare_candidates): New helper function.
(compare_names, compare_mandata_ext): Remove.
(try_section): Use add_candidate() rather than displaying the page
immediately.
(try_db): Likewise.
(display_filesystem): New function to display pages found by
try_section().
(try_db_section): Rename to display_database(), and use the
candidate structures.
(exist_check): Rename to display_database_check(); use candidates.
(locate_page): Pass the candidate list through to try_section()
and try_db().
(display_pages): New function to iterate through a candidate list
and display each entry.
(man): Create a candidate list and pass it to locate_page().
Display pages only after building the full list.
Mon Dec 17 03:40:48 GMT 2001 Colin Watson <cjwatson@debian.org>
* man/man8/mandb.man8 (EXIT STATUS): Document mandb's exit codes.
Mon Dec 17 03:20:15 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/whatis.c (long_options): Remove duplicate for --exact.
(word_fnmatch): New function.
(parse_whatis): Match using word_fnmatch() if --wildcard but not
--exact was given.
* man/man1/apropos.man1 (OPTIONS): Document this.
(DESCRIPTION): Fix typographical glitch.
Mon Dec 17 00:53:20 GMT 2001 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (OPTIONS): Mention groff 1.17 and the ps and
utf8 devices.
* man/*/man1/man.man1: Likewise.
Sun Dec 9 03:31:54 GMT 2001 Morten Brix Pedersen <morten@wtf.dk>
* po/da.po: New file.
* man/THANKS: Add credit.
Sun Dec 9 03:19:57 GMT 2001 Jose Rodriguez <boriel@airtel.net>
* src/man.c (main): Initialize program_name before calling error().
Fri Dec 7 01:35:31 GMT 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Detect libdb3, although man-db hasn't been well
tested with it yet.
Fri Dec 7 00:35:53 GMT 2001 Paul Slootman <paul@wurtel.net>
* src/man.c (main): Delete spurious backslashes in prompt_string.
Wed Nov 21 20:59:14 GMT 2001 Colin Watson <cjwatson@debian.org>
* po/fr.po: Update from Laurent Pelecq.
* po/.cvsignore: Ignore ChangeLog.
Wed Nov 21 00:48:50 GMT 2001 Colin Watson <cjwatson@debian.org>
Keeping generated files like the output of gettextize in CVS is bad.
* intl/*, po/ChangeLog, po/Makefile.in.in: Remove.
* autogen.sh: Run gettextize.
* release.sh: When releasing, pass --copy to gettextize.
Wed Nov 21 00:29:26 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/compression.c (decompress): Free esc_file and esc_filename
once we're finished with them.
* src/man.c (local_man_loop): If argv is a directory, display a
useful error message rather than letting zsoelim get confused.
Mon Nov 19 00:53:03 GMT 2001 Colin Watson <cjwatson@debian.org>
* libdb/db_lookup.c (copy_datum): Explicitly null-terminate
dat.dptr, since C string-manipulation functions are used on it.
Fri Nov 16 04:28:31 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_nls_manpath): Concatenate strings more safely.
Changes adapted from a patch by OGAWA Hirofumi
<hirofumi@mail.parknet.co.jp>:
* acinclude.m4 (MAN_CHECK_BDB): $LIBS, not LIBS, and quote it while
we're here.
* src/manp.c (pathappend): Use strsep() rather than strtok().
(cat_manpath): Likewise.
(add_nls_manpath): Likewise.
Thu Nov 8 11:27:32 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (get_preprocessors_from_file): Drop privileges to access
temporary file.
Wed Nov 7 13:34:38 GMT 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display): Drop privileges throughout. Don't free
command until after it could have been used for an error message.
Sun Oct 14 05:23:20 BST 2001 Colin Watson <cjwatson@debian.org>
* src/version.c: Include <stdlib.h> for exit().
* include/manconfig.h.in: Remove spurious orphaned #ifdef. Oops.
Spanish translation updates from David Martínez <ender@adi.uam.es>:
* po/es.po, man/es_ES.88591/man1/apropos.man1: Bring up to date.
* man/man1/lexgrog.man1: Fix thinko - s/problems/programs/.
Tue Sep 25 22:46:45 BST 2001 Colin Watson <cjwatson@debian.org>
* src/whatis.c (get_whatis): Suppress wrong report of a pointer loop
when the second or subsequent element in a pointer chain points to
itself and has a usable whatis.
Wed Sep 19 00:47:55 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (local_man_loop): Drop privileges throughout.
Documentation corrections thanks to Andreas Dilger
<adilger@turbolabs.com>:
* man/man1/man.man1 and translations (SEE ALSO): Refer to man(7).
* docs/manpage.example, docs/manpage.example.pod,
docs/manpage.example.sgml (SEE ALSO): Move to the end.
(SYNOPSIS, DESCRIPTION, OPTIONS): Add more advice.
* docs/manpage.example (FILES): Restore tabs that had been turned
into spaces.
Tue Sep 18 03:46:00 BST 2001 Colin Watson <cjwatson@debian.org>
* lib/xstrndup.c: New file.
* lib/Makefile.in: Build it.
* include/manconfig.h.in: Prototype xstrndup().
* src/man.c (compare_names, compare_mandata_ext): New functions.
(try_section): Build title more locally, displaying extensions
correctly. Sort the results of look_for_file().
(try_db_section): Build title even if NROFF_MISSING is defined.
(try_db): Sort data returned from the database.
(locate_page): Look in the filesystem first and then the database,
rather than the other way round.
* src/manp.c (checkpath): Remove; it used to resolve symlinks, but
it doesn't do that any more and I don't think it should.
* src/manp.c: Constify arguments to many functions by either being
more careful not to alter them or by duplicating them.
* src/util.c (is_directory): Likewise.
* src/catman.c, src/man.c, src/mandb.c, src/whatis.c (main):
Simplify calls.
* src/manp.h, include/manconfig.h.in: Update prototypes.
* src/manp.h: add_system_manpath() is static now.
* include/manconfig.h.in: Provide stupid getcwd() emulation with
getwd() if the former isn't available.
* src/man.c (main, format_display): Assume getcwd() is available.
* src/mandb.c (main): Likewise.
* src/manp.c (add_dir_to_path_list): Likewise.
* src/manp.c (add_dir_to_path_list): The checks that manpaths end in
/man or /MAN were overly anal and never compiled in; remove them.
* acinclude.m4 (MAN_PROG_GNU_NROFF): More portable shell for ash.
* src/man.c (lang_table): We use the latin1 alias rather than
iso8859 for all other languages, so do so for Korean too.
* src/lexgrog.l: Prevent the no-op request '.' from eating text on
the next line.
(find_name): Remove trailing spaces as well as leading ones.
Fri Sep 7 19:28:12 BST 2001 Colin Watson <cjwatson@debian.org>
* Version: 2.3.20.
* docs/NEWS: Update.
* po/cs.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ja.po:
Update.
Fri Sep 7 00:55:53 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (dist): Include other manpage.example formats.
* lib/tempfile.c (create_tempfile): Create with mode 0600.
* src/check_mandirs.c (test_manfile): Drop privileges for temporary
file operations.
* src/lexgrog.l (find_name): Likewise.
* src/man.c (make_roff_command): Likewise.
* src/straycats.c (check_for_stray): Likewise.
(straycats): Likewise.
* src/ult_src.c (ult_src): Likewise.
Thu Sep 6 21:54:05 BST 2001 Colin Watson <cjwatson@debian.org>
* include/Defines.in: Add lexgrog to list of transformed program
names. Adjust sysconfdir detection.
* src/Makefile.in (install): Really install lexgrog by default.
Create the directory config_file is in rather than sysconfdir.
Wed Sep 5 19:55:01 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (dist): Generate a .tar.gz, not a .tgz.
* src/man.c: Korean: roff_device is ascii8, LESSCHARSET is iso8859.
* po/cs.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ja.po:
Update.
Wed Sep 5 03:42:18 BST 2001 Colin Watson <cjwatson@debian.org>
* src/compression.c (decompress): Constify arguments.
* include/manconfig.h.in: Likewise.
* src/lexgrog.l (find_name): Deal with '-' and compressed files.
* man/man1/lexgrog.man1 (DESCRIPTION): Document this.
(BUGS): Remove (optimism ...).
(NOTES): New section. lexgrog can't parse .so requests.
* src/Makefile.in: Really build lexgrog by default, and add some
objects.
Wed Sep 5 02:02:20 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Describe recent changes.
* man/man1/man.man1 (OPTIONS): Document --html.
(ENVIRONMENT): Document $BROWSER.
* man/man8/mandb.man8 (OPTIONS): Explain that --create implies
--no-purge.
Tue Sep 4 18:38:23 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display): If $BROWSER contains several elements
separated by colons, try each in turn until one succeeds.
Tue Sep 4 02:09:07 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (format_display): Actually change to the temporary
directory for HTML output.
* src/mandb.c (main): --create implies --no-purge.
Sat Sep 1 17:40:06 BST 2001 Colin Watson <cjwatson@debian.org>
* lib/mkdtemp.c, lib/mkstemp.c, lib/tempname.c: New files, taken
from glibc 2.2.4.
* lib/Makefile.in, lib/README: Add them.
* configure.in: Check for mkdtemp() and mkstemp().
* lib/tempfile.c (path_search): New function, split from
create_tempfile(). Now checks $TMP as well as $TMPDIR, and ensures
that neither is checked when privileges are raised.
(create_tempfile): Use it. Fix the umask around the call to
mkstemp() rather than calling fchmod() after the fact.
(create_tempdir): New function.
* include/manconfig.h.in: Prototype create_tempdir().
* src/man.c: --html code needs to be guarded by TROFF_IS_GROFF.
(man_getopt): If -H is given, set troff to 1. Add -H to the
"incompatible options" error message.
(make_roff_command): Revert determine_lang_table() special case.
(format_display): Use a temporary directory for HTML output (groff
tends to output several files, including images). Take an extra
argument, used to set the name of the main output file.
(display): Pass man_file to format_display().
* src/util.c (remove_directory): New function.
* include/manconfig.h.in: Prototype it.
Fri Aug 31 22:20:08 BST 2001 Colin Watson <cjwatson@debian.org>
Initial support for ESR's $BROWSER variable. Not complete yet.
* src/man.c: Remove ENABLE_HTML guards around all the --html code.
Too many #ifdefs clutter the code, and it should at least be
usable to some extent now.
(main): Check $BROWSER before other ways of finding html_pager.
(man_getopt): If -H is given, set roff_device to "html". Reset
htmlout and html_pager with -D.
(make_roff_command): Don't call determine_lang_table() if htmlout
is set.
(make_browser): New function.
(make_display_command): Add case for htmlout being set.
(format_display_and_save): Rename roff_cmd to format_cmd.
(display_catman): Likewise.
(display): Likewise. Add some cases for htmlout being set (always
format, never save a cat page). Split some code out into
format_display().
(format_display): New function.
* src/man.c (main): Save the value of $LESS for later.
(make_display_command): Use setenv() to change $LESS in the
environment rather than nasty shell code.
* src/man.c (main): Don't loop if $LANGUAGE is set but empty.
(display_catman): Fix segfaults due to strappend() misuse.
* src/manp.c (read_config_file): Print dotmanpath, not home (which
might point to freed memory).
* src/man.c (main): Tidy up error message.
(store_line_length): Remove duplicate 'int width' declaration.
Wed Aug 29 20:44:27 BST 2001 Colin Watson <cjwatson@debian.org>
* man/man8/mandb.man8 (WHATIS PARSING): Move to ...
* man/man1/lexgrog.man1: ... here.
* po/cs.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ja.po: Run
msgmerge.
Wed Aug 29 01:48:53 BST 2001 Colin Watson <cjwatson@debian.org>
* man/man1/apropos.man1 (ENVIRONMENT): Fix grammar error.
Wed Aug 29 01:34:33 BST 2001 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l (usage): New function.
(main): Rewrite. Add command-line options, and make the output
more easily parseable by other programs. By default, the lexgrog
program now only attempts to parse its input as a man page and
only displays the whatis line, although this can be changed on the
command line.
* src/Makefile.in: Include lexgrog in $(PROGS), so that it gets
built by default and linked against version.o.
* man/man1/lexgrog.man1: New man page. Still needs some work.
* man/Makefile.in: Install it. Tolerate it being missing in some
languages (ugly hack).
Tue Aug 21 01:57:44 BST 2001 Colin Watson <cjwatson@debian.org>
* src/Makefile.in: Link non-setuid programs against fake_security.o
rather than security.o.
* src/fake_security.c: Add a few stub variables to match recent
security.c changes.
Tue Aug 21 01:34:49 BST 2001 Colin Watson <cjwatson@debian.org>
* src/Makefile.in (install): Don't depend on all, so that the
package isn't recompiled when running 'make install' on a machine
with a skewed clock.
Don't install the wrapper. Install man and mandb in $(bindir)
rather than $(libdir)/man-db.
If lexgrog and globbing have been built, install them in
$(libdir)/man-db rather than $(sbindir).
Ensure $(sbindir) and $(libdir)/man-db exist.
Tue Aug 21 00:40:47 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (escape_special): Rename to escape_less(). Constify
argument.
(determine_lang_table): Constify argument. Unify some common code.
(make_display_common): Use escape_less() rather than
escape_special().
* docs/NEWS: Document shell escaping.
Sun Aug 19 23:56:36 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Compile with -Wall by default.
* src/compression.c: Include "security.h".
* src/manp.c: Likewise.
* src/check_mandirs.c (purge_whatis): Correct return value when
purging a WHATIS_MAN entry with a missing target.
* src/whatis.c (get_whatis): Remove unused variables 'pointer' and
'ext'.
* src/man.c: Include <time.h> for time().
(local_man_loop): Remove unused variable 'dir'.
(make_roff_command): Remove unused variable 'tmpfile'.
(exist_check): Print 'loc' in pointer format rather than string
format (it's a struct mandata *).
* src/wrapper.c: Include <grp.h> for initgroups().
Sun Aug 19 13:16:01 BST 2001 Colin Watson <cjwatson@debian.org>
* src/manp.c (iterate_over_list): New function (get_from_list() can
only get the first matching element).
(get_manpath): Use iterate_over_list() to get multiple matching
MANPATH_MAP entries.
Sun Aug 19 13:02:01 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (popen, pclose): Rely on the BROKEN_PCLOSE check in
configure rather than checking architectures here.
(man_getopt): Wrap the remaining code related to --html in '#ifdef
ENABLE_HTML'.
(make_roff_command): Remove HAS_TROFF and NROFF_MISSING asserts; I
think they're unnecessarily unwieldy here.
(tmp_cat_filename): Constify argument.
(commit_tmp_cat): Constify arguments.
(display_catman): New function, split from display().
(display): Use display_catman(). Don't shadow status from an outer
scope.
(try_section): Simplify cat page case.
* src/util.c (escape_shell): New function.
* include/manconfig.h.in: strappend() is no longer in util.c.
Prototype escape_shell().
* src/man.c (make_roff_command): Use escape_shell() liberally to
protect against strange characters.
(make_display_command): Likewise. Add special handling for $MAN_PN
in the less prompt string, since the environment variable is no
longer parsed by the shell.
(display_catman): Likewise.
(display): Likewise.
* src/whatis.c (use_grep): Likewise.
* src/catman.c (main): Print a warning if setlocale() fails.
* src/man.c (main): Likewise.
* src/mandb.c (main): Likewise.
* src/manpath.c (main): Likewise.
* src/whatis.c (main): Likewise.
* src/wrapper.c (main): Explain why this doesn't need to warn if
setlocale() fails.
Thu Aug 9 15:10:26 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Require autoconf 2.50a (for AS_VAR_*).
* src/wrapper.c: If DEBUG is defined, allow _man and _mandb as
argv[0] names as well as man and mandb, rather than instead of
them.
* docs/NEWS: Document lexgrog improvement. The mkstemp() work was
more an improvement than a fix, as I don't think it was
exploitable.
Mon Aug 6 02:22:38 BST 2001 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: groff requests aren't case-sensitive, so stop the
preprocessor detection thinking they are.
Mon Aug 6 01:26:26 BST 2001 Colin Watson <cjwatson@debian.org>
* lib/tempfile.c (create_tempfile): Use mode 0644 rather than mode
0600 so that it can be read with different privilege levels.
Thu Aug 2 00:12:41 BST 2001 Colin Watson <cjwatson@debian.org>
* lib/tempfile.c: New file. create_tempfile() does sane
mkstemp()-like temporary file creation, while searching through
$TMPDIR, P_tmpdir, and /tmp in the style of tempnam().
* include/manconfig.h.in: Prototype create_tempfile().
* lib/tempnam.c: Remove, as we no longer use it.
* lib/Makefile.in, lib/README: Remove mentions of tempnam.c, and use
tempfile.c instead.
* configure.in: Don't replace tempnam().
* src/compression.c (create_ztemp): Use create_tempfile() rather
than tempnam().
* src/man.c (create_stdintmp): Likewise.
* zsoelim/zsoelim.l (open_file): Likewise.
* src/straycats.c (straycats): Use create_tempfile() rather than
mkstemp().
* src/compression.c (decompress): Call remove_ztemp() rather than
duplicating code.
(remove_ztemp): Only close the fd if it looks valid.
* src/man.c (remove_stdintmp): Remember to free stdin_tmpfile.
* acinclude.m4: Correct AC_VAR_* to AS_VAR_*.
* src/util.c (is_changed): Fix comment.
* docs/NEWS: Preliminary entries for 2.3.20.
Tue Jul 24 02:17:53 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/manpage.example: Some cleanups. Use more conventional
formatting for references to other man pages.
* docs/manpage.example.pod, docs/manpage.example.sgml: New files.
Mon Jul 16 16:42:46 BST 2001 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Restore fr_name to the NAME regex.
Fri Jul 13 11:51:40 BST 2001 Colin Watson <cjwatson@debian.org>
* man/de_DE.ascii: Remove (Latin-1 variant still exists).
Fri Jul 13 02:35:39 BST 2001 Colin Watson <cjwatson@debian.org>
* */.cvsignore: New files.
* src/man.c (make_roff_command): Look up the correct character set
each time a page is displayed, not just the first time.
Thu Jul 12 01:11:41 BST 2001 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Split out NAME-matching regex into one regex per
language. Add support for cs, fi, hu, nl, and pl, not forgetting
Latin (for Lingua::Romana::Perligata(3pm), of course).
(add_separator_to_whatis): New function, to allow trimming the
first space from the " - " separator.
(main): Rewrite; find_name()'s prototype changed long ago.
Tue Jul 10 14:37:51 BST 2001 Colin Watson <cjwatson@debian.org>
* src/util.c (is_newer): Rename to ...
(is_changed): ... this. We now check whether the cat page has a
different timestamp from the man page, rather than simply whether
it is newer.
Remove hack for archivers that preserve timestamps: it's no longer
needed.
* include/manconfig.h.in: Rename is_newer() prototype to
is_changed().
* src/man.c (commit_tmp_cat): Set the modification time of a created
cat page to be the same as the corresponding man page.
(display): stat() the man page so that commit_tmp_cat() can get
its modification time.
Use is_changed() rather than is_newer().
Sun Jul 8 16:06:43 BST 2001 Colin Watson <cjwatson@debian.org>
* src/whatis.c (get_whatis): Allow an entry to point to itself if it
contains a non-empty whatis field. This occasionally happens when
multiple names and descriptions are present, and it's easier to
tolerate this.
(display): If an entry points to itself, don't display the pointer
in square brackets.
* include/sections.list: Remove; it's no longer needed.
* GNUmakefile.in (dist): Don't install it.
* include/Defines.in: Don't reference it. Also remove definition of
message_catalogue (obsoleted by gettext).
* include/manconfig.h.in (LESS_OPTS): Don't include $LESS.
* src/man.c (make_display_command): Include $LESS here instead. Put
it after prompt_string rather than before, so that long options in
$LESS work.
Sat Jul 7 16:32:24 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (determine_lang_table): Fix silly bracketing typo that
caused none of the lang_table entries to match.
Thu Jul 5 15:48:42 BST 2001 Colin Watson <cjwatson@debian.org>
* Version: 2.3.19.
* docs/NEWS: Update.
* man-db.gnu: Update. Change formatting to something closer to that
currently in the Free Software Directory CVS repository.
* man-db.lsm: Update.
Thu Jul 5 14:27:17 BST 2001 Colin Watson <cjwatson@debian.org>
* man/man5/manpath.man5 (FORMAT): MANDB_MAP now only affects
setuidness when in the system configuration file.
* src/man_db.conf.in: Likewise.
* po/cs.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ja.po:
Update.
Wed Jul 4 13:39:40 BST 2001 Colin Watson <cjwatson@debian.org>
The product of some hacking at the Debian Conference. Enjoy.
* docs/NEWS: Describe recent changes.
* include/manconfig.h.in: Add SYSTEM_CAT and USER_CAT defines.
Move includes from security.c to ...
* src/security.h: ... here (new file).
* src/man.c: Include security.h.
* src/mandb.c: Likewise.
* src/security.c: Likewise.
* src/manp.c (add_mandb_map): Take an additional parameter, user.
Use the new MANDB_MAP_USER flag instead of MANDB_MAP if it is set.
(cat_manpath): Look at user catpaths before system catpaths.
(add_to_dirlist): Take user parameter, passed through to
add_mandb_map().
(read_config_file): Call add_to_dirlist() with user set for
~/.manpath, and reset for /etc/manpath.config (security fix).
(get_mandb_manpath): Allow user manpaths.
(global_catpath): Rename to get_catpath(), and only allow it to
handle user catpaths (from ~/.manpath) as well if explicitly
requested.
(is_global_mandir): Note that this is trusted.
* src/manp.h: Reflect renaming of global_catpath() to get_catpath().
* src/man.c (need_to_rerun): Use get_catpath() instead of
global_catpath().
(make_roff_command): Likewise.
(display): Likewise.
(find_cat_file): Likewise.
(try_db_section): Likewise.
(try_db): Likewise.
* src/catman.c (main): Likewise (check only user mandirs).
* src/mandb.c (main): Likewise (check only user mandirs).
* src/straycats.c (straycats): Likewise (check only with user
mandirs).
* src/whatis.c (search): Likewise (check only with user mandirs).
* src/man.c (need_to_rerun): Use is_global_mandir() rather than
global_catpath() to decide whether to drop privileges.
* src/mandb.c (main): Likewise. Unify common code for system and
user catpaths.
* src/man.c (make_roff_command): Check catpath even if
global_manpath is false.
(locate_page): Simplify slightly.
* src/security.c (get_man_owner): New function: gets and caches the
password entry structure for MAN_OWNER.
* src/man.c (commit_tmp_cat): If running as root, chown created cat
pages to MAN_OWNER.
Sun Jul 1 01:58:33 BST 2001 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (splitline): Don't initialize the pointer
field here; instead, control it from ...
(test_manfile): ... here.
Change the logic for multiple name/description blocks again.
Remove misguided special-casing of the first name in a block. Set
the id field more carefully, depending on string equality instead
of ordering. Avoid scribbling over lg.whatis when a later
splitline() needs it. Don't call splitline() if whatis parsing
failed.
* src/check_mandirs.c (purge_normal): New function, factored out
from purge_missing().
(purge_whatis): New function to decide whether to purge a
WHATIS_MAN entry.
(purge_missing): Use both of these.
(testmandirs): purge_whatis() sometimes needs to ensure a
hierarchy is rescanned. Honour this.
Improve indentation levels.
* src/mandb.c (main): Reset force_rescan before each purge.
* src/lexgrog.l: Treat '..' as a no-op request.
Sun Jul 1 01:38:13 BST 2001 Colin Watson <cjwatson@debian.org>
* manual/misc.me (Modes of operation): Mention new requirement to
use --update to update databases.
mandb knows how to delete old entries now, so remove a sentence
saying it can't.
* src/man.c: More in the quest for sane indentation levels.
* man/man1/apropos.man1: Textual cleanups.
* man/man1/man.man1: Likewise.
* man/man1/manpath.man1: Likewise.
* man/man1/whatis.man1: Likewise.
* man/man1/zsoelim.man1: Likewise.
* man/man5/manpath.man5: Likewise.
* man/man8/accessdb.man8: Likewise.
* man/man8/catman.man8: Likewise.
* man-db.lsm: Reformatted as per the LSM.README.
Thu Jun 28 22:52:04 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (try_db_section): Downgrade whatis refs warning to a
debugging message, as it's rather noisy for a stable release.
Thu Jun 28 22:38:41 BST 2001 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (gripe_rwopen_failed): New function.
(testmandirs): Use it.
(purge_missing): New function to purge database entries whose
associated manual pages have been deleted.
* src/check_mandirs.h: Prototype purge_missing().
* src/mandb.c (main): New --no-purge option. Unless it is used,
purge_missing() is called on each database before calling mandb().
Don't call straycats() until after the temporary database has been
moved to its permanent location. Make sure all cleanup code is
called with dropped privileges.
Add statistics message for purged entries, and separate messages
for the benefit of translations.
When --test is given, only assume --quiet if --debug wasn't given.
(usage): Describe --no-purge.
* src/man.c: Move extension's storage to ...
* src/globbing.c: ... here.
(look_for_file): Constify string arguments.
* src/man.h: Move prototype of look_for_file() to ...
* src/globbing.h: ... here (new file).
* src/manp.c (pathappend): Only append the new element(s) if any
were left after removing duplicates.
(read_config_file): Make sure what we free was actually allocated.
* src/Makefile.in (mandb): Link with globbing.o.
* man/man8/mandb.man8 (OPTIONS): Document --no-purge.
General textual cleanup.
* src/accessdb.c (main): Move content into a tighter scope.
* src/security.c (drop_effective_privs): Style nit.
Thu Jun 28 13:28:13 BST 2001 Colin Watson <cjwatson@debian.org>
* man/man1/man.man1 (ENVIRONMENT): Document $MANWIDTH.
Thu Jun 28 13:15:04 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (store_line_length, get_roff_line_length): New
functions, adapted from Andries Brouwer's man.
(main): Outside catman mode, find out and store the line length.
(make_roff_command): Outside catman mode, retrieve the stored line
length and feed a .ll request into the pipeline if it's
non-standard. We let recent groff handle the page length.
(display): Don't even consider saving the cat page if save_cat is
already false.
(get_preprocessors): If the database says no preprocessors are to
be used, it's OK to save the cat page.
Thu Jun 28 01:44:02 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man_db.conf.in (SECTION): Remove guarantee that ties will be
broken in lexical order within sections. It's rather complicated
to be sure of that right now, and it should rarely matter.
* docs/ToDo: lexgrog learnt how to detect preprocessors ages ago.
Thu Jun 28 01:02:32 BST 2001 Colin Watson <cjwatson@debian.org>
* src/manp.c (gripe_stat_file): Downgrade the warning if a manpath
element doesn't exist to a debugging message (affects people
without a /usr/local/share/man, for example).
(read_config_file): Additional debugging message. Free home if it
gets allocated.
Thu Jun 28 00:35:09 BST 2001 Colin Watson <cjwatson@debian.org>
The caching cleanup I've been promising for weeks. Here be dragons.
* src/man.c (man): Only update database caches if --update is given.
(main): --all no longer implies a database update (you can always
use --all --update if you need that).
* man/man1/man.man1 (OVERVIEW): It's no longer necessarily man's job
to keep the caches up to date; use --update to get that.
(DEFAULTS): Likewise. Some rationale. Mention globbing fallback.
(OPTIONS/--local-file): Fix typo.
(OPTIONS/--update): New description. Only useful with setuid man.
* manual/misc.me (Modes of operation): man will only update database
entries if the --update flag is used.
Tue Jun 26 22:10:07 BST 2001 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: More cleanup. No substantive changes.
* include/manconfig.h.in: Likewise. Also bring xrealloc() prototype
into sync.
* src/mandb.c (main): Allow root as well as MAN_OWNER to work on
system manpaths.
Tue Jun 26 03:45:01 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man_db.conf.in (SECTION): Add a little more advice about where
to list sections with extensions.
* src/manp.c (add_to_dirlist): Add SECTIONS as an alias for SECTION,
since I keep getting it wrong and I came up with it in the first
place. Both make sense in different situations.
* src/check_mandirs.c (splitline): Trim trailing spaces off names
and descriptions. If the given base_name contains a comma, only
use the part of the name before it as the target for pointers.
* src/whatis.c (get_whatis): Unroll recursion into a finite loop to
avoid infinite recursion if the database contains a pointer loop.
Add the page name as an argument so that a warning can be printed.
(display): Pass the new argument to get_whatis().
(apropos): Recommend 'mandb --create' rather than plain 'mandb' if
the database gets corrupted.
* src/lexgrog.l: Ignore no-op groff requests (e.g. '.').
New variable, fill_mode. Reset it when .nf is encountered, set it
when .fi is encountered.
(newline_found): If fill_mode is set, add 0x11 instead of a space.
Mon Jun 25 02:55:36 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Describe recent changes. Add dates of old releases.
* include/manconfig.h.in: Move check_mandirs.c prototypes to ...
* src/check_mandirs.h: ... here (new file).
* src/man.c: Include check_mandirs.h.
* src/mandb.c: Likewise.
* src/man.h (make_filename): Move prototype to check_mandirs.h.
* src/check_mandirs.c (test_manfile): Split parsing of file names
into mandata structures into a new function ...
(filename_info): ... this.
(test_manfile): Calculate length of file name minus compression
extension separately from the parsing, and do so whether COMP_SRC
is defined or not.
* src/man.c (try_section): Use filename_info() to find out if the
section of a glob-located file is different from the current
section and is mentioned elsewhere in the configuration file. If
so, ignore that file in the current section.
Mon Jun 25 01:30:24 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (man_getopt): Conditionalize gxditview initialization on
TROFF_IS_GROFF. As a bonus, this squashes a compiler warning.
(man): Remove some unreferenced cruft, while I'm in the process of
fixing up multi-character sections.
* src/Makefile.in: Build intermediate man.o and mandb.o objects, so
that changing other objects just requires a relink.
* src/globbing.c (look_for_file): Print the layout in debugging mode
only when it's first parsed.
Sun Jun 24 18:47:20 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in (--with-db): Improve help output formatting.
* manual/intro.me (Arguments to configure): Document
--enable-mandirs.
* README: Update.
* manual/Makefile ($(manual).html): Improve grohtml invocation.
(realclean): Remove generated .png files.
Sun Jun 24 17:22:53 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (try_section): Break if a page has been found and --all
wasn't given.
(try_db): Print extension in debug mode. Compare against requested
section if the extension is a section in its own right, to avoid
duplication.
* src/man_db.conf.in: It's SECTION, not SECTIONS.
* configure.in: --enable-mandirs=OS defines how the manual page
hierarchy is laid out (GNU, HPUX, Solaris, IRIX). If unset,
globbing behaves as before.
* acconfig.h: Add MANDIR_LAYOUT.
* src/globbing.c (parse_layout): New function.
(look_for_file): Associate each glob with a layout.
* configure.in: Don't check for off_t (only used by gettext).
Sat Jun 23 15:23:14 BST 2001 Colin Phipps <cph@cph.demon.co.uk>
* zsoelim/zsoelim.l (open_file): Supply a format string to error().
Sat Jun 23 15:15:41 BST 2001 Colin Watson <cjwatson@debian.org>
* ult_src.c (ult_src): Restore the original mantree to the start of
basename before calling test_for_include(), in case ult_softlink()
went outside the mantree.
(ult_softlink): Make debugging message print the absolute path.
Tue Jun 19 02:33:40 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (man): Allow sections to be more than one character, and
trim them for use in directory names.
* src/manp.c (read_config_file): Read ~/.manpath first, as entries
are added the other way around now.
Mon Jun 18 18:55:39 BST 2001 Colin Watson <cjwatson@debian.org>
* src/manp.c (add_sections, get_sections): New functions.
(add_to_dirlist): Recognize new SECTIONS directive.
* src/manp.h (iterate_catlist, start_iterator): Remove (not used).
(get_sections): New prototype.
* src/man.c (get_section_list): Use get_sections() instead of
std_sections if it returns a non-empty list.
* src/man_db.conf.in: Add documentation of SECTIONS, and a default
line. The documentation is still inaccurate (extensions don't work
well yet).
* include/manconfig.h.in (STD_SECTIONS): Reduce to only
single-character sections; the rest will be set in the
configuration file.
* src/manp.c (add_to_list): Add to the tail rather than the head
(needed for SECTIONS, probably makes other things more intuitive).
(read_config_file): Restore print_list() in debug mode.
* src/check_mandirs.c: Add copyright notice and change information.
* src/lexgrog.l: Likewise.
* src/man.c: Likewise.
* src/mandb.c: Likewise.
* src/compression.c (get_ztemp): Remove redundant test.
* src/man.c (get_preprocessors_from_file): Change an = to ==.
* src/wrapper.c (main): Cosmetic improvements.
Sat Jun 16 19:22:51 BST 2001 Colin Watson <cjwatson@debian.org>
* src/straycats.c (check_for_stray): Check that
canonicalize_file_name() succeeded, not that it failed. (I'm
pretty sure that this is the last instance of this now.)
Sat Jun 16 18:30:09 BST 2001 Colin Watson <cjwatson@debian.org>
* libdb/db_store.c: Move id-favouring logic to a macro. If
FAVOUR_STRAYCATS is set, make sure a WHATIS_MAN entry won't
inadvertently replace a STRAY_CAT.
* configure.in: Don't strip binaries in LDFLAGS (GNU standards).
* src/check_mandirs.c (testmandirs): Check that opendir() succeeded,
not that it failed!
(testmandirs): Instead of initializing info.pointer here,
initialize it ...
(splitline): ... here.
(testmandirs): Shuffle whatis logic some more, to make sure pages
that really are in the filesystem don't end up as WHATIS_MAN. This
reverts part of the change of 26 May 2001.
* man/man8/mandb.man8: Document the expected format of NAME sections
for whatis parsing, and some common reasons why parsing fails.
Tue Jun 12 22:20:17 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/NEWS: More 2.3.19 stuff.
Sun Jun 10 14:05:10 BST 2001 Gordon Sadler <gbsadler1@lcisp.com>
* man/man1/manpath.man1 (ENVIRONMENT): Replace 'semicolon' with
'colon' throughout.
Sun Jun 10 13:59:04 BST 2001 Colin Watson <cjwatson@debian.org>
* src/manp.c (pathappend): Fix infinite loop when adding a manpath
entry which is a substring of an existing entry.
Sun Jun 10 13:49:02 BST 2001 Colin Watson <cjwatson@debian.org>
* src/check_mandirs.c (testmandirs): Treat EROFS like EACCES while
opening a database read-write (i.e. only print debug messages).
(create_db): Likewise.
src/man.c (open_cat_stream): Likewise.
(try_db_section): Likewise.
* src/straycats.c (check_for_stray): Carry on gracefully rather than
exiting if a straycat filter fails.
* src/manp.c (pathappend): Remove duplicate entries.
* src/lexgrog.l: Allow .LP, .PP, and .P as well as .br between
whatis definitions.
Sat Jun 2 14:34:59 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Give our English man pages the same date format as
the other locales.
* src/straycats.c: Use 'col -bx' rather than 'col-bx'.
Mon May 28 14:56:35 BST 2001 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in: Since it isn't sensible to define debug
(-d options at run-time do just as well), remove the commented
definition.
* include/manconfig.h.in, src/catman.c, src/check_mandirs.c,
src/compression.c, src/man.c, src/mandb.c, src/manpath.c,
src/whatis.c: Remove instances of '#ifndef debug'.
* src/util.c: debug is already declared extern in manconfig.h.
Mon May 28 14:30:38 BST 2001 Colin Watson <cjwatson@debian.org>
* tools/README: Describe chconfig and install-manpage.
* man/man5/manpath.man5, docs/ToDo: Document the DEFINE directive.
* libdb/db_delete.c, libdb/db_lookup.c, libdb/db_store.c,
src/whatis.c: Remove redundant strtok() declaration.
* src/check_mandirs.c: Declare strpbrk().
* src/*: Global style cleanup. Sorry about the large diff, but it
had to happen sometime: I can't stick with the prevailing coding
style when there are several to choose from! No meaningful code
change, although I disentangled a few assignments from if
conditions and rearranged a few other sections.
* po/*: Update accordingly.
Sun May 27 18:32:41 BST 2001 Colin Watson <cjwatson@debian.org>
* acinclude.m4 (MAN_CHECK_BDB): New macro to check for Berkeley DB.
* configure.in: Use it.
* src/check_mandirs.c (test_manfile): Be more accurate about finding
the " - " at the end of a series of whatis names, and make sure to
skip commas between them. Add more commentary.
* src/man.c (open_cat_stream): Return NULL if the cat page is
unwriteable, rather than wasting time compressing to /dev/null.
(format_display_and_save): Give up if both outing and saving
become false.
Sun May 27 18:00:00 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/NEWS: Preliminary entries for 2.3.19. Add current version
number throughout as well as just "Major changes since ...".
* manual/misc.me (Modes of operation): mandb doesn't necessarily
have to be rerun any more, as the filesystem will be checked if
the database doesn't return anything. man and mandb can be built
for setuid operation but installed non-setuid now.
Sat May 26 15:33:37 BST 2001 Colin Watson <cjwatson@debian.org>
* manual/README: Note that HTML output is disabled by default. I
don't currently provide a pre-built PostScript manual anywhere.
* manual/misc.me (Credits): Add Fabrizio.
* manual/*: FHS updates. Various boring typo/syntax/whitespace
fixes.
Sat May 26 15:14:29 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in, autogen.sh: Put 'timestamp' in stamp-h and
stamp-h.in rather than the date.
* src/man.c (open_cat_stream): Open the cat file before forking in
order to deal with errors better. Open to /dev/null without
complaining if the cat file is unwriteable.
(close_cat_stream): Only commit the temporary cat if it was
created.
(locate_page): Fall back to the filesystem if nothing was found in
the database (since it might be out of date).
* src/man.c (try_db_section): If the database can't be opened
read-write due to EACCES, only print a message in debug mode.
* src/check_mandirs.c (testmandirs): Likewise.
(create_db): Likewise.
* src/check_mandirs.c (test_manfile): Make sure separate whatis keys
each get their own whatis entry.
Wed May 23 17:06:31 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Fix PACKAGE and VERSION substitutions.
Wed May 23 15:51:06 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Updates for autoconf 2.50.
(AC_PREREQ): Require version 2.1.2.
(AC_INIT): Avoid deprecated use with one argument.
(man_ac_version): Don't work out the autoconf version any more;
inline syntax is all that needed it, and any autoconf since 2.1.2
will do.
(AC_STDC_HEADERS): Now AC_HEADER_STDC.
(AC_LINK_FILES): No longer needed with newer gettext.
(AC_OUTPUT): Avoid deprecated use with arguments.
Fix instances of underquoting throughout, as the new autoconf is
less tolerant of this.
* include/manconfig.h.in: Remove compatibility code for pre-1995
autoconf versions.
Thu May 17 19:11:37 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man_db.conf.in: Improve documentation of MANDB_MAP.
Wed May 16 00:09:13 BST 2001 Colin Watson <cjwatson@debian.org>
* tools/config.sub: Update to today's CVS.
Wed May 16 00:07:04 BST 2001 Colin Watson <cjwatson@debian.org>
* A number of minor fixes from SuSE's diff:
* GNUmakefile.in: Don't prepend ../ to prefix before passing it to
subdirs.
* lib/cleanup.c: HUP and TERM signal handling was mistakenly acting
on INT instead.
* src/lexgrog.l: Replace a few instances of " \t\n" with
"blank_eol".
* src/man.c: Drop privileges before changing back to the original
directory just before exiting (only matters for profiling).
* src/util.c: Undefine MAX before redefining it.
* po/POTFILES.in: Read src/lexgrog.c rather than src/lexgrog.l
(gettext understands C better than lex).
* po/de.po, po/es.po, po/fr.po: Remove a few stray '\r's.
* I'll look at the zlib bits of the patch soon. From a preliminary
look I'll probably end up rewriting it - I'd prefer more of the
compression stuff actually to go in src/compression.c.
Tue May 15 22:01:59 BST 2001 Colin Watson <cjwatson@debian.org>
* src/man.c (get_section_list): Return std_sections if argument to
-S was an empty string or if that or $MANSECT contained only
colons. Previously, man would behave wrongly in the former case
and segfault in the latter. Also remove a redundant xstrdup().
Mon May 14 23:46:25 BST 2001 Colin Watson <cjwatson@debian.org>
* Version: 2.3.18.
* README: Add contact details.
* libdb/stamp-h: Removed.
* GNUmakefile.in, libdb/Makefile.in: Updated accordingly.
* src/man_db.conf.in: FHS 2.1 has /usr/local/share/man as the
location of locally installed man pages rather than
/usr/local/man. Accordingly, the MANDB_MAP for /usr/local/man is
now /var/cache/man/oldlocal, and /usr/local/share/man takes over
/var/cache/man/local.
* po/cs.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ja.po: Update
with msgmerge.
Mon May 14 22:18:32 BST 2001 Colin Watson <cjwatson@debian.org>
* src/security.c: Count how many times drop_effective_privs() has
been called, and don't actually regain privileges until
regain_effective_privs() has been called an equal number of times.
This should flush out several subtle bugs.
* src/mandb.c: Call manpath() rather than read_config_file() (this
was changed while merging 2.3b12). Otherwise 'mandb --user-db'
segfaults as manp never gets set.
Sun May 13 18:34:33 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (dist): Don't install po/Makefile.in.
* src/stamp-h: Removed.
* GNUmakefile.in, src/Makefile.in: Updated accordingly.
* GNUmakefile.in (distclean): Don't clean configure, src/lexgrog.c,
zsoelim/zsoelim.c.
(realclean): Clean configure here instead. realclean targets in
subdirs already remove the other two.
* zsoelim/Makefile.in (clean): Let realclean remove zsoelim.c.
Sun May 13 17:17:32 BST 2001 Colin Watson <cjwatson@debian.org>
* man/Makefile.in: Another try to get NLS installation working
properly. The last change was wrong when LINGUAS was unset.
* GNUmakefile.in (dist): Install docs/manpage.example.
Sun May 13 16:54:01 BST 2001 Colin Watson <cjwatson@debian.org>
* man/Makefile.in: Exclude NLS directories without man pages, as CVS
can't delete directories quite as fully as I'd like.
* configure.in: No subdirectory Makefiles need ALL_LINGUAS any more.
* manual/Makefile: Make the location of soelim variable so that
distributions can e.g. use the version in the build directory.
* manual/Makefile, manual/README: Add an HTML target. Disabled by
default as groff's HTML driver doesn't produce very good output
yet (as of 1.16).
* include/Defines.in: Only remove /usr from the default sysconfdir
if the prefix is exactly /usr, not something that happens to
contain /usr (like the default /usr/local).
Sun May 13 13:39:17 BST 2001 Colin Watson <cjwatson@debian.org>
* man-db.gnu, man-db.lsm: Mention move to SourceForge and the new
URLs for the Debian package pool.
* man-db.gnu: New architectures (successful Debian ports as of
today). New mailing list for announcements.
Sun May 13 13:18:56 BST 2001 Colin Watson <cjwatson@debian.org>
* README: Document FHS changes; correct pointer to
docs/INSTALL.autoconf.
* docs/INSTALL.autoconf: Update to instructions from automake 1.4.
* docs/COPYING: Minor fixes from GNU (FSF address, Y2K).
Sun May 13 13:00:17 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (dist): Add include/sections.list.
* GNUmakefile.in, man/Makefile.in: Cause USE_NLS to be substituted
properly from configure.
* include/Defines.in: Remove some old gencat definitions.
* docs/NEWS: Update in preparation for 2.3.18 release. Correct a few
it's -> its typos in earlier entries.
Sun May 13 02:18:00 BST 2001 Colin Watson <cjwatson@debian.org>
* autogen.sh: Create stamp-h.in.
* po/cs.po, po/de.po, po/es.po, po/fr.po, po/it.po, po/ja.po: Update
with msgmerge.
Sun May 13 02:03:05 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/ToDo: Most of Wilf's beta code is in now; mention SuSE.
Sun May 13 01:22:29 BST 2001 Colin Watson <cjwatson@debian.org>
* docs/manpage.example: New file.
Sun May 13 01:19:47 BST 2001 Colin Watson <cjwatson@debian.org>
* include/manconfig.h.in: Bump database version from 2.3.1 to 2.3.2.
* libdb/db_ver.c (dbver_wr): Reformat.
(dbver_rd): Downgrade warnings about wrong version numbers to
debugging messages.
* libdb/db_lookup.c (split_data): Fix fencepost error that would
overlook a missing whatis field.
* src/man.c (try_db_section): Display warning if whatis refs are
relied upon to find a page.
* libdb/db_storage.h: Note that WHATIS_MAN and WHATIS_CAT are
deprecated.
* src/accessdb.c (main): Give FHS_CAT_ROOT priority over CAT_ROOT.
* man/man8/accessdb.man8 (DESCRIPTION): Document this.
* man/de_DE.85591/man8/accessdb.man8 (DESCRIPTION): Likewise.
* man/de_DE.ascii/man8/accessdb.man8 (DESCRIPTION): Likewise.
* man/es_ES.88591/man8/accessdb.man8 (DESCRIPTION): Likewise.
* man/it_IT.88591/man8/accessdb.man8 (DESCRIZIONE): Likewise.
* src/check_mandirs.c (testmandirs): Tidy up database opening code.
* src/mandb.c (mandb): Don't create a new database if opt_test is
set.
(main): If opt_test is set, just delete the temporary database
rather than moving it into place.
* man/man8/mandb.man8 (OPTIONS): Document --test.
(FILES): Document FHS compliant database locations.
(AUTHOR): Add myself.
* src/ult_src.c (ult_softlink): Remove overly-cautious check for
non-local symlinks in mantrees.
* src/whatis.c (apropos): Remove a now redundant test that cont.dptr
is non-NULL.
Sun May 13 01:00:47 BST 2001 Colin Watson <cjwatson@debian.org>
* src/whatis.c (apropos): Complain and exit if a data pointer is
NULL. For this, locally undefine BTREE to avoid using optimized
functions, as they don't appear to provide enough error checking
yet.
Fri May 4 03:59:08 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in: Change PACKAGE from man-db to man_db.
* po/*.po: Update with msgmerge.
* release.sh: New file (quick release script).
Fri May 4 03:44:49 BST 2001 Colin Watson <cjwatson@debian.org>
* acconfig.h: Remove Debian-specific entries.
* aclocal.m4: Remove, as it's another autogenerated file.
* autogen.sh: New file (very simple for now).
Fri May 4 03:34:54 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in (dist): Update set of installed files somewhat. No
need to build man_db-nls.h any more.
* man/Makefile.in: Declare ALL_LINGUAS and LINGUAS.
* src/man.sh: Remove (obsoleted by src/wrapper.c).
Fri May 4 02:56:30 BST 2001 Colin Watson <cjwatson@debian.org>
* README: Update for new NLS configuration methods. Reflect renaming
of configuration file from man_db.config to man_db.conf.
Fri May 4 00:18:23 BST 2001 Colin Watson <cjwatson@debian.org>
* stamp-h.in: Remove (generated by GNUmakefile).
Fri May 4 00:17:50 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in, configure.in, include/Defines.in,
libdb/Makefile.in, libdb/db_delete.c, libdb/db_lookup.c,
libdb/db_store.c, libdb/db_ver.c, man/Makefile.in,
src/Makefile.in, src/lexgrog.l-2.3.8, src/lexgrog.l-2.4a,
src/wrapper.c: Dispose of all the old catgets stuff. Replace with
gettext idioms where appropriate.
* libdb/man_db-nls.h, src/man_db-nls.h: Remove (obsolete with
gettext).
* include/config.h.in: Remove (generated by autoheader).
Thu May 3 01:17:08 BST 2001 Colin Watson <cjwatson@debian.org>
* GNUmakefile.in: Strip .po from language names; fix it's -> its
typo.
* configure.in: Stop trying to guess the package name and version
number from the current directory name.
Wed May 2 18:38:49 BST 2001 Colin Watson <cjwatson@debian.org>
* src/manp.c: Remove #include of security.h (now merged elsewhere).
(pathappend): Constify second argument.
(mkcatdirs): Eliminate DIRLIST; now takes mandir and catdir as
arguments.
(add_2_dirlist): Rename to add_to_dirlist(); return void, and
otherwise eliminate use of DIRLIST. As mentioned below, we now use
a linked list instead.
(read_config_file): Update accordingly.
* src/security.c: *uid no longer static for now, as other objects
use them.
* src/man.c: Declare ruid and euid extern here now that security.h
is gone.
* src/check_mandirs.c (update_db): Close dbf rather than database.
Wed May 2 17:27:22 BST 2001 Colin Watson <cjwatson@debian.org>
* acinclude.m4: New file. Restore definitions inadvertently removed
from aclocal.m4 a few changes ago.
* aclocal.m4: Update accordingly with 'aclocal'.
* config.guess, config.sub: Move to tools directory.
* configure.in: Move gettext macros below AC_PROG_CC etc.
* configure.in: Remove Debian-specific code; build dependencies
handle this now.
Wed May 2 16:41:28 BST 2001 Colin Watson <cjwatson@debian.org>
* acconfig.h: Removed some definitions gettext used to need.
* Makefile.in (_root): Added ABOUT-NLS to the distribution.
Wed May 2 16:31:21 BST 2001 Colin Watson <cjwatson@debian.org>
* config.guess, config.sub: New files, synced from today's CVS.
Wed May 2 16:28:02 BST 2001 Colin Watson <cjwatson@debian.org>
* configure.in, include/Defines.in, man/Makefile.in: Remove use of
curdate.
* man/it_IT.88591/man1/man.man1, man/ja_JP.eucJP/man1/man.man1,
man/man1/man.man1: s/curdate/date/g.
Wed May 2 16:15:00 BST 2001 Colin Watson <cjwatson@debian.org>
* po/POTFILES.in: Added src/accessdb.c and src/wrapper.c.
Wed May 2 15:53:45 BST 2001 Colin Watson <cjwatson@debian.org>
* ABOUT-NLS, aclocal.m4, intl/*, po/ChangeLog, po/Makefile.in.in:
Update to gettext 0.10.37 (from 0.10.32). Various additions and
removals.
* GNUmakefile.in, libdb/Makefile.in, src/Makefile.in: Remove old
gencat/xcat targets.
Wed May 2 01:33:04 BST 2001 Colin Watson <cjwatson@debian.org>
* src/mandb.c (main): Initialize security properly, since we may be
setuid, and drop privileges when creating temporary databases in
user-supplied hierarchies. Thanks to Ethan Benson for reporting
this vulnerability.
* man-db.gnu, man-db.lsm: Add myself as a developer; change
maintainer.
* libdb/db_lookup.c, src/man.c: Cosmetic fixes.
* src/accessdb.c (usage): Remove spurious space in output.
Wed May 2 01:02:19 BST 2001 Colin Watson <cjwatson@debian.org>
* Merging in changes from Wilf's 2.3b12 beta release.
* docs/ChangeLog: Folded in changelog comments.
* GNUmakefile.in, configure.in: Build configuration file.
* */Makefile.in: Rearrange code for CPPFLAGS and similar.
* configure.in: Look for grep, seteuid(), setresuid().
* include/config.h.in: Add HAVE_SETEUID and HAVE_SETRESUID.
* include/manconfig.h.in: Add GREP and various grep flags.
* src/whatis.c: Use GREP rather than "grep".
* src/man_db.config: Renamed to src/man_db.conf.in.
* src/man_db.conf.in: Add commented out DEFINE directives.
* docs/ToDo: Need to document DEFINE directive. (Also, I (cjwatson)
checked in two other todo items by mistake earlier: inline
pipelines and merging work done by Wilf and Andries.)
* include/Defines.in: CPPFLAGS tweaks; rename config file; %.i rule.
* include/comp_src.h.in: paths.h -> ./manconfig.h.
* src/security.c, src/man.c: Rewrite seteuid() handling; remove
special "running as root" case.
* src/security.h: Remove; combine previous contents with security.c.
* src/man_db-nls.h: No longer need man_CHOWN.
* include/manconfig.h.in: Add init_security() prototype.
* src/manp.c: Major rewrite. Replace static storage with linked
list. Improve configuration file handling, replacing get_dirlist()
with read_config_file(). Move some of the more deeply nested bits
of read_config_file() into separate functions like
add_mandb_map(). (cjwatson: This won't compile yet. Fabrizio also
hacked on this heavily, including splitting part of get_dirlist()
out into add_2_dirlist() and adding mkcatdirs(). I've merged these
as best I can for now, but it's still unfinished.)
* src/manp.h: Remove get_dirlist() prototype, add prototypes for
read_config_file() and get_def().
* src/man.c, src/mandb.c, src/straycats.c, src/whatis.c: Use new
get_defs() functions to pull paths from config file rather than
hard-coding them.
Fri Apr 27 22:39:34 BST 2001 Colin Watson <cjwatson@debian.org>
* Merging in changes from Wilf's 2.3.11 release.
* docs/ChangeLog, docs/NEWS: Folded in changelog comments.
* GNUmakefile.in: Added deroff and manual targets.
* README: Added comment about manual; added notes on configure
flags.
* configure.in: Minor improvement for non-GNU makes.
* src/lexgrog.l, src/lexgrog.l-2.4a: Allow comments other than at
the beginning of a line.
* src/manp.c: Replace has_subdirs() with has_mandir(): for $PATH
components not in config, check for ../man as well as man subdirs.
* zsoelim/zsoelim.l: Use #defines for exit codes.
* GNUmakefile.in, README, docs/INSTALL.quick, src/man.c: Cosmetic
rearrangements (whitespace, typos, etc.).
Fri Apr 27 21:36:11 BST 2001 Colin Watson <cjwatson@debian.org>
* manual/*: Add the source code for the man_db manual from Wilf's
FTP site.
Fri Apr 27 18:33:17 BST 2001 Colin Watson <cjwatson@debian.org>
* src/accessdb.c (main): Close the database and set dbf to NULL if
dbver_rd() fails.
* src/check_mandirs.c (update_db): Likewise.
* src/man.c (try_db): Likewise.
* src/straycats.c (straycats): Likewise.
* src/whatis.c (search): Likewise.
Fri Apr 27 18:10:47 BST 2001 Colin Watson <cjwatson@debian.org>
* src/lexgrog.l: Detect grap (.G1) and vgrind (.vS).
* include/manconfig.h.in: Add GRAP_FILTER and VGRIND_FILTER to
filter enum.
Fri Apr 27 18:00:04 BST 2001 Colin Watson <cjwatson@debian.org>
* New maintainer.
* man/man1/man.man1 (HISTORY): Update some dates, add myself.
* man/it_IT.88591/man1/man.man1 (HISTORY): Likewise.
* man/ja_JP.eucJP/man1/man.man1 (HISTORY): Likewise.
* man/de_DE.88591/man1/man.man1 (HISTORY): Update some dates.
* man/de_DE.ascii/man1/man.man1 (HISTORY): Likewise.
* man/es_ES.88591/man1/man.man1 (HISTORY): Likewise.
* ja_JP.ujis/man1/apropos.man1: Remove (superseded by ja_JP.eucJP).
* ja_JP.ujis/man1/man.man1: Likewise.
* ja_JP.ujis/man1/manpath.man1: Likewise.
* ja_JP.ujis/man1/whatis.man1: Likewise.
* ja_JP.ujis/man1/zsoelim.man1: Likewise.
* ja_JP.ujis/man5/manpath.man5: Likewise.
* ja_JP.ujis/man8/accessdb.man8: Likewise.
* ja_JP.ujis/man8/catman.man8: Likewise.
* ja_JP.ujis/man8/mandb.man8: Likewise.
Tue Apr 17 15:23:30 BST 2001 Colin Watson <cjwatson@debian.org>
* End of the Great CVS Sync.
* Debian release 2.3.17.1-3.
* src/ult_src.c (ult_src): Return an error when ult_softlink()
fails.
* src/man.c: Use latin1 character set for C and POSIX locales.
* po/ja.po: Update Japanese translation.
* man/ja_JP.eucJP/man1/apropos.man1: New file, updating Japanese
translation in new character set.
* man/ja_JP.eucJP/man1/man.man1: Likewise.
* man/ja_JP.eucJP/man1/manpath.man1: Likewise.
* man/ja_JP.eucJP/man1/whatis.man1: Likewise.
* man/ja_JP.eucJP/man1/zsoelim.man1: Likewise.
* man/ja_JP.eucJP/man5/manpath.man5: Likewise.
* man/ja_JP.eucJP/man8/accessdb.man8: Likewise.
* man/ja_JP.eucJP/man8/catman.man8: Likewise.
* man/ja_JP.eucJP/man8/mandb.man8: Likewise.
* man/THANKS: Updated (new Japanese eucJP translation).
* src/man.c (main): Support LC_MESSAGES being set differently from
other locale categories (internal_locale).
* src/man.c (main): Multiple locale preferences can be set with
$LANGUAGE.
* src/version.c (ver): Remove previous maintainer address.
* configure.in: Find version number correctly.
Sun Apr 1 14:37:28 BST 2001 Colin Watson <cjwatson@debian.org>
* Debian release 2.3.17.1-2.
* src/whatis.c (main): Disable regex searches if -w (wildcard)
option is given.
* docs/ToDo: Using zlib rather than gzip would be good.
Sat Mar 31 18:07:46 BST 2001 Colin Watson <cjwatson@debian.org>
* Debian release 2.3.17.1-1.
* src/check_mandirs.c (test_manfile): Check if the result of symlink
and hard link resolution is in the cache before looking for .so
links. This provides a substantial speedup when many symlinks
exist in the mantree.
* src/catman.c (main): Initialize full locale by calling setlocale()
with LC_ALL rather than LC_MESSAGES (GOTO Masanori). Remove manual
getenv() calls accordingly.
* src/man.c (main): Likewise.
* src/mandb.c (main): Likewise.
* src/manpath.c (main): Likewise.
* src/whatis.c (main): Likewise.
* include/manconfig.h.in: Add 3perl to section names, following 3pm;
Debian is using this to allow other packages to shadow pages from
core Perl packages.
Wed Feb 28 21:02:41 GMT 2001 Colin Watson <cjwatson@debian.org>
* Debian release 2.3.17-3.2.
* configure.in: More fixes for Debian troff and /dev/null input
files. This restores detection of -mandoc macros.
* man/man1/man.man1 (OPTIONS): Typo: "It's" -> "Its".
* man/man1/zsoelim.man1 (OPTIONS): Likewise.
* man/man1/man.man1 (OPTIONS): Mention that argument to -M must be
the root of a mantree.
(SEE ALSO): Add reference to man-db manual to explain the above.
Wed Feb 21 00:54:47 GMT 2001 Colin Watson <cjwatson@debian.org>
* Debian release 2.3.17-3.1.
* src/man.c (local_man_loop): Fix format string vulnerability in
printing of error message.
* src/whatis.c (get_whatis): Fix segfault if whatis reference is
NULL.
* src/man.c (local_man_loop): chdir() to original working directory
so that 'man -l' works again on relative paths to compressed
pages.
* src/compression.c (decompress): free() file if the decompressor
failed so that atexit() doesn't try to remove it again.
* src/mandb.c (main): Reverse sense of -s option to agree with the
documented intent.
* configure.in: Work around change in the behaviour of Debian nroff,
which no longer accepts /dev/null as an input file.
* GNUmakefile.in: Restore full clean rules.
Fri Apr 7 10:50:45 EET 2000 fab (fpolacco@debian.org)
* Checked in by Colin Watson during SourceForge CVS sync.
* Upstream changes from Debian changelog (2.3.17-2):
- Commented away call to distclean_root in GNUmakefile: need to
leave the Makefile and configure in the tarball.
- Found and fixed subtle bug which made wrapper uselessly linked
with -ldb2. When invoked by root on a system which enables
group.db, then the call to initgroups() segfaults due to the
libc link to libdb!
* Other changes not mentioned in Debian changelog:
- man-db.gnu: Update date and prerequisites (libdb2 becomes weak
prerequisite).
- man-db.lsm: New file.
- src/lexgrog.l: Cosmetic changes.
- src/wrapper.c: Add debugging code.
Fri Apr 7 10:50:45 EET 2000 fab (fpolacco@debian.org)
* Checked in by Colin Watson during SourceForge CVS sync.
* Version: 2.3.17.
* Upstream changes from Debian changelog:
- Corrected apparent disappearing of option -e in apropos.
- Corrected wrong usage of undocumented option -X which produced
error when passed to filters. This is now parametrized as
optional argument, defaulting to use devX75. Documented in
usage : -X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12.
- Applyed patch submitted by Tomohiro KUBOTA:
- roff_device and LESSCHARSET are determined by user environment
rather than language of manpage for English manpage.
- roff_device "ascii8" is used for non-English/non-ISO-8859-1
languages.
- Added new check for libdb in configure.in
- Added /usr/local/{share/}man to config file, due to bug in FHS,
thanx to Gregor Hoffleit.
- Added new message catalog po file for cs (czech) (4 new
messages), thanx to Vladimir Michl.
- tired of people continously complaining that man behaves
differently than in RedHat (which is "The Reference Linux", you
all know that), I'll add tbl as default filter for man. This
will fix those three or four manpages that do not take the
burden to declare their dependency on the tbl formatter (usually
because upstream uses RedHat and so ...). Now what would I do if
someone fill a bug against this because of wasting of CPU cicles
for un-necessary filtering on the hundreds of pages that do not
need tbl? I would certainly agree with them. Therefore I will
fix this introducing scanning of manpages a la grog in mandb,
and storing the result in the database. ...[noise of hacking
and debugging]... Well, I did it (use accessdb to see it!). It
took 4 weekend (stolen to the implementation of man 2.4) to
complete and debug. Now you can announce the world that man-db
2.3.17 knows in advance which filters to run when processing a
manpage which is in the database.
Wed Mar 22 16:00:16 EET 2000 fab (fpolacco@debian.org)
* Checked in by Colin Watson during SourceForge CVS sync.
* Version: 2.3.16.
* Upstream changes from Debian changelog:
- Applyed patch submitted by Javier Fernandez-Sanguino Pena to
permit search of trnlated manpages before giving the first
english one found.
Mon Feb 28 22:09:09 EET 2000 fab (fpolacco@debian.org)
* Checked in by Colin Watson during SourceForge CVS sync.
* Version: 2.3.13.
* Upstream changes from Debian changelog:
- Applied patch to avoid disappearing of index file during
regeneration. Thanx to Colin Phipps.
- Applied patch to generate secure temporary file in straycat.
Thanx to Colin Phipps.
Wed Feb 23 22:34:54 EET 2000 fab (fpolacco@debian.org)
* Version: 2.3.12
* New maintainer.
* find the huge list of changes (in three years) in file
debian/changelog.
Wed Sep 27 23:59:05 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3b12
* src/manp.c: replace static storage with linked list
* src/security.h: removed/combined with security.c
* src/security.c, src/man.c: re-write seteuid() handling:
remove special "running as root" case
* src/whatis.c: use GREP rather than "grep"
* include/manconfig.h: many #DEFINE additions
* configure.in: look for grep, seteuid(), setresuid()
* GNUmakefile.in, */Makefile.in: minor modifications
* include/Defines.in: modifications
* src/man_db.config: renamed as src/man_db.conf.in
* src/man_db.conf.in: add commented out DEFINE directives.
Thu Sep 21 19:33:58 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.11
* manual/*: bundle the source code of the man_db manual
Wed Sep 20 16:17:19 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/manp.c: replace has_subdirs() with has_mandir(): for $PATH
components not in config, check for ../man as well as man subdirs.
* various: small bug-fixes from Markus,
Joey (joey@infodrom.north.de), Lionel (cons@dxcern.cern.ch)
* src/util.c: when checking man/cat timestamps, compare mod time of
cat with latest of mod or create time of man: If untar new man
page with old timestamp, still reformat.
Thu Jul 13 11:29:32 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.10
* src/apropos.c: fix for #undef REGEX regarding int regex
* src/lexgrog.l: default to new version.
* src/README.lexgrog: new.
* configure.in: all echo's through MAN_ECHO() for --quiet.
* various: apply patch from Carl Edman (cedman@princeton.edu),
port to NeXTstep and misc small fixes.
Fri Jun 16 11:12:08 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.9
Wed Jun 14 17:08:41 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c (make_display_command): fix command when ascii==1
* src/man.c (display): don't return 1 on skip if local_man_file==1
* man/Makefile.in: force make to resolve the program name strings
(which are sed commands) once only.
* configure.in: don't exec pager (too many side effects)
Sun Jun 4 13:51:22 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.8
* various: apply patch from CERN to allow globbed support for
HPUX, OSF and SOLARIS system manual page hierarchies.
* GNUmakefile.in: add hook for `make check'
Mon May 29 18:57:24 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/whatis.c (main): if $POSIXLY_CORRECT is in effect,
default to case-less extended regex searches for apropos
as specified by POSIX 1
* man/man1/apropos.man1: document above change.
* src/whatis.c (apropos, parse_name): ensure case-less
matching on manual page name aswell as it's whatis for apropos.
* all manual pages: replace instances of program with %program%
and arrange to do a sed replacement with the actual name of the
program, chosen by the installer.
* zsoelim/zsoelim.l: fix recursion detector.
* src/lexgrog.l (newline_found): new.
Mon May 22 20:07:17 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* nls/de_DE.88591/*.m: from Lars Fenneberg (li@gimli.comlink.de)
* src/Makefile, libdb/Makefile: fix -DNLS
* src/man.c (LESS_PROMPT): Make " Manual page" a translatable
message.
* man/de_DE.ISO_8859-1: rename as man/de_DE.88591
* nls/THANKS, man/THANKS: new.
* src/whatis.c: If $POSIXLY_CORRECT, force apropos to do extended
regex matching.
Sat May 20 12:27:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c: if -f or -k, simply execv() the program, passing
the entire argv[] to it.
* man/man1/man.man1: document change.
* src/whatis.c: ignore -f, --whatis, -k and --apropos
Sat May 13 18:10:50 BST 1995 Markus Armbruster
* Version: 2.3.7
* lib/cleanup.c (pop_all_cleanups): new
* src/man.c, src/security.c: use pop_all_cleanups() in children.
* general: use fork() instead of vfork() in situations where
vfork() could cause problems.
Tue May 9 23:30:58 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* manual pages: aesthetic/grammer changes.
* flex files: process with flex-2.5.2
Mon May 8 11:15:07 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* include/manconfig.h.in: #define some exit codes.
* all sources: use the codes.
* English manual pages: add EXIT STATUS section where
appropriate
* src/man.c (make_display_command): back out execing the pager
as PAGER does not have to be a simple program name.
* configure.in: prepend "exec " to the default pager.
* src/mandb.c: fix stupid bug where global databases remain
owned by the creator in all circumstances. Clean up.
* src/straycats.c, src/check_mandirs.c: homogenized and
re-worded messages emitted by mandb.
Mon May 8 11:15:07 BST 1995 Markus Armbruster
* lib/cleanup.c, lib/cleanup.h: new functions. Install
sighandler, initialise and operate a stack of cleanup funcs
callable on exit().
* src/mandb.c, src/man.c: modify to use cleanup functions.
Tue Apr 25 20:21:51 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.6
* src/whatis.c: new, replaced with edited version from 2.4 alpha
source tree. Apropos now does _real_ word matches.
* man/man1/apropos.man1: remove description of option -e.
Mon Apr 24 17:26:54 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c (get_section_list): Ignore empty $MANSECT.
* src/man.c (main): if (!*pager) pager = CAT;
* libdb/db_storage.h, include/manconfig.h.in, src/check_mandirs.c,
src/straycats.c: small modifications to fix broken
FAVOUR_STRAYCATS behaviour and properly handle situation when
STRAYCAT and WHATIS_CAT share namespace. Move definition of
FAVOUR_STRAYCATS to include/manconfig.h.in. From Zoltan.
* zsoelim/zsoelim.c: exit 1 on command line file open failure.
* src/man.c (man_getopt): consolidate incompatible option parsing.
* src/man.c (usage): update wrt. option parsing.
* src/man.c (display): only prompt/attempt display if found==1.
* src/man.c (make_display_command): exec the pager.
Fri Apr 21 15:16:59 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.5 (public release)
* src/whatis.c: fix a couple of problems caused by whatis/apropos
split.
* configure.in: remove determination of viable gencat program,
always use our own.
Wed Apr 19 09:53:27 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* GNUmakefile.in: renamed Makefile to differentiate between
GNU make and others.
* configure.in: create bogus ./makefile to catch non GNU make
programs.
Mon Apr 17 11:06:32 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.4
* src/man.c (format_display_and_save): don't save cat if
formatting process fails and/or produces nothing.
Sat Apr 8 18:02:52 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/mandb.c: change #ifdef SECURE_MAN_UID to
#if defined(SECURE_MAN_UID) && defined(MAN_DB_UPDATES) as the
databases should be owned by their creators if man is not
responsible for updating them.
* src/man.c: minor changes regarding MAN_DB_UPDATES
* include/manconfig.h.in: update CATMODE and DBMODE w.r.t.
recent MAN_DB_UPDATES/MAN_CATS definitions.
* src/mandb.c: changes to operation. Work on a temporary copy of
the database, then rename() to actual database. Catch SIGINT,
SIGTERM and remove the temp copy if necessary.
* src/compression.c (decompress): kill(getpid(), SIGINT) instead of
exit(0) if child (decompressing man page) fails.
* src/straycats.c (check_for_stray): kill(getpid(), SIGINT) instead of
exit(0) if child (decompressing cat page) fails.
* libdb/db_lookup.c (make_content): ndbm limit is 4k not 1k.
Mon Apr 3 20:52:06 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* docs/NEWS: new
* README: more Linux-system information.
* configure.in, acconfig.h: #define NDEBUG if !--enable-debug
* include/Defines.in: comment out @LEXLIB@, not required in link
stage.
Sun Apr 2 17:42:02 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3.3
* README: add sections referring to default preprocessors and
system specific notes.
* xcat/xcat.l, zsoelim,zsoelim.l, src/lexgrog.l: process with
flex-2.5.1
Fri Mar 31 17:12:44 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/whatis.c (display): add free(string)
* src/whatis.c, src/Makefile.in: produce separate object files for
apropos and whatis so that the programs know which one they are
regardless of actual program-filename.
* All Makefile.in, include/Defines.in: append CPPFLAGS supplied to
./configure or make to the standard $(CPPFLAGS) variable.
Allows configuring with unusual #include directories, eg.
CPPFLAGS=-I/usr/src/gdbm LDFLAGS=-L/usr/src/gdbm ./configure
* configure.in (--with-db=LIBRARY): override the default database
interface library on systems having a choice. Options={db,gdbm,ndbm}
* configure.in: Re: sec 5.6 of the autoconf manual, replace
(if test a=b -o a=c) with
(if test a=b || test a=c)
Tue Mar 28 16:44:46 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.3b2
* lib/flock.c, lib/flock.h: New. flock() wrapper to fcntl() for
systems that lack flock().
* xcat/xcat.l: #include "manconfig.h". For systems not supporting
__inline__
* include/Defines.in (%.d : %.c): modify rule to account for C
compilers other than gcc
* All Makefiles.in (cd $dir && $(MAKE)): change to $(MAKE) -C $dir
* nls/Makefile.sub.in: merge into nls/Makefile.in
Mon Mar 27 22:42:53 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/globbing.c (look_for_file): don't rely on GLOB_NOMATCH as
AIX doesn't have it.
* configure.in, include/manconfig.h.in (man_ac_version): new,
replaces ac_version and is more robust
* configure.in, aclocal.m4: rename non-autoconf macros so that
future versions of autoconf won't clash
* gencat/gencat.c, gencat/genlib.c: tidy up header includes and
remove unused variable definitions
* configure.in: check for gencat
Mon Mar 27 12:51:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.3b1
* src/man.c: small HAS_TROFF/NROFF_MISSING changes from Markus.
Thu Mar 23 18:09:46 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c: man will only _create_ user db's if
MAN_DB_CREATES is #defined (It is not defined by default)
* add ability to install programs/man pages with transformed names.
ie --program-prefix=PREFIX,
--program-suffix=SUFFIX and
--program-transform-name=EXP
arguments to configure are now observed.
* src/man.c (try_db): store an info->addr==NULL entry in the
hashtable if we fail to access this db. Only try to open the
db once. If the db access succeeds, but the lookup fails to find
anything, store info==NULL in the hashtable.
* libdb/db_ver.c (dbver_rd): don't die if wrong version. Issue a
message, return 1 and let the caller decide what to do.
Mon Mar 20 16:13:23 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/whatis.c (get_whatis): new. Use the pointer member of mandata
structure to access the whatis string.
(display): modify to use get_whatis().
* src/checkmandirs.c (splitline): don't store whatis referenced
`whatis' lines in the db.
* libdb/db_lookup.c (make_content): store a NULL whatis as "" rather
than "-".
Sun Mar 19 16:37:58 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/lexgrog.l: wipe out roff comment lines (again).
* src/whatis.c: use BSD style regex if POSIX unavailable. Ignore
--regex if neither available. Fix failed-regex-compilation error
message.
* lib/regex.c, lib/regex.h: remove
* configure.in: account for regex changes.
* libdb/db_delete.c (dbdelete): don't barf on delete request of a
multi-key that is not listed in the main key, return NO_ENTRY.
* src/man.c (try_section): don't try to delete db entry for missing
straycat. Return 0 and leave that to the caller.
Sat Mar 18 12:31:48 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Replaced strncasecmp() calls with strncmp(). Removed partial
support for man dirs named .../MAN.
* lib/{alloca.c,putenv.c,memcmp.c}: new
lib/{getopt.c,getopt1.c,getopt.h,error.c,xstrdup.c,xmalloc.c}:
newer replacements
* All Makefile.in, include/Defines.in, include/manconfig.h.in:
use standard (GNU coding) installation variables:
bindir, sysconfdir, man?ext, man?dir, localedir, manroot.
These variables, along with prefix and exec_prefix may be specified
on the `make' command line.
* configure.in: move definition of BINDIR and config_prefix to
include/Defines.in to allow dynamic evaluation. Rename config_prefix
to sysconfdir.
* libdb/db_lookup.c (list_extensions): fix return count.
* libdb/db_delete.c (dbdelete): take account of situation
where there were multiple name entries and they are subsequently
deleted. When deleting the last one (which still has a multi-key
entry), delete the standard key too, rather than recomputing it's
content (which would be nothing and cause a "corrupt db" message).
Fri Mar 17 23:36:44 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c (glob_for_file, make_names): remove
src/globbing.c: new file
lib/glob.c, lib/glob.h, lib/fnmatch.c, lib/fnmatch.h: replacements
from GNU glob.tar.gz
configure.in: glob changes.
Use POSIX glob replacement.
Allow --extension to be used in globbing environment. Don't search
for cats in alternate cat directory if no index.
* All Makefile.in: add standard (GNU coding) targets: all, clean,
mostlyclean, distclean, realclean, install, uninstall, TAGS, dist
Other configuration/goal modifications
* Makefile.in: force config.status to do selective re-creation
* src/zsoelim.l: cater for ".SH \f?NAME\f?"
* acconfig.m4 (AC_FUNC_PCLOSE), src/man.c (display): small changes
from Markus
* Makefile.in, README: change `make all' to equal `make nls=off'
rather than `make nls=all'
* include/Defines.in: move -DDEFAULT_MANROFFSEQ to
include/manconfig.h
* include/manconfig.h: change inline parsing. Use autoconf-2.2
Thu Mar 16 12:38:15 GMT 1995 Markus Armbruster (armbru@pond.sub.org)
* Version: 2.2a20
* zsoelim/zsoelim.l: general fixes
* configure.in: don't add -lc as library containing db routines.
* lib/glob.c: ultrix fixes
* lib/rename.c: replacement
* lib/strappend.c: small fix and copyright notice
Wed Mar 15 11:17:58 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/lexgrog.l: modifications to whatis parser, mainly for
stray cats.
* src/man.c (main): add drop_effective_privs() and
regain_effective_privs() around manpath configuration so that
users' `hidden' manpaths are found and used.
* substantial configuration changes regarding all Makefiles to
allow `alternate build directory' support. man_db may be built
in *any* directory. Aids multi-architecture builds and testing
of various configuration options.
* rationalised source files to #include "local_header" and
#include <system_header>. CPPFLAGS uses -I- to limit -I paths
to "" resolving only. Other alternate build directory mods.
* src/comp_src.h.in: moved to ./comp_src.h.in
src/manconfig.h, src/path.h.in: combined into ./manconfig.h.in
* *ensure* that lib/{regex,fnmatch,getopt}.h are only #included
if the replacement c source is used. Otherwise use system routines
and system headers.
* ./configure.in, acconfig.h, aclocal.m4 (AC_FUNC_PCLOSE,
BROKEN_PCLOSE): new autoconf macro
* gencat is not installed by default. (cd gencat && make install)
* tools/mkcatdirs: re-written
tools/checkman: new utility to check for duplicate manual pages
across manual page hierarchies.
* docs/INSTALL, README: new
* src/man.c (display): attempt to open tmp_cat_filename(), if
unable, don't try to save cat.
Sun Mar 12 18:12:13 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a19
* all source (main): replace mkprogname(%s) with
xstrdup(basename(%s))
* src/util.c (strappend): remove
* lib/strappend.c: new
Mon Mar 6 20:05:27 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c (--local): re-enable support for compressed local
files. eg `man -l foo.1.gz'
* src/man.c (make_roff_command): Check in alternate catdir then
mandir for external format script if ALT_EXT_FORMAT #defined.
* zsoelim/zsoelim.l: partial rewrite to mimick GNU soelim
`bad roff request' error behaviour.
Mon Mar 6 13:51:32 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c: fix SEGV if arg --local used
* src/man.c (gripe_system): exit with errorcode of failed command
Sun Mar 5 20:54:13 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a18
* src/catman.c (main): check individual cat directories for
existence and perms.
* src/man.c (commit_tmp_cat): fix SEGV
* src/man.c: NO_MAN_UPDATES & NO_MAN_CATS #defined code
regions for experimental CERN use, untested and incomplete.
* configure.in, src/Makefile, src/paths.h.in: undo bogus dependance
on NLS for output device=latin1.
* configure.in (--with-device=<device>): new option to select
default nroff output device. Test that nroff can handle selected
output device (if any).
Thu Mar 2 19:30:45 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/lexgrog.l (too_big), (add_str_to_whatis),
(add_char_to_whatis): new functions
(find_name): add extra argument.
add string bounds checking, add new condition to terminate NAME
section: <man_name>\n{W}*\n+.+
* src/check_mandirs.c, src/straycats.c, src/manconfig.h: change
callers of find_name().
* src/man.c (try_db_section): warn of re-cache failure, but don't
exit.
lots of changes/simplifications w.r.t. global/user hierarchies.
global_manpath == 1 for global hierarchy, global_manpath == 0 for
user. global_manpath is set once we know which hierarchy we are
displaying from.
Tue Feb 28 13:34:15 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c (display): fix SEGV.
* src/util.c (strappend): allow realloc of NULL string.
* src/man.c: replace strappend(xstrdup("string"), ...) with
strappend(NULL, string, ...)
* src/straycats.c (check_for_stray): allow any supported
straycat compression extension if COMP_SRC is #defined.
Replace static buffers with dynamic.
* src/check_mandirs.c, src/whatis.c: replace static buffers
with dynamic.
* src/util.c: (mkdbname): new function.
src/*.c: replace static database[PATH_MAX] with mkdbname() calls.
Sun Feb 26 20:58:59 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a17
* src/whatis.c: warn if no index or whatis db's available.
* src/man.c: Fixes to setuid/privs code regarding user manual
trees and ruid==0 from Markus.
* configure.in: add checks for AIX, USG, stdlib.h, MINIX, ISC_POSIX
* lib/glob.c: ensure that _POSIX_VERSION can be defined
Sun Feb 19 12:38:10 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a16
* Various portability fixes provided by Philippe Defert
(defert@cern.ch)
* FSSTND changes regarding /usr, /var/catman searching
* Some header file re-arrangement to aid user configuration.
Sun Feb 12 15:00:44 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a15
Sat Feb 4 10:54:21 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* man(1), manpath(5): revisions.
Thu Feb 2 23:36:20 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/catman.c (do_access): new
* src/man.c (do_chown): new
catman changes, don't do_prompt() if print_where==1
* src/manp.c: changed an !is_directory() to is_directory() != 1
Sat Jan 28 09:39:07 1995 Markus Armbruster (armbru@pond.sub.org)
* man.c: **changes** ??
Sun Jan 22 16:15:04 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a14+
* configure.in, libdb/mydbm.h libdb/db_gdbm.c: if using gdbm,
explicitly test for gdbm_exists() rather than use header #defines.
* man/man1/mandb.man1, man/man1/catman.man1: moved to man/man8 and
renamed.
* apropos(1), whatis(1), manpath(1), zsoelim(1), catman(8),
mandb(8) manual pages: significant revisions.
Sat Jan 21 14:33:28 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* incorporate Markus' changes with my post 2.2a13 changes.
* src/version.c (ver): fix, use fprintf() instead of error().
Thu 22 Dec 1994 15:12:38 +0100 1994 Markus Armbruster (armbru@pond.sub.org)
* src/man.c (make_roff_command, make_display_command,
open_cat_stream, close_cat_stream, display,
find_cat_file, checked_system,
get_preprocessors): new functions
* src/man.c (format_and_display, format_and_display_file,
display_cat_file, parse_roff_directive,
add_directive): removed functions
* src/man.c (glob_for_file, make_name): made consistent.
* src/util.c (strappend): new function.
(do_system_command): changed/renamed to do_system().
* src/manp.c (global_catpath): replaced/fixed
* src/security, src/fake_security (do_system_command_drop_privs):
renamed to do_system_dropped_privs().
* lib/rename.c: new file
Mon Jan 9 20:42:38 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk)
* nls/Makefile, man/Makefile: allow for bogus or non existent
native languages passed in $nls.
* src/man.c (do_prompt): replaced with less friendly but more
portable version.
* inline directives replaced with __inline__ to be more ansi.
Mon Dec 19 12:59:28 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a14
* aclocal.m4, configure.in: don't define variable nroff_device
* src/Makefile, src/paths.h.in: define GNU_NROFF_DEVICE.
If nls != off, GNU_NROFF_DEVICE=" -Tlatin1"
else, GNU_NROFF_DEVICE=" -Tascii"
* src/man.c, src/catman.c, src/security.c: #include <vfork.h> if
available. _exit() from child rather than exit().
Sun Dec 18 17:54:22 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/util.c (basename): removed
lib/basename.c: extracted from src/util.c
configure.in: check for/replace basename function if necessary.
* src/catman.c (add_arg): replace strdup() with xstrdup().
* soelim/soelim.*: renamed zsoelim/zsoelim.*
* manual pages: reflect soelim - zsoelim name change.
Fri Dec 16 12:17:48 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* configure.in: correctly determine db header and required library
* src/man.c (main, do_extern): pass manpath to whatis / apropos in
case man was called with -M or -m.
* src/catman.c (main): interrogate $MANSECT for manual sections.
* man/man1/catman.man1, man/man1/man.man1 ($MANSEC): replace with
the correct variable - $MANSECT.
* src/man.c: new option (-7 or --ascii) passes page through minimal
latin1 to ascii translator. Only useful for nroff written in ascii
and formatted with -Tlatin1.
* man/man1/man.man1: document it.
* src/man.c (make_command): new routine to piece together man's
system() call.
Thu Dec 15 13:52:42 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a13
* src/catman.c (parse_for_sec): only supply man with -L locale
arguments if locale!=0x0
* src/Makefile: fix libmandb.a rule
Wed Dec 14 22:49:59 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version 2.2a12
* major package restructure with creation of new subdirectories
for xcat and the db routines. Allowed split up of single db source
file into some constituent function parts.
* some Makefile restructuring to allow arbitrary ordering of
subdirectory builds.
* ./dblib/*, ./xcat/*: new or moved from src/.
* src/db_storage.c: moved and split up into ./dblib/*.c
src/mydbm.h, db_storage.h: moved into ./dblib
src/nls.h: moved to ./nls.h
src/xcat.c, src/xcat.l, src/Register: moved into ./xcat
Wed Dec 14 00:17:11 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/manconfig.h: #include <stddef.h> for size_t declaration.
* src/checkmandirs.c (reset_db_time): remove use of strerror() in
debug line for systems without it.
* src/manp.c: ensure no warnings given if quiet==1
Tue Dec 12 22:10:07 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/xcat.l: allow duplicate message id's to exist in single C
source file, do not duplicate in the relative message file or
src/man_db-nls.h. Warn of such duplications as they may be in error.
Tue Dec 12 19:05:21 GMT 1994 Markus Armbruster (armbru@pond.sub.org)
* configure.in: fix definition of BINDIR when --prefix not used
* src/man.c: replace "export foo=bar" with "foo=bar; export foo" in
system() command
* soelim/Makefile: do not backup old soelim before install
* lib/error.h: new
* convert all error message to the form
error(int exitcode, int errno, char *message)
where exitcode!=0 causes exit(exitcode) after message and errno!=0
causes the error text to be appended to the message. All messages
have "<program_name>: " prepended.
* all C source: #include "../lib/error.h" and replace prognam with
program_name.
* src/db_storage.c (ndbm_flopen, btree_flopen): generalised
(ndbm_trun_open, btree_trunc_open): removed
(ndbm_flclose): new
* src/gripes.c: functions copied to relevant caller.
src/gripes.c, src/gripes.h: removed
Sun Dec 11 15:16:42 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a11 (not released)
* src/man.c (main): putenv("LESSCHARSET=latin1"), remove from
less_options[]
* src/lexgrog.l: translate \\[ ] (escaped space) to space,
accept '\" as *roff comment,
add a space at *roff end-of-line if necessary.
Sat Dec 10 21:37:41 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* man/man1/catman.man1: new
* soelim/soelim.man1: new
* src/man.c (display_cat_file): if (COMP_SRC), support straycats
with any supported compression extension or none at all.
src/man.c (make_cat_file): replace execle() with execve().
* src/catman.c: added ARG_MAX support and use execve() instead of
system(). This should now behave on systems with small execve()
argument capacity by batching more, but smaller, man jobs.
* Makefile: `make all' now equates to `make nls=all'
Thu Dec 8 00:03:12 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a10
* src/catman.c: new utility.
src/man.c (main): minor changes wrt --catman flag.
* src/paths.h.in (MAN_BIN): add definition for catman.
* dvi/: provide dvi files of the packages' manual pages.
Tue Dec 6 20:58:19 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* man/man.man1: addition of EXAMPLES section.
* src/man.c (do_prompt): change message.
src/man.c (need_to_rerun): make -u really force an update.
src/checkmandirs.c (reset_db_time): new function.
* src/mydbm.h, src/db_storage.c (ndbm_flopen, ndbm_trunc_flopen):
provide file locking mechanism for ndbm.
src/db_storage.c (btree_trunc_flopen): renamed (btree_trunc_open),
add mode argument to open() call.
* src/db_storage.c (make_content): add `static' to declaration of
(dash).
* src/man.c (try_db_section): ensure db found file entry is
consistent with the physical file, if not, update the db entry
before proceeding. Cache consistency should be getting much better
in a wide variety of circumstances now. This check is not performed
for straycats.
Tue Dec 6 12:05:57 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* man/man.man1, man/mandb.man1: large changes.
* aclocal.m4, configure.in (AC_PROG_GNU_ROFF): test for GNU nroff
src/man.c: Do not use col with GNU nroff -Tlatin1 as (a) it is not
needed: see grotty(1) and (b) it is not 8 bit clean. continuation
dashes should now reappear.
Wed Nov 23 16:49:48 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/check_mandirs.c (test_manfile): Provide better checking for
the existence of both foo.1 and foo.1.gz type problems. This should
catch any problems earlier and relieve the db interface code of the
job of identifying such problems.
* src/man.c (manopt_to_env): cater for $MANOPT option arguments
that contain spaces (for -r).
src/man.c (man_getopt): revise, change duplicate option behaviour,
modify -[tTZ] handling and add option -D.
src/man/man1/man.man1: document.
* src/man.c: create LESS_OPTS and LESS_PROMPT and move their
definitions to src/paths.h[.in].
* configure.in: append -s by default to whatever pager is found.
favour db.h and -ldb above gdbm.h and -lgdbm.
N.B.
db creates index.bt
gdbm creates index.db
ndbm creates index.dir and index.pag
Wed Nov 23 16:46:59 GMT 1994 Zoltan Hidvegi (hzoli@cs.elte.hu)
* src/man.c: changes relating to (less_options) and (prompt). Add
command line support for less' prompt: option -r.
* man/man1/man.man1: document it.
Sat Nov 19 20:19:39 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a9
* src/mydbm.h, src/db_storage.c: incorporate completely new
database type: a binary tree method using the Berkeley db-1.85.1
library. Currently experimental and is not used by default, it has
the potential of enhanced speed and easy maintenance as it allows
storage of identical keys, thus reducing the amount of work necessary
to store and lookup multi sectional manual pages such as manpath.1
and manpath.5. During initial tests, the `walk through' algorithm,
used in apropos searches was 65% faster and the general database
open function is 100% faster when compared with gdbm-1.7.3.
* src/whatis.c (apropos): #define-optimised for btree database type.
* src/convert_name.c (convert_name): reorder actions to stop certain
catfiles ending up with a double compression extension, for
instance: foo.1.gz.gz.
* src/Makefile, src/man.c: enable -DNO_DEFAULT_TBL_OR_COL as an
experiment.
Fri Nov 18 21:00:47 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a8 (not released)
* configure.in (config_file, config_prefix): Fix behaviour.
* src/*.[cl], soelim/soelim.l:
s,malloc,xmalloc,g
s,realloc,xrealloc,g
s,strdup,xstrdup,g
src/manconfig.h: remove redefinitions of malloc, realloc and strdup.
Thu Nov 17 22:01:11 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/lexgrog.l: changed catfile whatis extraction rules to be a
little more forgiving. Increased char array size from 1024 to 2048.
* mkcatdirs: shell script to create relative cat dirs.
* src/$PROGS: replaced all occurances of `optional_argument' with
`required_argument' in (long_options).
* src/man.c, src/compression.c, src/straycats.c: ensure that a
failed child process is recognised and dealt with (normally exit(0)).
* src/man.c (make_cat_file): removed need to filter-then-copy if not
setuid. [untested]
* src/man.c, src/mandb.c (main): optional profiling support if
__profile__ defined.
* configure.in (config_file, config_prefix): don't work unless
--prefix=<something> is a command line option, temporarily setting
them to /etc/man_db.config and /etc respectively.
Wed Nov 16 20:34:54 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a7
* src/man.c (format_and_display_file): Fix bug which caused
`man -l -' to fail. Produce sensible error message when -l file
is inaccessable. Allow compressed manual pages to be specified when
using -l (must have correct extension)
* soelim/soelim.l (main): ensure (progname) is the basename of
argv[0] .
* src/manpath.c (main): remove local declaration of (quiet).
add `--global' option.
Wed Nov 16 20:29:20 GMT 1994 Markus Armbruster (armbru@pond.sub.org)
* configure.in: if $prefix=/usr, put config file in /etc else
put it in $prefix/etc
src/manconfig.h (CONFIG_FILE): move to paths.h.in
* src/nls.h (LC_MESSAGES): define as (LC_ALL) in all cases where
(LC_MESSAGES) is not defined in <locale.h>
* src/lexgrog.l: #include "manconfig.h" to redefine strdup() to
xstrdup()
Tue Nov 15 21:38:19 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/manp.c (is_global_mandir): new
src/man.c (locate_page): use it instead of (global_catpath)
* src/*.h: add suitable predicates to function prototype
declarations
moved all function declarations to header files
src/compression.h.in: renamed to comp_src.h.in
Mon Nov 14 18:17:48 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a6
* src/hashtable.c, src/hashtable.h (struct nlist): replaced
(union) member with (void *) and simplified. Modified users.
* src/man.c (make_cat_file): fixed NULL ptr reference in call to
(execle)
src/man.c: determined and fixed memory leaks using Checker.
Mon Nov 14 03:33:37 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/db_storage.c (replace_if_necessary, split_data,
list_extensions): new
src/db_storage.c (free_content): replaced with (free_mandata_struct)
all callers changed
src/db_storage.c (split_content_keep, split_content_temp): replaced
with (split_content)
Sun Nov 13 13:50:46 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/nls.h: change of macros, add (NLS_INIT, EXIT_FUNC)
src/*.c: removed (NLS_CLOSE) macros, adjustments due to above
src/version.c (close_catalogue): new
configure.in (AC_HAVE_FUNCS): (atexit, on_exit)
* getmandbver.c: removed
Sat Nov 12 14:18:02 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/security.h: new, contains security macros from src/manconfig.h
src/manconfig.h: removed security macros
src/security.c, src/security.h: replaced (SYSV_SAVED_IDS) with
(BROKEN_LINUX_SAVED_IDS)
* src/paths.h.in, src/compression.h.in, configure.in: changed
compression defines
src/paths.h.in: defined (STD_SECTIONS), got rid of (MANPATH_MAIN)
src/*.c: removed all (MANPATH_MAIN) defines
configure.in: added (COMP_CAT) and (COMP_SRC) definitions
src/manconfig.h: removed (COMP_SRC) definition
* All manual pages: Fixed to be compatible with native *roff
implementations having a request argument limit of 6
* src/db_storage.c (gripe_extract_data, gripe_corrupt_data):
new routines
* All Makefiles: add (exec_prefix, mandir, bindir) where necessary
Sat Nov 12 13:38:59 GMT 1994 Markus Armbruster (armbru@pond.sub.org)
* soelim/Makefile (install): made more portable
* src/manconfig.h: changes to (POSIX_SAVED_IDS) definition
* src/man.c (main): removed unnecessary #ifdef conditions regading
(SECURE_MANUID)
Sat Nov 12 13:24:17 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/ult_src.c (ult_src): no longer follow an absolute .so include
src/ult_src.c (test_for_include): new
Fri Nov 11 10:16:32 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/man.c (manopt_to_env): generalised
* src/man.c (do_extern): removed (gripe_alloc) call,
modified callers
src/manp.c: removed (gripe_alloc) calls, general tidy
src/gripes.c (gripe_alloc): removed
* src/ult_src.c (ult_src): fixed loop when (buf) != NULL
changed absolute .so include actions
configure.in (AC_HAVE_FUNCS): removed (memmove)
* src/mydbm.h (copy_datum): added references
src/db_storage.c (copy_datum): added function
Fixes for `native ndbm' data corruption by Markus Armbruster
* src/Makefile: removed dbver.o as dependency of manpath
* aclocal.m4 (AC_FUNC_SPRINTF_COUNT): new file and macro
configure.in: use it
acconfig.h: add (SPRINTF_CHARCOUNT)
src/check_mandirs (add_dir_entries): use it
src/whatis.c (display): use it
* src/check_mandirs.c (test_mandirs): added a (free(exists))
* src/straycats.c (check_for_stray): Fixes regarding straycats
with no compression extension
Fri Nov 11 00:29:15 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* lib/xmalloc.c, lib/xstrdup.c, lib/error.c: replaced
lib/strdup.c: removed
lib/strstr.c: replaced
lib/strsep.c, lib/strspn.c, lib/strcspn.c, lib/ansidecl.h: new
configure.in (AC_REPLACE_FUNCS): with respect to above
* src/check_mandirs.c (testmandirs): (free_hashtab) only if
necessary
Thu Nov 10 11:07:52 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* Version: 2.2a5
* src/man.c (usage, man_getopt, parse_roff_directive, ditroff):
add `-Z' option
man/man1/man.man1: document it
Wed Nov 9 20:16:35 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* configure.in (prefix, nroff, neqn, groff, soelim, CFLAGS,
LDFLAGS): portability changes.
Suggestions from Markus Armbruster <armbru@pond.sub.org>
gencat/Makefile (CFLAGS, LDFLAGS): definitions removed
* soelim/Makefile (install): procedural changes
* src/ult_src.c (ult_softlink): changes regarding S_ISLNK
* src/manconfig.h: #define __inline
* src/man.c, src/whatis.c, src/nls.c (LC_MESSAGES): define
as LC_ALL if necessary
Tue Nov 8 23:17:22 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk)
* src/version.c (ver): aesthetic changes
* src/man.c, src/whatis.c, src/manpath.c, src/mandb.c (usage, ver):
calling changes
* src/version.h, src/update_db: removed
* src/convert_name.c (conver_name): argument changes
src/man.c (format_and_display): caller of above changed
(need_to_rerun, locate_page): new functions to split (man)
(format_and_display_nosave): renamed to format_and_display_file
* soelim/soelim.l (usage, ver): new functions
removal of NLS dependence
* Version: 2.2a4
|