/*****************************************************************************/
/* */
-/* library.c */
+/* library.c */
/* */
-/* Library data structures and helpers for the ar65 archiver */
+/* Library data structures and helpers for the ar65 archiver */
/* */
/* */
/* */
-/* (C) 1998-2011, Ullrich von Bassewitz */
+/* (C) 1998-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
#include <errno.h>
/* common */
+#include "cmdline.h"
#include "exprdefs.h"
#include "libdefs.h"
#include "print.h"
/*****************************************************************************/
-/* Data */
+/* Data */
/*****************************************************************************/
+/* Name of the library file */
+const char* LibName = 0;
+
/* File descriptor for the library file */
-FILE* NewLib = 0;
-static FILE* Lib = 0;
-static const char* LibName = 0;
+FILE* NewLib = 0;
+static FILE* Lib = 0;
/* The library header */
-static LibHeader Header = {
+static LibHeader Header = {
LIB_MAGIC,
LIB_VERSION,
0,
/*****************************************************************************/
-/* Writing file data structures */
+/* Writing file data structures */
/*****************************************************************************/
/* Read the header fields, checking magic and version */
Header.Magic = Read32 (Lib);
if (Header.Magic != LIB_MAGIC) {
- Error ("`%s' is not a valid library file", LibName);
+ Error ("`%s' is not a valid library file", LibName);
}
Header.Version = Read16 (Lib);
if (Header.Version != LIB_VERSION) {
- Error ("Wrong data version in `%s'", LibName);
+ Error ("Wrong data version in `%s'", LibName);
}
Header.Flags = Read16 (Lib);
Header.IndexOffs = Read32 (Lib);
/* Read one entry in the index */
{
/* Create a new entry and insert it into the list */
- ObjData* O = NewObjData ();
+ ObjData* O = NewObjData ();
/* Module name/flags/MTime/Start/Size */
O->Name = ReadStr (Lib);
/* Read all entries in the index */
while (Count--) {
- ReadIndexEntry ();
+ ReadIndexEntry ();
}
/* Read basic object file data from the actual entries */
/*****************************************************************************/
-/* Writing file data structures */
+/* Writing file data structures */
/*****************************************************************************/
/* Write the object files */
for (I = 0; I < CollCount (&ObjPool); ++I) {
- WriteIndexEntry (CollConstAt (&ObjPool, I));
+ WriteIndexEntry (CollConstAt (&ObjPool, I));
}
}
/*****************************************************************************/
-/* High level stuff */
+/* High level stuff */
/*****************************************************************************/
Lib = fopen (Name, "rb");
if (Lib == 0) {
- /* File does not exist */
- if (MustExist) {
- Error ("Library `%s' does not exist", Name);
- } else {
- Warning ("Library `%s' not found - will be created", Name);
- }
+ /* File does not exist */
+ if (MustExist) {
+ Error ("Library `%s' does not exist", Name);
+ } else {
+ /* Announce the library's creation if ar65 is verbose. */
+ Print (stdout, 1,
+ "%s: Library `%s' will be created.\n", ProgName, Name);
+ }
} else {
/* We have an existing file: Read the header */
- ReadHeader ();
+ ReadHeader ();
- /* Now read the existing index */
- ReadIndex ();
+ /* Now read the existing index */
+ ReadIndex ();
}
if (NeedTemp) {
- /* Create the temporary library */
- NewLib = tmpfile ();
- if (NewLib == 0) {
- Error ("Cannot create temporary file: %s", strerror (errno));
- }
-
- /* Write a dummy header to the temp file */
- WriteHeader ();
+ /* Create the temporary library */
+ NewLib = tmpfile ();
+ if (NewLib == 0) {
+ Error ("Cannot create temporary file: %s", strerror (errno));
+ }
+
+ /* Write a dummy header to the temp file */
+ WriteHeader ();
}
}
/* Copy loop */
while (Bytes) {
- unsigned Count = (Bytes > sizeof (Buf))? sizeof (Buf) : Bytes;
- ReadData (F, Buf, Count);
- WriteData (NewLib, Buf, Count);
- Bytes -= Count;
+ unsigned Count = (Bytes > sizeof (Buf))? sizeof (Buf) : Bytes;
+ ReadData (F, Buf, Count);
+ WriteData (NewLib, Buf, Count);
+ Bytes -= Count;
}
/* Return the start position */
/* Copy loop */
while (Bytes) {
- unsigned Count = (Bytes > sizeof (Buf))? sizeof (Buf) : Bytes;
- ReadData (Lib, Buf, Count);
- WriteData (F, Buf, Count);
- Bytes -= Count;
+ unsigned Count = (Bytes > sizeof (Buf))? sizeof (Buf) : Bytes;
+ ReadData (Lib, Buf, Count);
+ WriteData (F, Buf, Count);
+ Bytes -= Count;
}
}
unsigned I;
/* Let the user know what we do */
- Print (stdout, 1, "Module `%s' (%u exports):\n", O->Name, CollCount (&O->Exports));
+ Print (stdout, 2, "Module `%s' (%u exports):\n", O->Name, CollCount (&O->Exports));
/* Insert the exports into the global table */
for (I = 0; I < CollCount (&O->Exports); ++I) {
/* Get the name of the export */
- const char* Name = CollConstAt (&O->Exports, I);
+ const char* Name = CollConstAt (&O->Exports, I);
- /* Insert the name into the hash table */
- Print (stdout, 1, " %s\n", Name);
- ExpInsert (Name, O);
+ /* Insert the name into the hash table */
+ Print (stdout, 2, " %s\n", Name);
+ ExpInsert (Name, O);
}
}
/* Do we have a temporary library? */
if (NewLib) {
- unsigned I;
- unsigned char Buf [4096];
- size_t Count;
+ unsigned I;
+ unsigned char Buf [4096];
+ size_t Count;
/* Walk through the object file list, inserting exports into the
- * export list checking for duplicates. Copy any data that is still
- * in the old library into the new one.
- */
- for (I = 0; I < CollCount (&ObjPool); ++I) {
-
- /* Get a pointer to the object */
- ObjData* O = CollAtUnchecked (&ObjPool, I);
-
- /* Check exports, make global export table */
- LibCheckExports (O);
-
- /* Copy data if needed */
- if ((O->Flags & OBJ_HAVEDATA) == 0) {
- /* Data is still in the old library */
- fseek (Lib, O->Start, SEEK_SET);
- O->Start = ftell (NewLib);
- LibCopyTo (Lib, O->Size);
- O->Flags |= OBJ_HAVEDATA;
- }
- }
-
- /* Write the index */
- WriteIndex ();
-
- /* Write the updated header */
- WriteHeader ();
-
- /* Close the file */
- if (Lib && fclose (Lib) != 0) {
- Error ("Error closing library: %s", strerror (errno));
- }
-
- /* Reopen the library and truncate it */
- Lib = fopen (LibName, "wb");
- if (Lib == 0) {
- Error ("Cannot open library `%s' for writing: %s",
- LibName, strerror (errno));
- }
-
- /* Copy the new library to the new one */
- fseek (NewLib, 0, SEEK_SET);
- while ((Count = fread (Buf, 1, sizeof (Buf), NewLib)) != 0) {
- if (fwrite (Buf, 1, Count, Lib) != Count) {
- Error ("Cannot write to `%s': %s", LibName, strerror (errno));
- }
- }
+ * export list checking for duplicates. Copy any data that is still
+ * in the old library into the new one.
+ */
+ for (I = 0; I < CollCount (&ObjPool); ++I) {
+
+ /* Get a pointer to the object */
+ ObjData* O = CollAtUnchecked (&ObjPool, I);
+
+ /* Check exports, make global export table */
+ LibCheckExports (O);
+
+ /* Copy data if needed */
+ if ((O->Flags & OBJ_HAVEDATA) == 0) {
+ /* Data is still in the old library */
+ fseek (Lib, O->Start, SEEK_SET);
+ O->Start = ftell (NewLib);
+ LibCopyTo (Lib, O->Size);
+ O->Flags |= OBJ_HAVEDATA;
+ }
+ }
+
+ /* Write the index */
+ WriteIndex ();
+
+ /* Write the updated header */
+ WriteHeader ();
+
+ /* Close the file */
+ if (Lib && fclose (Lib) != 0) {
+ Error ("Error closing library: %s", strerror (errno));
+ }
+
+ /* Reopen the library and truncate it */
+ Lib = fopen (LibName, "wb");
+ if (Lib == 0) {
+ Error ("Cannot open library `%s' for writing: %s",
+ LibName, strerror (errno));
+ }
+
+ /* Copy the new library to the new one */
+ fseek (NewLib, 0, SEEK_SET);
+ while ((Count = fread (Buf, 1, sizeof (Buf), NewLib)) != 0) {
+ if (fwrite (Buf, 1, Count, Lib) != Count) {
+ Error ("Cannot write to `%s': %s", LibName, strerror (errno));
+ }
+ }
}
/* Close both files */
if (Lib && fclose (Lib) != 0) {
- Error ("Problem closing `%s': %s", LibName, strerror (errno));
+ Error ("Problem closing `%s': %s", LibName, strerror (errno));
}
if (NewLib && fclose (NewLib) != 0) {
- Error ("Problem closing temporary library file: %s", strerror (errno));
- }
+ Error ("Problem closing temporary library file: %s", strerror (errno));
+ }
}
projects / cc65 / blobdiff