Merge remote-tracking branch 'refs/remotes/origin/master'

7 files changed, 19 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 500c0ad..c2d04d4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ bin/map_coords: src/export/map_coords.c src/export/mystdlib.c
         $(CC) $(CFLAGS) -o $@ src/export/map_coords.c src/export/mystdlib.c
 
 bin/convert_coords: src/export/convert_coords.c
-        $(CC) $(CFLAGS) -o $@ -lm src/export/convert_coords.c
+        $(CC) $(CFLAGS) -o $@ src/export/convert_coords.c -lm
 
 bin/join: src/postprocess/join.c src/export/mystdlib.c
         $(CC) $(CFLAGS) -o $@ src/postprocess/join.c src/export/mystdlib.c -Isrc/export
diff --git a/README b/README
index ef9f374..744b020 100644
--- a/README
+++ b/README
@@ -53,4 +53,10 @@ Now we look at the continuation entry parts: A column_id of 0x4003 denotes a sta
 version 3
 =========
 
-TBD.
+Some of the files on disc are obfuscated while others are plain. They consist of chunks of lha compressed data (as readable by the lha command). The obfuscation is a simple XOR of the first 32 (for streets: 34) bytes with a static 4 byte key that changes with every CD. Since lha headers do have a static signature (i.e. -lh5-), it's easy to derive the current key by xoring the static value with the bytes found in the file. Conveniently un-obfuscated files generate a all-zero key and don't need special treatment. The path name of each chunk is identical so it must be re-written and the header checksum must be re-calculated.
+
+After decompressing all files (quite a lot, it's split at 3k entries per file) from dat/teiln.dat (case insensitive), we get three kinds of files: one with all Vorname columns, one with all Nachname columns and one with the rest of the columns. Before 2000_Q1 files {0,3,6,...} were Nachname, {1,4,7,...} were Vorname and {2,5,8,...} were all the other tables. After 2000_Q1 (incl.) {0,3,6,...} were all other columns, while {1,4,7,...} were Nachname and {2,5,8,...} Vorname columns. The first char in each entry in the Nachname column contains a continuation flag, where "1" means single line entry, "3" is the first and "2" are the remaining lines in a continuation.
+
+If there is a dat/strassen.dat (case insensitive), the concatenated decompressed chunks are a list of all street names referenced in the street/hnr column.
+
+If there is a dat/karto.dat (case insensitive), the concatenated decompressed chunks are a sorted list of all zip/streetname(/hnr) combinations on that CD, each line finished by the geo coordinates of that address.
diff --git a/src/export/extract_version_1.c b/src/export/extract_version_1.c
index 0e03e1e..c727b4f 100644
--- a/src/export/extract_version_1.c
+++ b/src/export/extract_version_1.c
@@ -210,13 +210,13 @@ int main( )
     /* Write out results */
     for( i=0; i<14; ++i ) {
       /* if( g_state.outfill[i] > 1024*1024*6 ) printf( "Large: %s %zd\n", g_state.ort, g_state.outfill[i] ); */
-      write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+      (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
       g_state.outfill[i]  = 0;
     }
   }
 
   for( i=0; i<14; ++i ) {
-    write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+    (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
     close( g_state.outfiles[i] );
   }
 
diff --git a/src/export/extract_version_3.c b/src/export/extract_version_3.c
index c4914a7..329c1a8 100644
--- a/src/export/extract_version_3.c
+++ b/src/export/extract_version_3.c
@@ -113,11 +113,11 @@ int main( int args, char **argv )
         /* Open file and dump our de-"crypted" header and then rest of file */
         fh = open( filename, O_CREAT | O_TRUNC | O_WRONLY, 0644 );
         if( enc_len > header_len ) {
-            write( fh, df, enc_len );
-            write( fh, mf + enc_len, offset - old_offset - enc_len );
+            (void)write( fh, df, enc_len );
+            (void)write( fh, mf + enc_len, offset - old_offset - enc_len );
         } else {
-            write( fh, df, header_len );
-            write( fh, mf + header_len, offset - old_offset - header_len );
+            (void)write( fh, df, header_len );
+            (void)write( fh, mf + header_len, offset - old_offset - header_len );
         }
         close( fh );
     }
diff --git a/src/export/extract_version_4.c b/src/export/extract_version_4.c
index 735cb3a..252831a 100644
--- a/src/export/extract_version_4.c
+++ b/src/export/extract_version_4.c
@@ -50,7 +50,7 @@ error_continue:
       fprintf( stderr, "Could not open output file %s\n", respath );
       exit(1);
     }
-    write( resfile, output, z.total_out );
+    (void)write( resfile, output, z.total_out );
     close( resfile );
     offs += z.total_in;
 
diff --git a/src/export/split_version_2.c b/src/export/split_version_2.c
index 54e2313..6eafe55 100644
--- a/src/export/split_version_2.c
+++ b/src/export/split_version_2.c
@@ -237,16 +237,17 @@ int main( int args, char **argv ) {
     if( g_state.outfill[0] > limit )
       for( i=0; i<g_outfiles; ++i ) {
         if( g_state.outfill[i] > 1024*1024*6 ) printf( "Large: %zd\n", g_state.outfill[i] );
-        write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+        (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
         g_state.outfill[i]  = 0;
       }
   }
 
   for( i=0; i<g_outfiles; ++i ) {
-    write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
+    (void)write( g_state.outfiles[i], g_state.outbuf[i], g_state.outfill[i] );
     close( g_state.outfiles[i] );
   }
   unmap_file( &data );
   unmap_file( &index );
 
+  return 0;
 }
diff --git a/src/export/split_version_3.c b/src/export/split_version_3.c
index 2019762..853d95d 100644
--- a/src/export/split_version_3.c
+++ b/src/export/split_version_3.c
@@ -49,7 +49,7 @@ int main( int argc, char **args ) {
       off = p[file+1];
       /* Look for end of this chunk, which is <count> strings long */
       for( strnr=0; strnr < count; ++strnr ) { while( f[off++] ) {}; f[off-1] = '\n'; }
-      write( outfiles[file], f + p[file+1], off - p[file+1] );
+      (void)write( outfiles[file], f + p[file+1], off - p[file+1] );
     }
   }