Make splitold usable for nname files, too. It now also converts \0 to \n.

1 files changed, 16 insertions, 11 deletions

diff --git a/src/splitold.c b/src/splitold.c
index 847eb2c..bd85775 100644
--- a/src/splitold.c
+++ b/src/splitold.c
@@ -1,4 +1,3 @@
-#include "mystdlib.h"
 #include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -6,31 +5,37 @@
 #include <stdlib.h>
 #include <string.h>
 
-int main() {
-  char table[64];
-  int  outfiles[64], i, off;
+int main( int argc, char **args ) {
+  char table[64], f[1024*1024*16];
+  int  outfiles[64], i, off, base = 0;
+  uint32_t fixed_columns = 0;
+
+  if( argc > 1 ) base = atol( args[1] );
+  if( argc > 2 ) fixed_columns = atol( args[2] );
 
   for( i=0; i<64; ++i ) outfiles[i] = -1;
   while( fgets( table, sizeof(table), stdin ) ) {
     int off = ( table[strlen(table)-1] = 0 ); /* fgets sucks */
-    MAP f = map_file( table, 1 );
-    uint32_t *p = (uint32_t*)(f->addr);
-    uint32_t count = p[0], columns = p[1] / 4 - 1;
+    int f_in = open( table, O_RDONLY );
+    size_t s_in = read( f_in, f, sizeof(f));
+    uint32_t *p = (uint32_t*)f;
+    uint32_t count = p[0], columns = fixed_columns ? fixed_columns : p[1] / 4 - 1;
     unsigned int file, strnr;
 
+    close(f_in);
+
     for( file=0; file<columns; ++file ) {
       /* Create outfile, if it is not yet there */
       if( outfiles[file] == -1 ) {
-        sprintf( table, "%02d_unknown", file+4 );
+        sprintf( table, "%02d_unknown", file+base );
         outfiles[file] = open( table, O_WRONLY | O_APPEND | O_CREAT, 0644 );
         if ( outfiles[file] == -1 ) exit(1);
       }
       off = p[file+1];
       /* Look for end of this chunk, which is <count> strings long */
-      for( strnr=0; strnr < count; ++strnr ) while( f->addr[off++] );
-      write( outfiles[file], f->addr + p[file+1], off - p[file+1] );
+      for( strnr=0; strnr < count; ++strnr ) { while( f[off++] ) {}; f[off-1] = '\n'; }
+      write( outfiles[file], f + p[file+1], off - p[file+1] );
     }
-    unmap_file(&f);
   }
   for( i=0; i<64; ++i ) close( outfiles[i] );
   return 0;