File: library.cpp

package info (click to toggle)
objconv 2.56%2Bds-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 2,300 kB
  • sloc: cpp: 27,039; makefile: 4; sh: 2
file content (2105 lines) | stat: -rw-r--r-- 81,767 bytes parent folder | download | duplicates (2)
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
/****************************  library.cpp  **********************************
* Author:        Agner Fog
* Date created:  2006-08-27
* Last modified: 2022-05-07
* Project:       objconv
* Module:        library.cpp
* Description:
* This module contains code for reading, writing and manipulating function
* libraries (archives) of the UNIX type and OMF type.
*
* Copyright 2006-2022 GNU General Public License http://www.gnu.org/licenses
*****************************************************************************/

#include "stdafx.h"

// OMF Library flag names
SIntTxt OMFLibraryFlags[] = {
    {0,      "Flag = 0"},
    {1,      "Case sensitive"}
};


CLibrary::CLibrary() {
    // Constructor
    CurrentOffset = 0;
    CurrentNumber = 0;
    LongNames = 0;
    LongNamesSize = 0;
    AlignBy = 0;
    MemberFileType = 0;
    RepressWarnings = 0;
    PageSize = 16;
}


void CLibrary::Go() {
    // Do to library whatever the command line says
    char const * MemberName1 = 0;  // Name of library member
    char const * MemberName2 = 0;  // Modified name of library member
    int action = 0;                // Action to take on member
    int FileType1 = 0;             // File type of current member
    int WordSize1 = 0;             // Word size of current member

    if (cmd.DumpOptions && !(cmd.LibraryOptions & CMDL_LIBRARY_EXTRACTMEM)) {
        // Dump library, but not its members
        Dump();
        return;
    }

    // Remove path form member names and check member type before extracting or adding members
    AlignBy = 2;
    if (GetDataSize()) FixNames();    

    if (err.Number()) return; // Stop if error

    // check LibraryOptions and whether an output file is specified
    if (cmd.FileOptions & CMDL_FILE_OUTPUT) {
        // Output is a library file
        if ((cmd.OutputFile == 0 || cmd.OutputFile[0] == 0) && !(cmd.LibraryOptions & CMDL_LIBRARY_ADDMEMBER)) {
            err.submit(2503); // Output file name missing
            return;
        }
        // Check extension
        if (strstr(cmd.OutputFile, ".lib") && strstr(cmd.OutputFile, ".LIB") && strstr(cmd.OutputFile, ".a")) {
            err.submit(1101); // Warning wrong extension
        }
        if (cmd.OutputType >= IMPORT_LIBRARY_MEMBER) {
            // Wrong output type
            if (cmd.OutputType == FILETYPE_ASM) {
                // Attempt to disassemble whole library
                err.submit(2620);
            }
            else {
                err.submit(2621);
            }
            return;
        }
    }

    // Desired alignment = 2 for COFF and ELF, 8 for Mach-O
    AlignBy = 2;
    if (cmd.OutputType == FILETYPE_MACHO_LE) AlignBy = 8;

    // Determine library type and subtype
    if (cmd.LibrarySubtype == 0) {    
        switch (cmd.OutputType) {
        case FILETYPE_OMF: case FILETYPE_OMFLIBRARY:
            cmd.LibrarySubtype = LIBTYPE_OMF;  break;
        case FILETYPE_COFF: case FILETYPE_DOS: 
            cmd.LibrarySubtype = LIBTYPE_WINDOWS;  break;
        case FILETYPE_ELF:
            cmd.LibrarySubtype = LIBTYPE_LINUX;  break;
        case FILETYPE_MACHO_LE: case FILETYPE_MACHO_BE:
            cmd.LibrarySubtype = LIBTYPE_BSD_MAC;  break;
        case FILETYPE_LIBRARY:
            switch (cmd.InputType) {
            case FILETYPE_COFF: case FILETYPE_DOS: 
                cmd.LibrarySubtype = LIBTYPE_WINDOWS;  break;
            case FILETYPE_ELF:
                cmd.LibrarySubtype = LIBTYPE_LINUX;  break;
            case FILETYPE_MACHO_LE: case FILETYPE_MACHO_BE:
                cmd.LibrarySubtype = LIBTYPE_BSD_MAC;  break;
            }
            break;
        default:
            cmd.LibrarySubtype = LIBTYPE_SHORTNAMES;
        }
    }

    // Reserve space for data buffer
    DataBuffer.SetSize(GetBufferSize());

    // Check options
    if (!cmd.LibraryOptions) cmd.LibraryOptions = CMDL_LIBRARY_CONVERT;

    if (cmd.Verbose) {
        // Tell what we are doing
        if ((cmd.LibraryOptions & CMDL_LIBRARY_ADDMEMBER) && GetDataSize() == 0) {
            // Creating library
            printf("\nCreating library %s (%s)", FileName, GetFileFormatName(cmd.OutputType));
        }
        else if (OutputFileName) {
            // Print input file name
            printf("\nInput library: %s", FileName);
            if (cmd.InputType != cmd.OutputType) {
                // Converting library type. Print input file type
                int InType = cmd.InputType; 
                if (InType == FILETYPE_LIBRARY || InType == FILETYPE_OMFLIBRARY) InType = cmd.MemberType;
                printf(", Format: %s", GetFileFormatName(InType));
                if (cmd.DesiredWordSize) printf("%i", cmd.DesiredWordSize);
            }
            // Print output file name and type
            printf(", Output: %s, Format: %s", OutputFileName, GetFileFormatName(cmd.OutputType));
            if (cmd.DesiredWordSize) printf("%i", cmd.DesiredWordSize);
        }
        else {
            printf("\nExtracting from library file: %s", FileName);
        }
    }

    // Convert library or extract or add or dump all members
    StartExtracting();                           // Initialize before ExtractMember()

    // Loop through input library
    while ((MemberName1 = ExtractMember(&MemberBuffer)) != 0) {

        // Check if any specific action required for this member
        action = cmd.SymbolChange(MemberName1, &MemberName2, SYMT_LIBRARYMEMBER);
        /*
        if ((action != SYMA_CHANGE_NAME && action != SYMA_EXTRACT_MEMBER) || MemberName2 == 0) {
            MemberName2 = MemberName1; // No name change
        } */
        MemberBuffer.FileName = MemberName1;
        MemberBuffer.OutputFileName = MemberName2 ? MemberName2 : MemberName1;

        if (action == SYMA_DELETE_MEMBER) {
            // Remove this member from library
            if (cmd.Verbose) {
                printf("\nRemoving member %s from library", MemberName1);
            }
            continue;
        }
        if (action == SYMA_ADD_MEMBER) {
            // Replace this member with new file
            // (Message comes later when adding new member)
            continue;
        }

        // Check type of this member
        FileType1 = MemberBuffer.GetFileType();
        if (FileType1 == 0) continue;
        WordSize1 = MemberBuffer.WordSize;

        if (!(cmd.LibraryOptions & (CMDL_LIBRARY_EXTRACTMEM | CMDL_LIBRARY_ADDMEMBER))) {
            // Not adding or extracting members. Apply conversion options to all members
            if (cmd.SymbolChangesRequested() || FileType1 != cmd.OutputType) {

                // Check file type before conversion
                int FileType0 = MemberBuffer.GetFileType();
                // Conversion or name change requested
                MemberBuffer.Go();                   // Do required conversion
                if (err.Number()) break;             // Stop if error
                // Check type again after conversion
                FileType1 = MemberBuffer.GetFileType();
                if (MemberBuffer.OutputFileName == 0 || FileType1 != FileType0) {
                    MemberBuffer.OutputFileName = MemberBuffer.SetFileNameExtension(MemberBuffer.FileName);
                }
                MemberBuffer.FileName = MemberBuffer.OutputFileName;
            }
        }
        if (MemberFileType == 0) MemberFileType = FileType1;
        if (WordSize == 0) WordSize = WordSize1;
        if (FileType1 != MemberFileType || WordSize1 != WordSize) {
            if (WordSize1 == 0) {
                // Library member has no wordsize
                err.submit(1109, MemberBuffer.FileName);
            }
            else {
                // Library members have different type or word size
                err.submit(1102); 
            }
        }

        if (cmd.LibraryOptions & CMDL_LIBRARY_EXTRACTMEM) {
            // Extract member(s)
            if (action == SYMA_EXTRACT_MEMBER || cmd.LibraryOptions == CMDL_LIBRARY_EXTRACTALL) {
                // Extract this member
                if (cmd.DumpOptions == 0 && cmd.OutputType != CMDL_OUTPUT_DUMP) {
                    // Write this member to file
                    if (err.Number()) return; // Check first if error

                    if (cmd.SymbolChangesRequested() || FileType1 != cmd.OutputType) {
                        // Conversion or name change requested

                        // Check type before conversion
                        int FileType0 = MemberBuffer.GetFileType();
                        MemberBuffer.Go();
                        if (err.Number()) return; // Stop if error
                        // Check type after conversion
                        FileType1 = MemberBuffer.GetFileType();
                        if (MemberBuffer.OutputFileName == 0 /*|| FileType1 != FileType0*/) {
                            MemberBuffer.OutputFileName = MemberBuffer.SetFileNameExtension(MemberBuffer.FileName);
                        }
                    }
                    if (MemberBuffer.OutputFileName == 0) {
                        MemberBuffer.OutputFileName = MemberBuffer.FileName;
                    }
                    if (cmd.Verbose) {
                        // Tell what we are doing
                        if (MemberName1 == MemberName2) {
                            printf("\nExtracting file %s from library", MemberName1);
                        }
                        else {
                            printf("\nExtracting library member %s to file %s", MemberName1, MemberBuffer.OutputFileName);
                        }
                    }
                    if (WordSize1 == 0) {
                        err.submit(1109, MemberName1);
                    }
                    // Write this member to file
                    MemberBuffer.Write();
                }
                else {
                    // Dump this member
                    MemberBuffer.Go();
                }
            }
        }
        else if (cmd.DumpOptions == 0) {
            // Add member to new library
            if (MemberName2 == 0) MemberName2 = MemberName1;
            if (cmd.Verbose) {
                // Tell what we are doing
                if (strcmp(MemberName1, MemberName2) != 0) {
                    printf("\nRenaming member %s to %s", MemberName1, MemberName2);
                }
            }
            // Put into new library
            InsertMember(&MemberBuffer);
        }
    } // End of loop through library
    // Stop if error
    if (err.Number()) return; 

    if (cmd.LibraryOptions & CMDL_LIBRARY_ADDMEMBER) {
        // Add object files to library
        SSymbolChange const * sym;
        // Loop through file names to add
        while ((sym = cmd.GetMemberToAdd()) != 0) {
            MemberBuffer.Reset();                     // Reset MemberBuffer
            // Name of object file
            MemberBuffer.FileName = sym->Name2;       // Name of object file
            MemberBuffer.OutputFileName = sym->Name1; // Name of new member
            // Read object file
            MemberBuffer.Read();
            // Stop if read failed
            if (err.Number()) continue; 
            // Detect file type
            int NewMemberType = MemberBuffer.GetFileType();
            if (cmd.Verbose) {
                // Tell what we are doing
                if (sym->Done) {
                    printf("\nReplacing member %s with file %s", sym->Name1, sym->Name2);
                }
                else {
                    printf("\nAdding member %s from file %s", sym->Name1, sym->Name2);
                }
                if (NewMemberType != cmd.OutputType) {
                    // Converting type
                    printf(". Converting from %s.", GetFileFormatName(NewMemberType));
                }
            }
            // Do any conversion required
            MemberBuffer.Go();

            // Stop if error
            if (err.Number()) continue; 

            // Check if file type is right after conversion
            MemberFileType = MemberBuffer.FileType;
            if (WordSize == 0) WordSize = MemberBuffer.WordSize;
            if (MemberFileType != cmd.OutputType) {
                // Library members have different type
                err.submit(2504, GetFileFormatName(MemberBuffer.FileType)); continue; 
            }
            if (MemberBuffer.WordSize != WordSize) {
                // Library members have different word size
                err.submit(2505, MemberBuffer.WordSize); continue; 
            }
            // Put into library
            MemberBuffer.FileName = MemberBuffer.OutputFileName;
            InsertMember(&MemberBuffer);
        } // End of loop through object file names
    } 
    // Stop if error
    if (err.Number()) return; 

    if (cmd.LibraryOptions & CMDL_LIBRARY_EXTRACTMEM) {
        cmd.CheckExtractSuccess();  // Check if members to extract were found
    }

    if (cmd.FileOptions & CMDL_FILE_OUTPUT) {
        // Make output library
        MakeBinaryFile();
        // Take over OutFile buffer
        *this << OutFile;
    }
    else {
        // No output library
        OutputFileName = 0;
    }
}

void CLibrary::FixNames() {
    // Rebuild library or fix member names
    // Dispatch according to library type
    switch (cmd.InputType) {
    case FILETYPE_OMF: case FILETYPE_OMFLIBRARY:
        // Rebuild OMF style library and fix long member names
        RebuildOMF();  break;

    case FILETYPE_LIBRARY:
    default:
        // Fix names in UNIX style library
        StripMemberNamesUNIX();  break;
    }
}

/*  Unused:
void CLibrary::Rebuild() {
    // Rebuild library: fix member names
    // Dispatch according to library type
    switch (cmd.InputType) {
    case FILETYPE_OMF: case FILETYPE_OMFLIBRARY:
        // Rebuild OMF style library
        RebuildOMF();  break;

    case FILETYPE_LIBRARY:
    default:
        // Rebuild UNIX style library
        RebuildUNIX();  break;
    }
}

void CLibrary::RebuildUNIX() {
    // Rebuild UNIX style library
    // Make member names unique and without path. Rebuild symbol table
    char const * MemberName1 = 0;  // Name of library member
    uint32_t OutputFileType;

    // Save OutputType before changing it
    OutputFileType = cmd.OutputType;

    // Loop through input library
    CurrentOffset = 8;  CurrentNumber = 0;
    while ((MemberName1 = ExtractMember(&MemberBuffer)) != 0) {
        // Properties of member
        MemberBuffer.FileName = MemberBuffer.OutputFileName = MemberName1;
        // Check if import library
        if (MemberBuffer.Get<uint32_t>(0) == 0xFFFF0000) {
            // Import library. Cannot do anything sensible
            err.submit(2507, cmd.InputFile);  return;
        }
        // Remember member type
        cmd.MemberType = MemberBuffer.GetFileType();
        // Temporarily set OutputType to MemberType
        cmd.OutputType = cmd.MemberType;
        // Put into new library
        InsertMember(&MemberBuffer);
    }
    // Avoid getting warnings twice for duplicate symbols
    RepressWarnings = 1; 
    // Make library header etc. and add all members to OutFile
    MakeBinaryFile();
    RepressWarnings = 0;

    // Restore OutputType
    cmd.OutputType = OutputFileType;

    // Replace file buffer by OutFile
    *this << OutFile;

    // Clear buffers used for building OutFile
    StringBuffer.SetSize(0);
    StringEntries.SetNum(0);
    Indexes.SetNum(0);
    DataBuffer.SetSize(0);
}
*/

void CLibrary::RebuildOMF() {
    // Rebuild OMF style library.
    // Removes paths from member names, truncates to 16 characters, and makes unique.
    // Symbol table is removed, not remade

    SOMFRecordPointer rec;                        // Current OMF record
    char * ModuleName;                            // Module name
    SStringEntry se;                              // String entry record to save
    COMFFileBuilder NewBuffer;                    // Buffer for rebuilt library
    uint32_t Align;                                 // Alignment

    // Remember member file type
    cmd.MemberType = FILETYPE_OMF;

    // Initialize record pointer
    rec.Start(Buf(), 0, GetDataSize());

    // Read header
    if (rec.Type2 != OMF_LIBHEAD) {err.submit(2500); return;} // Does not start with library header

    // Read library header
    DictionaryOffset = rec.GetDword();
    DictionarySize = rec.GetWord();
    if ((uint64_t)DictionaryOffset + DictionarySize >= GetDataSize()) {err.submit(2035); return;}

    rec.GetByte(); // Ignore flag
    // Page size / alignment for members
    PageSize = rec.End + 1;
    Align = 1 << FloorLog2(PageSize);       // Make power of 2
    if (PageSize != Align) {
        err.submit(2601, PageSize);          // Error: not a power of 2
    }

    // Copy library header to new buffer
    NewBuffer.Push(Buf(), PageSize);

    // Reset record loop end when DictionaryOffset is known
    rec.FileEnd = DictionaryOffset;

    // Next record is start of first module
    rec.GetNext();
    if (rec.Type2 != OMF_THEADR) err.submit(2500);  // Member does not start with THEADR

    // Loop through the records of all OMF modules
    do {
        // Check record type
        switch (rec.Type2) {

        case OMF_THEADR:     // Start of module

            // Get name
            ModuleName = rec.GetString();

            // Remove path, truncate name and make unique
            ModuleName = ShortenMemberName(ModuleName);

            // Remember name to check for duplicates
            // Not needed any more:
            se.String = StringBuffer.PushString(ModuleName);
            se.Member = NewBuffer.GetDataSize();
            StringEntries.Push(se);

            // Make new THEADR record
            NewBuffer.StartRecord(OMF_THEADR);
            NewBuffer.PutString(ModuleName);
            NewBuffer.EndRecord();
            break;

        case OMF_MODEND: case OMF_LIBEND:   // End of module or library
            // Copy MODEND record
            NewBuffer.Push(Buf() + rec.FileOffset, rec.End + 1);

            // Align output file by PageSize
            NewBuffer.Align(PageSize);
            break;

        default:   // Any other record in module
            // Copy record unchanged
            NewBuffer.Push(Buf() + rec.FileOffset, rec.End + 1);
            break;
        }
    }  // Point to next record
    while (rec.GetNext(PageSize));                // End of loop through records

    // Put dictionary offset in LIBHEAD record
    DictionaryOffset = NewBuffer.GetDataSize();
    NewBuffer.Get<uint32_t>(3) = DictionaryOffset;

    // Take over modified library file
    *this << NewBuffer;

    // Empty used buffers
    StringEntries.SetNum(0);
    StringBuffer.SetSize(0);
}


void CLibrary::StripMemberNamesUNIX() {
    // Remove path from member names, set extension to default
    char * MemberName1 = 0;  // Name of library member

    // Loop through input library
    CurrentOffset = 8;  CurrentNumber = 0;
    while ((MemberName1 = ExtractMember(&MemberBuffer)) != 0) {
        // Properties of member
        // Check if import library
        if (MemberBuffer.Get<uint32_t>(0) == 0xFFFF0000) {
            // Import library. Cannot do anything sensible
            err.submit(2507, cmd.InputFile);  return;
        }
        if (MemberName1[0] == '/') continue;  // names record
        // remember member type
        if (cmd.MemberType == 0) {
            cmd.MemberType = MemberBuffer.GetFileType();
        }
        // Fix name
        StripMemberName(MemberName1);
        // Check word size
        if (cmd.DesiredWordSize == 0) {
            cmd.DesiredWordSize = MemberBuffer.WordSize;
        }
        else if (cmd.DesiredWordSize != MemberBuffer.WordSize && MemberBuffer.WordSize != 0) {
            err.submit(2012, MemberBuffer.WordSize, cmd.DesiredWordSize);  // wrong word size
            return;
        }
        if (cmd.OutputType == FILETYPE_LIBRARY || cmd.OutputType == FILETYPE_OMFLIBRARY) {
            cmd.OutputType = cmd.MemberType;
        }
    }
}


void CLibrary::Dump() {
    // Print contents of library

    // Dispatch according to library type
    switch (cmd.InputType) {
    case FILETYPE_LIBRARY:
        DumpUNIX();  break;                        // Print contents of UNIX style library

    case FILETYPE_OMFLIBRARY:
        DumpOMF();   break;                        // Print contents of OMF style library

    default:
        err.submit(9000);                          // Should not occur
    }
}

void CLibrary::DumpOMF() {
    // Print contents of OMF style library
    uint8_t  Flags;                                 // Dictionary flags
    uint32_t i;                                     // Loop counter
    uint32_t Align;                                 // Member alignment
    uint32_t RecordEnd;                             // End of OMF record
    SOMFRecordPointer rec;                        // Current OMF record
    char * MemberName;                            // Name of library member
    char * SymbolName;                            // Name of public symbol in member
    uint32_t MemberStart = 0;                       // Start of member
    uint32_t MemberEnd;                             // End of member
    uint32_t MemberNum = 0;                         // Member number
    uint32_t FirstPublic;                           // Index to first public name of current member
    CMemoryBuffer Strings;                        // Local string buffer
    CSList<SStringEntry> MemberIndex;             // Local member index buffer
    COMF Member;                                  // Local buffer for member

    DictionaryOffset = GetDataSize();             // Loop end. This value is changed when library header is read
    rec.Start(Buf(), 0, DictionaryOffset);        // Initialize record pointer

    PageSize = 0;

    printf("\nDump of library %s\nExported symbols by member:\n", cmd.InputFile);

    // Loop through the records of all OMF modules
    do {
        // Check record type
        switch (rec.Type2) {

        case OMF_LIBHEAD:  // Library header. This should be the first record
            if (PageSize || rec.FileOffset > 0) {
                err.submit(2600);  break;            // More than one header
            }
            // Read library header
            DictionaryOffset = rec.GetDword();
            DictionarySize = rec.GetWord();
            if ((uint64_t)DictionaryOffset + DictionarySize >= GetDataSize()) {err.submit(2035); return;}
            Flags = rec.GetByte();
            // Page size / alignment for members
            PageSize = rec.End + 1;
            Align = 1 << FloorLog2(PageSize);       // Make power of 2
            if (PageSize != Align) {
                err.submit(2601, PageSize);          // Error: not a power of 2
            }
            // Reset record loop end when DictionaryOffset is known
            rec.FileEnd = DictionaryOffset;

            // Print values from LIBHEAD
            printf("\nOMF Library. Page size %i. %s.",
                PageSize, Lookup(OMFLibraryFlags, Flags));
            break;

        case OMF_THEADR: // Module header. Member starts here
            MemberName = rec.GetString();           // Get name
            MemberStart = rec.FileOffset;           // Get start address
            printf("\nMember %s Offset 0x%X", MemberName, MemberStart);// Print member name
            break;

        case OMF_MODEND: // Member ends here.
            RecordEnd = rec.FileOffset + rec.End + 1;// End of record
            MemberEnd = RecordEnd;                   // = member end address

            // Store member in temporary buffer
            Member.SetSize(0);
            Member.Push(Buf() + MemberStart, MemberEnd - MemberStart);

            // Get public names from member
            FirstPublic = MemberIndex.GetNumEntries();
            Member.PublicNames(&Strings, &MemberIndex, ++MemberNum); 

            // Print public names
            for (i = FirstPublic; i < MemberIndex.GetNumEntries(); i++) {
                SymbolName = (char*)Strings.Buf() + MemberIndex[i].String;
                printf("\n  %s", SymbolName);
            }
            // Align next member by PageSize;
            MemberEnd = (MemberEnd + PageSize - 1) & - (int32_t)PageSize;
            rec.End = MemberEnd - rec.FileOffset - 1;
            break;

        case OMF_LIBEND: // Last member should end here
            RecordEnd = rec.FileOffset + rec.End + 1;// End of record
            if (RecordEnd != DictionaryOffset) err.submit(2602);
            break;
        }     
    }  // Go to next record
    while (rec.GetNext());                        // End of loop through records

    // Check hash table integrity
    CheckOMFHash(Strings, MemberIndex);

    // Check if there is an extended library dictionary
    uint32_t ExtendedDictionaryOffset = DictionaryOffset + DictionarySize * 512;

    if (ExtendedDictionaryOffset > GetDataSize()) {
        err.submit(2500);                          // File is truncated
    }
    if (ExtendedDictionaryOffset < GetDataSize()) {
        // Library contains extended dictionary
        uint32_t ExtendedDictionarySize = GetDataSize() - ExtendedDictionaryOffset;
        uint8_t DictionaryType = Get<uint8_t>(ExtendedDictionaryOffset); // Read first byte of extended dictionary
        if (DictionaryType == OMF_LIBEXT) {
            // Extended dictionary in the official format
            printf("\nExtended dictionary IBM/MS format. size %i", ExtendedDictionarySize);
        }
        else if (ExtendedDictionarySize >= 10 && (DictionaryType == 0xAD || Get<uint16_t>(ExtendedDictionaryOffset + 2) == MemberNum)) {
            // Extended dictionary in the proprietary Borland format, documented only in US Patent 5408665, 1995
            printf("\nExtended dictionary Borland format. size %i", ExtendedDictionarySize);
        }
        else {
            // Unknown format
            printf("\nExtended dictionary size %i, unknown type 0x%02X", 
                ExtendedDictionarySize, DictionaryType);
        }
    }
}

void CLibrary::DumpUNIX() {
    // Print contents of UNIX style library

    const char * MemberName = 0;
    CurrentOffset = 8;  CurrentNumber = 0;

    printf("\nDump of library %s", cmd.InputFile);

    if (cmd.DumpOptions & DUMP_SECTHDR) {
        // dump headers
        SUNIXLibraryHeader * Header = 0;    // Member header
        uint32_t MemberSize = 0;              // Size of member
        //uint32_t HeaderExtra = 0;             // Extra added to size of header
        //uint32_t NameIndex;                 // Index into long names member
        char * Name = 0;                    // Name of member
        int symindex = 0;                   // count symbol index records
        int i;                              // loop counter

        // Search for member
        while (CurrentOffset) {
            //HeaderExtra = 0;
            // Extract next library member from input library
            Header = &Get<SUNIXLibraryHeader>(CurrentOffset);
            // Size of member
            MemberSize = (uint32_t)atoi(Header->FileSize);
            // Member name
            Name = Header->Name;
            // Terminate name
            for (i = 0; i < 15; i++) {
                if (Name[i] == ' ') {
                    Name[i+1] = 0;  break;
                }
            }
            if (i == 16) Name[i] = 0;

            if (strncmp(Name, "//", 2) == 0) {
                // This is the long names member. 
                printf("\nLongnames header \"%s\". Offset 0x%X, size 0x%X", Name,
                    CurrentOffset + (uint32_t)sizeof(SUNIXLibraryHeader), MemberSize);
            }
            else if (Name[0] == '/' && Name[1] <= ' ') {
                // Symbol index
                printf("\nSymbol index %i, \"%s\"", ++symindex, Name);
            }
            else if (strncmp(Name, "__.SYMDEF", 9) == 0) {
                // Mac/BSD Symbol index
                printf("\nSymbol index %i, \"%s\"", ++symindex, Name);
            }
            else if (strncmp(Name, "#1/", 3) == 0) {
                // Name refers to long name after the header
                // This variant is used by Mac and some versions of BSD
                //HeaderExtra = atoi(Name+3);
                Name += sizeof(SUNIXLibraryHeader);
                if (strncmp(Name, "__.SYMDEF", 9) == 0) {
                    // Symbol table "__.SYMDEF SORTED" as long name
                    printf("\nSymbol index %i, \"%s\"", ++symindex, Name);
                }
            }
            else break;
            // Point to next member
            CurrentOffset = NextHeader(CurrentOffset);
        }
        CurrentOffset = 8;  CurrentNumber = 0; 
    }

    printf("\n\nExported symbols by member:\n");

    // Loop through library
    while (CurrentOffset + sizeof(SUNIXLibraryHeader) < DataSize) {

        // Reset buffers
        StringBuffer.SetSize(0);
        MemberBuffer.Reset();
        StringEntries.SetNum(0);

        // Get member name
        MemberName = ExtractMember(&MemberBuffer);
        if (MemberName == 0) break;
        printf("\nMember %s", MemberName);
        MemberBuffer.FileName = MemberName;

        // Detect file type of member
        MemberFileType = MemberBuffer.GetFileType();

        WordSize = MemberBuffer.WordSize;
        printf (" - %s", GetFileFormatName(MemberFileType));
        if (WordSize) {
            printf("-%i", MemberBuffer.WordSize);
        }
        else {
            printf(". Type not specified. Possibly alias record");
        }

        // Get symbol table for specific file type
        switch (MemberFileType) {
        case FILETYPE_ELF: 
            if (WordSize == 32) {
                // Make instance of file parser, 32 bit template
                CELF<ELF32STRUCTURES> elf;
                MemberBuffer >> elf;        // Transfer MemberBuffer to elf object
                elf.PublicNames(&StringBuffer, &StringEntries, 0);
                break;
            }
            else {
                // Make instance of file parser, 64 bit template
                CELF<ELF64STRUCTURES> elf;
                MemberBuffer >> elf;        // Transfer MemberBuffer to elf object
                elf.PublicNames(&StringBuffer, &StringEntries, 0);
                break;
            }

        case FILETYPE_COFF: {
            CCOFF coff;
            MemberBuffer >> coff;       // Transfer MemberBuffer to coff object
            coff.PublicNames(&StringBuffer, &StringEntries, 0);
            break;}

        case FILETYPE_MACHO_LE:
            if (WordSize == 32) {
                // Make instance of file parser, 32 bit template
                CMACHO<MAC32STRUCTURES> mac;
                MemberBuffer >> mac;       // Transfer MemberBuffer to coff object
                mac.PublicNames(&StringBuffer, &StringEntries, 0);
                break;
            }
            else {
                // Make instance of file parser, 64 bit template
                CMACHO<MAC64STRUCTURES> mac;
                MemberBuffer >> mac;       // Transfer MemberBuffer to coff object
                mac.PublicNames(&StringBuffer, &StringEntries, 0);
                break;
            }

        case IMPORT_LIBRARY_MEMBER: {
            // This is an import library
            char * name1 = (char*)MemberBuffer.Buf() + 20;
            printf("\n  Import %s from %s", name1, name1 + strlen(name1) + 1);
            break;} 

        default:
            printf("\n   Cannot extract symbol names from this file type");
            break;
        }

        // Loop through table of public names
        for (uint32_t i = 0; i < StringEntries.GetNumEntries(); i++) {
            uint32_t j = StringEntries[i].String;
            printf("\n   %s", StringBuffer.Buf() + j);
        }
    }
}


uint32_t CLibrary::NextHeader(uint32_t Offset) {

    // Loop through library headers.
    // Input = current offset. Output = next offset
    SUNIXLibraryHeader * Header;   // Member header
    int32_t MemberSize;          // Size of member
    //uint32_t HeaderExtra = 0;    // Extra added to size of header
    uint32_t NextOffset;         // Offset of next header

    if (Offset + sizeof(SUNIXLibraryHeader) >= DataSize) {
        // No more members
        return 0;
    }
    // Find header
    Header = &Get<SUNIXLibraryHeader>(Offset);

    // Size of member
    MemberSize = atoi(Header->FileSize);
    if (MemberSize < 0 || MemberSize + Offset + sizeof(SUNIXLibraryHeader) > DataSize) {
        err.submit(2500);  // Points outside file
        return 0;
    }
    if (strncmp(Header->Name, "#1/", 3) == 0) {
        // Name refers to long name after the header
        // This variant is used by Mac and some versions of BSD.
        // HeaderExtra is included in MemberSize:
        // HeaderExtra = atoi(Header->Name+3);
    }

    // Get next offset
    NextOffset = Offset + sizeof(SUNIXLibraryHeader) + MemberSize;
    // Round up to align by 2
    NextOffset = (NextOffset + 1) & ~ 1;
    // Check if last
    if (NextOffset >= DataSize) NextOffset = 0;
    return NextOffset;
}


void CLibrary::StartExtracting() {
    // Initialize before ExtractMember() 
    if (cmd.InputType == FILETYPE_OMFLIBRARY) {
        SOMFRecordPointer rec;                     // OMF records
        rec.Start(Buf(), 0, GetDataSize());        // Initialize record pointer
        if (rec.Type2 != OMF_LIBHEAD) {
            err.submit(2500);  return;              // This should not happen
        }
        // Read library header
        DictionaryOffset = rec.GetDword();         // Read dictionary offset
        DictionarySize   = rec.GetWord();          // Read dictionary size
        rec.GetByte();                             // Read flag
        // Page size / alignment for members
        PageSize = rec.End + 1;
        uint32_t align = 1 << FloorLog2(PageSize);   // Make power of 2
        if (PageSize != align) {
            err.submit(2601, PageSize);             // Error: not a power of 2
        }
        CurrentOffset = PageSize;                  // Offset to first library member
    }
    else {
        // Unix style library. First header at offset 8
        CurrentOffset = 8;
    }
    // Current member number
    CurrentNumber = 0;
}


char * CLibrary::ExtractMember(CFileBuffer * Destination) {
    // Extract library member
    // Dispatch according to library type
    if (cmd.InputType == FILETYPE_OMFLIBRARY || cmd.InputType == FILETYPE_OMF) {
        return ExtractMemberOMF(Destination);
    }
    else {
        return ExtractMemberUNIX(Destination);
    }
}


char * CLibrary::ExtractMemberOMF(CFileBuffer * Destination) {
    // Extract member of OMF style library

    uint32_t RecordEnd;                             // End of OMF record
    SOMFRecordPointer rec;                        // Current OMF record
    char * MemberName = 0;                        // Name of library member
    uint32_t MemberStart = 0;                       // Start of member
    uint32_t MemberEnd = 0;                         // End of member

    if (CurrentOffset >= DictionaryOffset) return 0;// No more members

    rec.Start(Buf(), CurrentOffset, DictionaryOffset);// Initialize record pointer

    // Loop through the records of all OMF modules
    do {
        // Check record type
        switch (rec.Type2) {

        case OMF_THEADR: // Module header. Member starts here
            MemberName  = rec.GetString();          // Get name
            MemberStart = rec.FileOffset;           // Get start address
            break;

        case OMF_MODEND: // Member ends here.
            RecordEnd = rec.FileOffset + rec.End +1;// End of record
            MemberEnd = RecordEnd;                  // = member end address

            // Save member as raw data
            if (Destination) {
                Destination->SetSize(0);             // Make sure destination buffer is empty
                Destination->FileType = Destination->WordSize = 0;
                Destination->Push(Buf() + MemberStart, MemberEnd - MemberStart);
            }

            // Align next member by PageSize;
            rec.GetNext(PageSize);
            CurrentOffset = rec.FileOffset;

            // Check name
            //!!if (MemberName[0] == 0) MemberName = (char*)"NoName!";

            // Return member name
            return MemberName;

        case OMF_LIBEND: // Last member should end here
            RecordEnd = rec.FileOffset + rec.End + 1;// End of record
            if (RecordEnd != DictionaryOffset) err.submit(2602);

            // No more members:
            return 0;
        }     
    }  // Go to next record
    while (rec.GetNext());                        // End of loop through records

    err.submit(2610);                             // Library end record not found
    return 0;
}


char * CLibrary::ExtractMemberUNIX(CFileBuffer * Destination) {
    // Extract member of UNIX style library
    // This function is called repeatedly to get each member of library/archive
    SUNIXLibraryHeader * Header = 0;     // Member header
    uint32_t MemberSize = 0;              // Size of member
    uint32_t HeaderExtra = 0;             // Extra added to size of header
    uint32_t NameIndex;                   // Index into long names member
    char * Name = 0;                    // Name of member
    int Skip = 1;                       // Skip record and search for next
    int i;                              // Loop counter
    char * p;                           // Used for loop through string

    if (CurrentOffset == 0 || CurrentOffset + sizeof(SUNIXLibraryHeader) >= DataSize) {
        // No more members
        return 0;
    }

    // Search for member
    while (Skip && CurrentOffset) {
        HeaderExtra = 0;
        // Extract next library member from input library
        Header = &Get<SUNIXLibraryHeader>(CurrentOffset);
        // Size of member
        MemberSize = (uint32_t)atoi(Header->FileSize);
        if (MemberSize + CurrentOffset + sizeof(SUNIXLibraryHeader) > DataSize) {
            err.submit(2500);  // Points outside file
            return 0;
        }
        // Member name
        Name = Header->Name;
        if (strncmp(Name, "// ", 3) == 0) {
            // This is the long names member. Remember its position
            LongNames = CurrentOffset + sizeof(SUNIXLibraryHeader);
            LongNamesSize = MemberSize;
            // The long names are terminated by '/' or 0, depending on system,
            // but may contain non-terminating '/'. Find out which type we have:
            // Pointer to LongNames record
            p = (char*)Buf() + LongNames;
            // Find out whether we have terminating zeroes:
            if ((LongNamesSize > 1 && p[LongNamesSize-1] == '/') || (p[LongNamesSize-1] <= ' ' && p[LongNamesSize-2] == '/')) {
                // Names are terminated by '/'. Replace all '/' by 0 in the longnames record
                for (uint32_t j = 0; j < LongNamesSize; j++, p++) {
                    if (*p == '/') *p = 0;
                }
            }
        }
        else if (strncmp(Name, "/ ", 2) == 0
            || strncmp(Name, "__.SYMDEF", 9) == 0) {
                // This is a symbol index member.
                // The symbol index is not used because we are always building a new symbol index.
        }
        else if (Name[0] == '/' && Name[1] >= '0' && Name[1] <= '9' && LongNames) {
            // Name contains index into LongNames record
            NameIndex = atoi(Name+1);
            if (NameIndex < LongNamesSize) {
                Name = (char*)Buf() + LongNames + NameIndex;
            }
            else {
                Name = (char*)"NoName!";
            }
            Skip = 0;
        }
        else if (strncmp(Name, "#1/", 3) == 0) {
            // Name refers to long name after the header
            // This variant is used by Mac and some versions of BSD
            HeaderExtra = atoi(Name+3);
            Name += sizeof(SUNIXLibraryHeader);
            if (MemberSize > HeaderExtra) {
                // The length of the name, HeaderExtra, is included in the 
                // Header->FileSize field. Subtract to get the real file size
                MemberSize -= HeaderExtra;
            }
            if (strncmp(Name, "__.SYMDEF", 9) == 0) {
                // Symbol table "__.SYMDEF SORTED" as long name
                Skip = 1;
            }
            else {
                Skip = 0;
            }
        }
        else {
            // Ordinary short name
            // Name may be terminated by '/' or space. Replace termination char by 0
            for (i = 15; i >= 0; i--) {
                if (Name[i] == ' ' || Name[i] == '/') Name[i] = 0;
                else break;
            }
            // Terminate name with max length by overwriting Date field, which we are not using
            Name[16] = 0;
            Skip = 0;
        }
        // Point to next member
        CurrentOffset = NextHeader(CurrentOffset);
        // Increment number
        CurrentNumber += !Skip;
    }  // End of while loop

    // Save member as raw data
    if (Destination) {
        Destination->SetSize(0);       // Make sure destination buffer is empty
        Destination->FileType = Destination->WordSize = 0;
        Destination->Push((int8_t*)Header + sizeof(SUNIXLibraryHeader) + HeaderExtra, MemberSize);
    }

    // Check name
    if (Name[0] == 0) Name = (char*)"NoName!";

    // Return member name
    return Name;
}

void CLibrary::InsertMember(CFileBuffer * member) {
    // Add member to output library
    if (cmd.OutputType == FILETYPE_OMF) {
        InsertMemberOMF(member);                   // OMF style output library
    }
    else {
        InsertMemberUNIX(member);                  // UNIX style output library
    }
}


void CLibrary::InsertMemberOMF(CFileBuffer * member) {
    // Add member to OMF library

    // Check file type
    if (member->GetFileType() != FILETYPE_OMF) err.submit(9000);

    // Get word size
    WordSize = member->WordSize;

    // Store offset
    uint32_t offset = DataBuffer.GetDataSize();
    Indexes.Push(offset);

    // Store member
    DataBuffer.Push(member->Buf(), member->GetDataSize());
    DataBuffer.Align(PageSize);

    // Member index
    uint32_t mindex = Indexes.GetNumEntries() - 1;

    // Get public string table
    COMF omf;
    *member >> omf;     // Translate member to class OMF
    omf.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
    *member << omf;     // Return buffer to member
}


void CLibrary::InsertMemberUNIX(CFileBuffer * member) {
    // Add next library member to output library
    uint32_t RawSize = 0;                 // Size of binary file
    uint32_t AlignmentPadding = 0;        // Padding after file
    char * name = 0;                    // Name of member
    int NameLength = 0;                 // length of name
    int NameAfter = 0;                  // length of name after MachO header 
    int i;                              // loop counter, index

    // Get word size
    WordSize = member->WordSize;

    // Make member header
    SUNIXLibraryHeader header;
    memset(&header, ' ', sizeof(SUNIXLibraryHeader));  // Fill with spaces

    // Name of member
    if (member->OutputFileName == 0 || *member->OutputFileName == 0) member->OutputFileName = member->FileName;

    if (cmd.LibrarySubtype == LIBTYPE_SHORTNAMES) {
        // Make short name
        name = ShortenMemberName(member->OutputFileName);
    }
    else {
        // Remove path from library member name. Original long name is overwritten
        name = StripMemberName((char*)(member->OutputFileName));
    }
    NameLength = (int)strlen(name);

    if (cmd.OutputType == FILETYPE_MACHO_LE && cmd.LibrarySubtype != LIBTYPE_SHORTNAMES) {
        // Mach-O library stores name after header record.
        // Name is zero padded to length 4 modulo 8 to align by 8
        int pad = 8 - ((NameLength + 4) & 7);
        NameAfter = NameLength + pad;
        sprintf(header.Name, "#1/%i ", NameAfter);
    }
    else {
        // ELF and COFF library store names < 16 characters in the name field
        if (NameLength < 16) {
            // (Don't use sprintf to write header.Name here: It seems that Gnu sprintf checks the size of the 
            // buffer it is writing to. Gives buffer overrun error when termniating zero goes beyond the name field)
            memset(header.Name, ' ', 16);
            memcpy(header.Name, name, NameLength);
            header.Name[NameLength] = '/';
        }
        else {
            // store in LongNamesBuffer
            if (cmd.OutputType == FILETYPE_COFF) {
                // COFF: Name is zero-terminated
                i = LongNamesBuffer.PushString(name);
            }
            else {
                // ELF: Name terminated by "/\n"
                i = LongNamesBuffer.Push(name, NameLength);
                LongNamesBuffer.Push("/\n", 2);
            }
            // store index into long names member
            sprintf(header.Name, "/%i ", i);
        }
    }

    // Date
    sprintf(header.Date, "%u ", (uint32_t)time(0));

    // User and group id
    header.UserID[0] = '0';
    header.GroupID[0] = '0';
    // File mode
    strcpy(header.FileMode, "100666");
    // Size of binary file
    RawSize = member->GetDataSize();
    // Calculate alignment padding
    if (AlignBy) {
        AlignmentPadding = uint32_t(-int32_t(RawSize)) & (AlignBy-1);
    }

    // File size including name string
    sprintf(header.FileSize, "%u ", NameAfter + RawSize + AlignmentPadding);

    // Header end
    header.HeaderEnd[0] = '`';
    header.HeaderEnd[1] = '\n';

    // Remove terminating zeroes
    for (uint32_t i = 0; i < sizeof(SUNIXLibraryHeader); i++) {
        if (((char*)&header)[i] == 0) ((char*)&header)[i] = ' ';
    }

    // Store offset
    uint32_t offset = DataBuffer.GetDataSize();
    Indexes.Push(offset);

    // Store member header
    DataBuffer.Push(&header, sizeof(header));

    if (cmd.OutputType == FILETYPE_MACHO_LE) {    
        // Store member name after header if Mach-O
        if (NameAfter) {
            // Mach-O library stores name after header record.
            DataBuffer.PushString(name); 
        }
        DataBuffer.Align(AlignBy);
    }

    // Store member
    DataBuffer.Push(member->Buf(), RawSize);

    // Align by padding with '\n'
    for (uint32_t i = 0; i < AlignmentPadding; i++) {
        DataBuffer.Push("\n", 1);
    }

    // Member index
    uint32_t mindex = Indexes.GetNumEntries() - 1;

    // Get public string table
    switch(member->GetFileType()) {
    case FILETYPE_COFF: {
        CCOFF coff;
        *member >> coff;     // Translate member to type COFF
        coff.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
        *member << coff;     // Return buffer to member
        break;}

    case FILETYPE_OMF: {
        COMF omf;
        *member >> omf;      // Translate member to type COFF
        omf.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
        *member << omf;      // Return buffer to member
        break;}

    case FILETYPE_ELF:
        if (WordSize == 32) {
            // Make instance of file parser, 32 bit template
            CELF<ELF32STRUCTURES> elf;
            *member >> elf;      // Translate member to type ELF
            elf.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
            *member << elf;      // Return buffer to member
            break;
        }
        else {
            // Make instance of file parser, 64 bit template
            CELF<ELF64STRUCTURES> elf;
            *member >> elf;      // Translate member to type ELF
            elf.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
            *member << elf;      // Return buffer to member
            break;
        }

    case FILETYPE_MACHO_LE:
        if (WordSize == 32) {
            // Make instance of file parser, 32 bit template
            CMACHO<MAC32STRUCTURES> mac;
            *member >> mac;      // Translate member to type ELF
            mac.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
            *member << mac;      // Return buffer to member
            break;
        }
        else {
            // Make instance of file parser, 64 bit template
            CMACHO<MAC64STRUCTURES> mac;
            *member >> mac;      // Translate member to type ELF
            mac.PublicNames(&StringBuffer, &StringEntries, mindex); // Make list of public names
            *member << mac;      // Return buffer to member
            break;
        }

    default:                // Type not supported
        err.submit(2501, GetFileFormatName(member->GetFileType()));
        break;
    }
}

/*   unused:
char * CLibrary::TruncateMemberName(char const * name) {
    // Remove path and truncate object file name to 15 characters
    // This function removes any path from the member name,
    // changes the extension to the default for the the output file type,
    // changes any spaces to underscores, and 
    // truncates the member name to 15 characters for the sake of compatibility.
    // The return value is an ASCII string in a static buffer
    static char TruncName[32];          // Truncated name
    int maxlen;                         // Max length, not including extension
    char const * p1;                    // Point to start of name without path
    char const * extension;             // Default extension for file type
    int i;                              // Loop counter
    int len;                            // String length
    static int DummyNumber = 0;         // Count invalid/null names
    int FileType;                       // File type

    // Remove path
    len = (int)strlen(name);  p1 = name;
    for (i = len-1; i >= 0; i--) {
        if (name[i] == '/' || name[i] == '\\' || name[i] == ':') {
            p1 = name + i + 1; break;
        }
    }
    // Remove extension
    len = (int)strlen(p1);
    for (i = len-1; i >= 0; i--) {
        if (p1[i] == '.') {
            len = i;  break;
        }
    }

    // Check if any name remains
    if (len == 0) {     // No name. Make one
        sprintf(TruncName, "NoName%i", ++DummyNumber);
        p1 = TruncName;  len = (int)strlen(p1); 
    }

    // Get file type
    FileType = cmd.OutputType;
    if (FileType == CMDL_OUTPUT_DUMP || FileType == 0) FileType = cmd.InputType;
    if (FileType >= FILETYPE_LIBRARY) FileType = cmd.MemberType;

    // Get default extension and max length of name without extension
    if (FileType == FILETYPE_COFF || FileType == FILETYPE_OMF) {
        maxlen = 11;  extension = ".obj";
    }
    else {
        maxlen = 13;  extension = ".o";
    }
    if (len > maxlen) len = maxlen;

    // Truncate name
    strncpy(TruncName, p1, len);
    TruncName[len] = 0;

    // Remove any spaces or other illegal characters
    len = (int)strlen(TruncName);
    for (i = 0; i < len; i++) {
        if ((uint8_t)TruncName[i] <= 0x20) TruncName[i] = '_';
    }

    // Add default extension
    strcpy(TruncName+strlen(TruncName), extension);

    // Terminate
    TruncName[15] = 0;  
    return TruncName;
}
*/

char * CLibrary::StripMemberName(char * name) {
    // Remove path from zero-terminated library member name and set extension to default.
    // Note: Original long name is overwritten
    char * p1;                          // Point to start of name without path
    const char * extension = 0;         // Default extension for file type
    int i;                              // Loop counter
    int len0;                           // Original string length
    int len;                            // String length
    int nlen;                           // length of name without extension
    int elen = 0;                       // length of extension
    static int DummyNumber = 0;         // Count invalid/null names
    int FileType;                       // File type

    // Length
    len0 = len = (int)strlen(name);

    // Remove path
    p1 = name;
    for (i = len-1; i >= 0; i--) {
        if (name[i] == '/' || name[i] == '\\' || name[i] == ':') {
            p1 = name + i + 1; break;
        }
    }
    // move to begin of buffer
    if (p1 > name) {
        strcpy(name, p1);
    }
        
    // Get file type
    if (cmd.MemberType) {
        FileType = cmd.MemberType;
    }
    else if (cmd.LibraryOptions & CMDL_LIBRARY_EXTRACTMEM) {
        FileType = cmd.InputType;
    }
    else {    
        FileType = cmd.OutputType;
    }
    if (FileType == CMDL_OUTPUT_DUMP || FileType == 0) FileType = cmd.InputType;
    if (FileType >= FILETYPE_LIBRARY) FileType = cmd.MemberType;

    // Get default extension and max length of name without extension
    if (FileType == FILETYPE_COFF || FileType == FILETYPE_OMF) {
        extension = ".obj";  elen = 4;
    }
    else if (FileType == FILETYPE_ELF || FileType == FILETYPE_MACHO_LE || FileType == FILETYPE_MACHO_BE) {
        extension = ".o";  elen = 2;
    }

    // find extension
    len = (int)strlen(name);
    for (nlen = len-1; nlen >= 0; nlen--) {
        if (name[nlen] == '.') {
            break;
        }
    }

    // Remove any spaces or other illegal characters
    len = (int)strlen(name);
    for (i = 0; i < nlen; i++) {
        if ((uint8_t)name[i] <= 0x20 || name[i] == '.') name[i] = '_';
    }

    // Check if any name remains
    if ((len == 0 && len0 > 12) || nlen == 0) {     // No name. Make one
        sprintf(name, "NoName%i", ++DummyNumber);
        len = (int)strlen(name); 
    }

    // Replace extension
    if (len + elen <= len0 && extension != 0) {
        strcpy(name + nlen, extension);
    }
    // Terminate
    return name;
}


char * CLibrary::ShortenMemberName(char const *name) {
    // Truncate library member name to 15 characters and make unique
    // The path is removed and the extension set to default.
    // The original long name is not overwritten
    static char fixedName[32];          // Modified name
    char const * p1;                    // Point to start of name without path
    char const * extension;             // Default extension for file type
    int i;                              // Loop counter
    int len;                            // Filename length
    int len0;                           // Filename length without extension
    int elen;                           // length of extension
    static int RunningNumber = 0;       // Enumerate truncated names
    int FileType;                       // File type

    // Length
    len = (int)strlen(name);

    // Skip path
    p1 = name;
    for (i = len-1; i >= 0; i--) {
        if (name[i] == '/' || name[i] == '\\' || name[i] == ':') {
            p1 = name + i + 1; break;
        }
    }
    len = (int)strlen(name);

    // move to static buffer
    if (len > 15) len = 15;
    memcpy(fixedName, p1, len);
    fixedName[len] = 0;

    // find extension
    for (i = len-1; i >= 0; i--) {
        if (fixedName[i] == '.') {
            fixedName[i] = 0;  break;
        }
    }
    // length without extension
    len0 = (int)strlen(fixedName);

    // Remove any spaces or other illegal characters
    for (i = 0; i < len0; i++) {
        if ((uint8_t)fixedName[i] <= 0x20 || fixedName[i] == '.') fixedName[i] = '_';
    }

    // Check if any name remains
    if (len0 == 0) {     // No name. Make one
        sprintf(fixedName, "NoName_%X", RunningNumber++);
        len0 = (int)strlen(fixedName); 
    }

    // Get file type
    FileType = cmd.OutputType;
    if (FileType == CMDL_OUTPUT_DUMP || FileType == 0) FileType = cmd.InputType;
    if (FileType >= FILETYPE_LIBRARY) FileType = cmd.MemberType;

    // Get default extension and max length of name without extension
    if (FileType == FILETYPE_COFF || FileType == FILETYPE_OMF) {
        extension = ".obj";  elen = 4;
    }
    else {
        extension = ".o";  elen = 2;
    }

    // Make unique and add extension
    if (len0 + elen >= 15) {
        // Name is truncated or possibly identical to some other truncated name.
        // Insert 2-, 3- or 4-digit running hexadecimal number.
        if (RunningNumber < 0x100) {
            sprintf(fixedName + 12 - elen, "_%02X%s", RunningNumber++, extension);
        }
        else if (RunningNumber < 0x1000) {
            sprintf(fixedName + 12 - elen, "%03X%s", RunningNumber++, extension);
        }
        else {
            sprintf(fixedName + 11 - elen, "%04X%s", (RunningNumber++ & 0xFFFF), extension);
        }
    }
    else {
        // Short name. Just add extension
        strcpy(fixedName + len0, extension);
    }

    // Return static name buffer
    return fixedName;
}

/*  Unused:
int CLibrary::MemberNameExistsUNIX(char * name) {
    // Check if DataBuffer contains a member with this name
    char Name1[20], Name2[20];
    uint32_t i, j;

    // Terminate name without extension
    memcpy(Name1, name, 16);
    for (j = 0; j < 16; j++) {
        if (Name1[j] == '.' || Name1[j] == '/') Name1[j] = 0;
    }

    // Loop through previous members in DataBuffer
    for (i = 0; i < Indexes.GetNumEntries(); i++) {
        uint32_t offset = Indexes[i];
        // Copy name of member i
        memcpy(Name2, DataBuffer.Buf() + offset, 16);
        // Terminate name2
        for (j = 0; j < 16; j++) {
            if (Name2[j] == '.' || Name2[j] == '/') Name2[j] = 0;
        }
        // Case-insensitive compare of names
        if (stricmp(Name1, Name2) == 0) {
            // Identical name found
            return i + 1;
        }
    }
    // No identical name found
    return 0;
}*/


void CLibrary::SortStringTable() {
    // Sort the string table in ASCII order

    // Length of table
    int32_t n = StringEntries.GetNumEntries();
    if (n <= 0) return;

    // Point to table of SStringEntry records
    SStringEntry * Table = &StringEntries[0];
    // String pointers
    char * s1, * s2;
    // Temporary record for swapping
    SStringEntry temp;

    // Simple Bubble sort:
    int32_t i, j;
    for (i = 0; i < n; i++) {
        for (j = 0; j < n - i - 1; j++) {
            s1 = (char*)StringBuffer.Buf() + Table[j].String;
            s2 = (char*)StringBuffer.Buf() + Table[j+1].String;
            if (strcmp(s1, s2) > 0) {
                // Swap records
                temp = Table[j];
                Table[j] = Table[j+1];
                Table[j+1] = temp;
            }
        }
    }
    // Now StringEntries has been sorted. Reorder StringBuffer to the sort order.
    CMemoryBuffer SortedStringBuffer;    // Temporary buffer for strings in sort order
    for (i = 0; i < n; i++) {
        // Pointer to old string
        s1 = (char*)StringBuffer.Buf() + Table[i].String;
        // Update table to point to new string
        Table[i].String = SortedStringBuffer.GetDataSize();
        // Put string into SortedStringBuffer
        SortedStringBuffer.PushString(s1);
    }
    if (SortedStringBuffer.GetDataSize() != StringBuffer.GetDataSize()) {
        // The two string buffers should be same size
        err.submit(9000); return;
    }
    // Copy SortedStringBuffer into StringBuffer
    memcpy(StringBuffer.Buf(), SortedStringBuffer.Buf(), StringBuffer.GetDataSize());

    // Check for duplicate symbols
    for (i = 0; i < n-1; i++) {
        s1 = (char*)StringBuffer.Buf() + Table[i].String;
        for (j = i + 1; j < n; j++) {
            s2 = (char*)StringBuffer.Buf() + Table[j].String;
            if (strcmp(s1,s2) == 0) {
                // Duplicate found
                // Compose error string "Modulename1 and Modulename2"
                uint32_t errstring = LongNamesBuffer.GetDataSize();
                LongNamesBuffer.PushString(GetModuleName(Table[i].Member));
                LongNamesBuffer.SetSize(LongNamesBuffer.GetDataSize()-1); // remove terminating zero
                LongNamesBuffer.Push(" and ", 5);
                LongNamesBuffer.PushString(GetModuleName(Table[j].Member));
                err.submit(1214, s1, (char*)LongNamesBuffer.Buf() + errstring);
                LongNamesBuffer.SetSize(errstring);  // remove string again
                i++;  // Prevent excessive messages
            }
            else {
                break;
            }
        }
    }
}


uint32_t EndianChange(uint32_t n) {
    // Convert little-endian to big-endian number, or vice versa
    return (n << 24) | ((n & 0x0000FF00) << 8) | ((n & 0x00FF0000) >> 8) | (n >> 24);
}


uint32_t RoundEven(uint32_t n) {
    // Round up number to nearest even
    return (n + 1) & uint32_t(-2);
}


uint32_t Round4(uint32_t n) {
    // Round up number to nearest multiple of 4
    return (n + 3) & uint32_t(-4);
}


void CLibrary::MakeSymbolTableUnix() {
    // Make symbol table for COFF, ELF or MACHO library
    // Uses UNIX archive format for COFF, BSD and Mac
    uint32_t i;                              // Loop counter
    uint32_t MemberOffset;                   // Offset to member
    uint32_t LongNameSize = 0;               // Length of symbol table name if stored after record

    int SymbolTableType = cmd.OutputType;  // FILETYPE_COFF       = 1: COFF
    // FILETYPE_ELF        = 3: ELF
    // FILETYPE_MACHO_LE   = 4: Mac, unsorted
    //              0x10000004: Mac, sorted
    // Newer Mac tools require the sorted type, unless there are multiple publics with same name
    if (SymbolTableType == FILETYPE_MACHO_LE) SymbolTableType |= 0x10000000; 

    // Make symbol table header
    SUNIXLibraryHeader SymTab;             // Symbol table header
    memset(&SymTab, ' ', sizeof(SymTab));  // Fill with spaces
    SymTab.Name[0] = '/';                  // Name = '/'
    // The silly Mac linker requires that the symbol table has a date stamp not 
    // older than the .a file. Fix this by post-dating the symbol table:
    uint32_t PostDate = 0;
    if (SymbolTableType & 0x10000000) PostDate = 100; // Post-date if mac sorted symbol table
    sprintf(SymTab.Date, "%u ", (uint32_t)time(0) + PostDate); // Date stamp for symbol table

    SymTab.UserID[0] = '0';                // UserID = 0  (may be omitted in COFF)
    SymTab.GroupID[0] = '0';               // GroupID = 0 (may be omitted in COFF)
    strcpy(SymTab.FileMode, "100666");     // FileMode = 0100666 (may be 0 in COFF)

    SymTab.HeaderEnd[0] = '`';             // End with "`\n"
    SymTab.HeaderEnd[1] = '\n';

    // File header
    OutFile.Push("!<arch>\n", 8);

    uint32_t NumMembers = Indexes.GetNumEntries();        // Number of members
    uint32_t NumStrings = StringEntries.GetNumEntries();  // Number of symbol names
    uint32_t StringsLen = StringBuffer.GetDataSize();     // Size of string table

    // Calculate sizes of string index records, not including header
    // Unsorted index, used in ELF and COFF libraries
    uint32_t Index1Size = (NumStrings+1)*4 + StringsLen;
    // Sorted index, used in COFF libraries as second member
    uint32_t Index2Size = (NumMembers+2)*4 + NumStrings*2 + StringsLen;
    // Sorted index, used in Mach-O libraries
    uint32_t Index3Size = Round4(NumStrings*8 + 8 + StringsLen);
    // Longnames member
    uint32_t LongnamesMemberSize = 0;
    // Official MS COFF reference says that the "//" longnames member must be present,
    // even if it is unused, but MS LIB does not make it unless it is needed.
    // Here, we will include the longnames member only if it is needed
    if ((SymbolTableType == FILETYPE_COFF || SymbolTableType == FILETYPE_ELF) && LongNamesBuffer.GetDataSize()) {
        LongnamesMemberSize = sizeof(SUNIXLibraryHeader) + LongNamesBuffer.GetDataSize();
    }

    // Offset to first member
    uint32_t FirstMemberOffset = 0;
    switch (SymbolTableType) {
    case FILETYPE_COFF:
        FirstMemberOffset = 8 + 2*sizeof(SUNIXLibraryHeader) + RoundEven(Index1Size) 
            + RoundEven(Index2Size) + RoundEven(LongnamesMemberSize);
        break;
    case FILETYPE_ELF:
        FirstMemberOffset = 8 + sizeof(SUNIXLibraryHeader) + RoundEven(Index1Size) 
            + RoundEven(LongnamesMemberSize);
        break;
    case FILETYPE_MACHO_LE:
        FirstMemberOffset = 8 + sizeof(SUNIXLibraryHeader) + Index3Size;
        break;
    case FILETYPE_MACHO_LE | 0x10000000: // Mac, sorted
        LongNameSize = 20;
        FirstMemberOffset = 8 + sizeof(SUNIXLibraryHeader) + Index3Size + LongNameSize;
        break;      
    default:
        err.submit(2501, GetFileFormatName(cmd.OutputType));
    }

    // Make unsorted symbol table for COFF or ELF output
    if (SymbolTableType == FILETYPE_COFF || SymbolTableType == FILETYPE_ELF) {

        // Put file size into symbol table header
        sprintf(SymTab.FileSize, "%u ", Index1Size);
        // Remove terminating zeroes
        for (i = 0; i < sizeof(SymTab); i++) {
            if (((char*)&SymTab)[i] == 0) ((char*)&SymTab)[i] = ' ';
        }

        // Store header
        OutFile.Push(&SymTab, sizeof(SymTab));

        // Store table of offsets
        uint32_t BigEndian;             // Number converted to big-endian
        BigEndian = EndianChange(NumStrings);
        OutFile.Push(&BigEndian, sizeof(BigEndian));  // Number of symbols

        // Loop through strings
        for (i = 0; i < NumStrings; i++) {
            // Get record in temporary symbol table
            SStringEntry * psym = &StringEntries[i];
            // Get offset of member in DataBuffer
            MemberOffset = Indexes[psym->Member];
            // Add size of headers to compute member offset in final file
            BigEndian = EndianChange(MemberOffset + FirstMemberOffset);
            // Store offset as big endian number
            OutFile.Push(&BigEndian, sizeof(BigEndian));
        }

        // Store strings
        OutFile.Push(StringBuffer.Buf(), StringBuffer.GetDataSize());
        // Align by 2
        if (OutFile.GetDataSize() & 1) {
            OutFile.Push("\n", 1);
        }
    }

    // Sort string table
    if (!RepressWarnings && SymbolTableType != FILETYPE_MACHO_LE) SortStringTable();

    // Make sorted symbol table, COFF style
    if (SymbolTableType == FILETYPE_COFF) {
        if (NumMembers > 0xFFFF) err.submit(2502);  // Too many members

        // Reuse symbol table header, change size entry
        sprintf(SymTab.FileSize, "%u ", Index2Size);

        // Remove terminating zeroes
        for (i = 0; i < sizeof(SymTab); i++) {
            if (((char*)&SymTab)[i] == 0) ((char*)&SymTab)[i] = ' ';
        }
        // Store header
        OutFile.Push(&SymTab, sizeof(SymTab));

        // Store number of members
        OutFile.Push(&NumMembers, sizeof(NumMembers));

        // Store member offsets
        for (i = 0; i < NumMembers; i++) {
            MemberOffset = Indexes[i] + FirstMemberOffset;
            OutFile.Push(&MemberOffset, sizeof(MemberOffset));
        }

        // Store number of symbols
        OutFile.Push(&NumStrings, sizeof(NumStrings));

        // Store member index for each string
        // Loop through strings
        for (i = 0; i < NumStrings; i++) {
            // Get record in temporary symbol table
            SStringEntry * psym = &StringEntries[i];
            // Get member index, 16 bits
            uint16_t MemberI = (uint16_t)(psym->Member + 1);
            OutFile.Push(&MemberI, sizeof(MemberI));
        }

        // Store strings
        OutFile.Push(StringBuffer.Buf(), StringBuffer.GetDataSize());
        // Align by 2
        if (OutFile.GetDataSize() & 1) {
            OutFile.Push("\n", 1);
        }
    }

    // Make longnames table member for COFF or ELF output
    // (The decision whether to include a "//" longnames member is taken above)
    if (LongnamesMemberSize) {
        // reuse SymTab
        strcpy(SymTab.Name, "//       ");    // Name = "//"
        memset(SymTab.FileSize, ' ', 10);
        sprintf(SymTab.FileSize, "%u", LongNamesBuffer.GetDataSize());

        // Remove terminating zeroes
        for (i = 0; i < sizeof(SymTab); i++) {
            if (((char*)&SymTab)[i] == 0) ((char*)&SymTab)[i] = ' ';
        }
        // Store header
        OutFile.Push(&SymTab, sizeof(SymTab));
        // Store data
        OutFile.Push(LongNamesBuffer.Buf(), LongNamesBuffer.GetDataSize());
        // Align by 2
        if (OutFile.GetDataSize() & 1) {
            OutFile.Push("\n", 1);
        }
    }

    // Make sorted or unsorted symbol table, Mach-O style
    if ((SymbolTableType & 0xFFFF) == FILETYPE_MACHO_LE) {

        if (SymbolTableType & 0x10000000) {
            // Sorted table. "__.SYMDEF SORTED" stored as long name
            memcpy(SymTab.Name, "#1/20           ", 16);
            // Put file size into symbol table header, including long name length
            sprintf(SymTab.FileSize, "%u ", Index3Size + LongNameSize);
        }
        else {
            // Unsorted table. "__.SYMDEF" stored as short name
            memcpy(SymTab.Name, "__.SYMDEF       ", 16);
            // Put file size into symbol table header
            sprintf(SymTab.FileSize, "%u ", Index3Size & 0x3FFFFFF); // prevent string overflow
        }

        // Remove terminating zeroes
        for (i = 0; i < sizeof(SymTab); i++) {
            if (((char*)&SymTab)[i] == 0) ((char*)&SymTab)[i] = ' ';
        }

        // Store header
        OutFile.Push(&SymTab, sizeof(SymTab));

        if (SymbolTableType & 0x10000000) {
            // Store long name "__.SYMDEF SORTED"
            OutFile.Push("__.SYMDEF SORTED\0\0\0\0", LongNameSize);
        }

        // Store an array of records of string index and member offsets
        // Store length first
        uint32_t ArrayLength = NumStrings * sizeof(SStringEntry);
        OutFile.Push(&ArrayLength, sizeof(ArrayLength));

        // Loop through strings
        for (i = 0; i < NumStrings; i++) {
            // Get record in temporary symbol table
            SStringEntry * psym = &StringEntries[i];
            SStringEntry Record;
            Record.String = psym->String;
            Record.Member = Indexes[psym->Member] + FirstMemberOffset;
            // Store symbol record
            OutFile.Push(&Record, sizeof(Record));
        }

        // Store length of string table
        StringsLen = Round4(StringsLen);             // Round up to align by 4
        OutFile.Push(&StringsLen, sizeof(StringsLen));
        // Store strings
        OutFile.Push(StringBuffer.Buf(), StringBuffer.GetDataSize());
        // Align by 4
        OutFile.Align(4);
        // Cross check precalculated size (8 is the size of "!<arch>\n" file identifier) 
        if (OutFile.GetDataSize() != Index3Size + sizeof(SymTab) + 8 + LongNameSize) err.submit(9000);
    }
}


void CLibrary::MakeBinaryFile() {
    if (cmd.OutputType == FILETYPE_OMF) {
        MakeBinaryFileOMF();                       // OMF style output library
    }
    else {
        MakeBinaryFileUNIX();                      // UNIX style output library
    }
}


void CLibrary::MakeBinaryFileOMF() {
    // Make OMF library
    uint32_t PageSize;                              // Page size / alignment for output library
    uint32_t temp;                                  // Temporary
    uint16_t temp16;                                // Temporary
    uint8_t  temp8;                                 // Temporary
    uint32_t MemberI;                               // Member number
    uint32_t MemberOffset;                          // File offset of member in output file
    uint32_t MemberStart;                           // Start of member in DataBuffer
    uint32_t MemberEnd;                             // End of member in DataBuffer
    uint32_t SymbolI;                               // Public symbol number
    uint32_t DictionaryOffset2;                     // Offset to hash table
    CSList<uint32_t> MemberPageIndex;               // Remember page index of each member

    // Check number of entries
    if (DataBuffer.GetNumEntries() >= 0x8000) {
        err.submit(2606);  return;                 // Error: too big
    }

    // Find optimal page size
    PageSize = DataBuffer.GetDataSize() / (0x8000 - DataBuffer.GetNumEntries());
    // Make power of 2, minimum 16
    temp = FloorLog2(PageSize) + 1;
    if (temp < 4) temp = 4;
    PageSize = 1 << temp;

    // Make library header
    temp8 = OMF_LIBHEAD;
    OutFile.Push(&temp8, 1);                      // Library header type byte
    temp16 = PageSize - 3;
    OutFile.Push(&temp16, 2);                     // Record length
    OutFile.Push(0, 6);                           // Dictionary offset and size: insert later
    temp8 = 1;
    OutFile.Push(&temp8, 1);                      // Flag: case sensitive
    OutFile.Align(PageSize);                      // Align for first member

    // Allocate MemberPageIndex
    MemberPageIndex.SetNum(Indexes.GetNumEntries());

    // Insert members
    for (MemberI = 0; MemberI < Indexes.GetNumEntries(); MemberI++) {

        // Find member in DataBuffer 
        MemberStart = Indexes[MemberI];            // Start of member in DataBuffer
        if (MemberI+1 < Indexes.GetNumEntries()) {
            // Not last member
            MemberEnd = Indexes[MemberI+1];         // End of member in DataBuffer = start of next member
        }
        else {
            // Last member
            MemberEnd = DataBuffer.GetDataSize();   // End of member in DataBuffer = end of DataBuffer
        }

        // Put member into output file
        MemberOffset = OutFile.Push(DataBuffer.Buf() + MemberStart, MemberEnd - MemberStart);

        // Align next member
        OutFile.Align(PageSize);

        // Member page index
        MemberPageIndex[MemberI] = MemberOffset / PageSize;
    }

    // Change member index to member page index in StringEntries
    // Loop through StringEntries
    for (SymbolI = 0; SymbolI < StringEntries.GetNumEntries(); SymbolI++) {
        // Member index
        MemberI = StringEntries[SymbolI].Member;
        if (MemberI < MemberPageIndex.GetNumEntries()) {
            // Change to member page
            StringEntries[SymbolI].Member = MemberPageIndex[MemberI];
        }
    }

    // Make OMF_LIBEND record
    temp8 = OMF_LIBEND;
    OutFile.Push(&temp8, 1);                      // Library header type byte
    temp16 = PageSize - 3;                        // Length of rest of record
    OutFile.Push(&temp16, 2);                     // Record length
    OutFile.Align(PageSize);                      // Align

    // Offset to hash table
    DictionaryOffset2 = OutFile.GetDataSize();

    // Make hash table for public symbols
    COMFHashTable HashTable;
    HashTable.MakeHashTable(StringEntries, StringBuffer, OutFile, this); // Make hash table

    // Insert missing values in library header
    // Hash table offset
    OutFile.Get<uint32_t>(3) = DictionaryOffset2;

    // Hash table size
    OutFile.Get<uint16_t>(7) = (OutFile.GetDataSize() - DictionaryOffset2) / OMFBlockSize;
}


void CLibrary::MakeBinaryFileUNIX() {
    // Make UNIX library
    // Combine string index and members into binary file

    // Reserve file buffer for output file
    OutFile.SetSize(GetBufferSize());

    if (cmd.OutputType == FILETYPE_COFF || cmd.OutputType == FILETYPE_ELF || cmd.OutputType == FILETYPE_MACHO_LE) {
        // COFF, ELF and MAach-O libraries all use Unix-style archive with 
        // differences in symbol table format

        // Make symbol table
        MakeSymbolTableUnix();

        // Store all members
        OutFile.Push(DataBuffer.Buf(), DataBuffer.GetDataSize());
    }
    else {
        err.submit(2501, GetFileFormatName(cmd.OutputType));
    }
}


void CLibrary::CheckOMFHash(CMemoryBuffer &stringbuf, CSList<SStringEntry> &index) {
    // Check if OMF library hash table has correct entries for all symbol names
    uint32_t i;                                     // Loop counter
    char * Name;                                    // Public symbol name
    COMFHashTable HashTab;                          // OMF hash table interpreter
    uint32_t NString;                               // Number of occurrences of Name in hash table
    uint32_t Module;                                // Module with first occurrence of Name
    uint32_t Conf, ConfSum = 0;                     // Count number of conflicting entries in hash table

    // Initialize hash table interpreter
    HashTab.Init(&Get<SOMFHashBlock>(DictionaryOffset), DictionarySize);

    // Loop through public symbol names
    for (i = 0; i < index.GetNumEntries(); i++) {
        // Get public name
        Name = (char*)stringbuf.Buf() + index[i].String;
        // Make hash
        HashTab.MakeHash(Name);
        // Search for string
        NString = HashTab.FindString(Module, Conf);
        // Count conflicting strings
        ConfSum += Conf;

        // Make error message if not 1 occurrence of Name
        if (NString == 0) err.submit(2603, Name);  // Error if not found
        if (NString >  1) err.submit(1213, NString, Name);  // Warning more than one occurrence

        //printf("\n%i occurence of %s, module offset %i", NString, Name, Module);
    }
    printf("\n\nHash table %i blocks x 37 buckets at offet 0x%X.\n Efficiency: %i conflicts for %i entries",
        DictionarySize, DictionaryOffset, ConfSum, index.GetNumEntries());
}


const char * CLibrary::GetModuleName(uint32_t Index) {
    // Get name of module from index (UNIX) or page index (OMF)
    static char name[32];
    if (cmd.OutputType == FILETYPE_OMF || cmd.OutputType == FILETYPE_OMFLIBRARY) {
        // Get name of module in OMF library
        if (Index * PageSize < OutFile.GetDataSize() && OutFile.Get<uint8_t>(Index * PageSize) == OMF_THEADR) {
            SOMFRecordPointer rec;                     // Record pointer
            rec.Start(OutFile.Buf(), Index * PageSize, OutFile.GetDataSize());
            if (rec.Type2 == OMF_THEADR) {
                // Get module name from THEADR record
                strncpy(name, rec.GetString(), 16);
                // Make sure name is not too long
                name[16] = 0;
                // Return name
                return name;
            }
        }
        // No module starts here
        return "?";
    }
    // UNIX style library.
    if (Index < Indexes.GetNumEntries()) {
        // Get offset from Index
        uint32_t Offset = Indexes[Index];
        if (Offset < DataBuffer.GetDataSize()) {
            // Copy name from header
            memcpy(name, DataBuffer.Buf() + Offset, 16);
            // Check for long name
            if (strncmp(name, "#1/", 3) == 0) {
                // Long name after record
                memcpy(name, DataBuffer.Buf()+Offset+sizeof(SUNIXLibraryHeader), 16);
            }
            else if (name[0] == '/') {
                // Long name in longnames record
                uint32_t NameIndex = atoi(name+1);
                if (NameIndex < LongNamesSize) {
                    return (char*)Buf() + LongNames + NameIndex;
                }
                else {
                    return "?";
                }
            }

            // Find terminating '/'
            for (int i = 0; i < 16; i++) if (name[i] == '/') name[i] = 0;
            // Make sure name is not too long
            name[16] = 0;
            // return name
            return name;
        }
    }
    // Error
    return "?";
}