Commit: bfb799dd8c9655d53b9e7aaf478b2112a06fd0ca - mingw-catgets (git)

POSIX.1 National Language Support API for MinGW

Commit MetaInfo

• Revisión: bfb799dd8c9655d53b9e7aaf478b2112a06fd0ca (tree)
• Tiempo: 2008-01-11 07:47:42
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

* gencat.c: Delay writing the catalogue header until *after* the message data has been fully committed; store the ultimate catalogue size in the header record, then rewind to write header and index records sequentially.

Cambiar Resumen

• modified: ChangeLog
• modified: gencat.c

Diferencia incremental

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	* gencat.c: Delay writing the catalogue header until *after* the
+	message data has been fully committed; store the ultimate catalogue
+	size in the header record, then rewind to write header and index
+	records sequentially.
+
 2008-01-09  Keith Marshall  <[e-mail]>
 
 	* README: Some minor wording improvements.

--- a/gencat.c
+++ b/gencat.c
@@ -258,12 +258,11 @@ int main( int argc, char **argv )
       return EXIT_FAILURE;
     }
 
-    /* Write out the standard message catalogue header record,
-     * then seek beyond the space required for the index image,
-     * to commence writing out the message data.
+    /* Seek forward in the temporary output file,
+     * to reserve space into which we will later write the message
+     * catalogue header record, and the message index.
      */
-    write( mc, &cat_index, sizeof( MSGCAT ) );
-    offset = lseek( mc, offset, SEEK_CUR );
+    offset = lseek( mc, sizeof( MSGCAT ) + offset, SEEK_SET );
 
     /* Compute the offset, ON DISK, for the start of the message
      * index, within the composite set and message index image, in
@@ -309,12 +308,18 @@ int main( int argc, char **argv )
       offset += write( mc, curr->base + curr->loc, curr->len );
     }
 
-    /* Rewind the catalogue, to the start of the reserved index space...
+    /* Store the effective data size of the catalogue into the header.
      */
-    lseek( mc, sizeof( MSGCAT ), SEEK_SET );
-    /*
-     * Locate the start of the in-memory image of the index, once more,
-     * and copy it into the generated message catalogue.
+    cat_index.mc.extent = offset;
+
+    /* Rewind, and write out the message catalogue header record,
+     * at the start of the file space reserved previously.
+     */
+    lseek( mc, 0L, SEEK_SET );
+    write( mc, &cat_index, sizeof( MSGCAT ) );
+
+    /* Locate the start of the in-memory image of the index, once more,
+     * and copy it into the remaining reserved space in the output file.
      */
     set_index = msg_index - numsets - msgcount;
     write( mc, set_index, (numsets + msgcount) * sizeof( struct key ) );
@@ -388,4 +393,4 @@ int main( int argc, char **argv )
   return EXIT_SUCCESS;
 }
 
-/* $RCSfile$Revision: 1.4 $: end of file */
+/* $RCSfile$Revision: 1.5 $: end of file */