General:

o Added global static chars mainPrompt and continuePrompt.
o Moved Argv0 declaration to head of file. Needed in do_meta_command,
  previously found below that.
o Added struct previous_mode_data to support new .explain toggle
  functionality.
o Added nullvalue, explainPrev and outfile members to
  struct callback_data.
o Added modeDescr array for number/text translation ofdisplay modes.
o Modified zHelp to match new functionality.

callback():
o Added support for .nullvalue

do_meta_command():
o Output filename is now saved to callback struct. If using stdout,
  then the string "stdout" is saved.
o Explain is now a toggle. When it is turned on, the current values of
  mode, header and colWidth are saved if not already in explain mode.
  When turned off, those values are restored.
o Allow .mode plurals columns and lines and dot command plural
  .headers.
o Added processing for new keywords .quit, .nullvalue, .show, .prompt.

main():
o Added -init as an option to override .sqliterc.
o Added -nullvalue as a command line option.
o Processes .sqliterc.

main_init():
o Genesis. Moved some initialization code here from inside main() so
  that it can be called initially by main and again if -init is
  specified.

one_input_line():
o Now takes prompts from settable values.

process_sqliterc():
o Genesis. Read .sqliterc from user's home directory and pass it to
  process_input(). File should contain meta commands for setups. (CVS 531)

FossilOrigin-Name: e751338c468cdad79efcc5cd5b924eb2c1eb3c3a

manifest

@@ -1,5 +1,5 @@
-C Fix\sfor\sticket\s#19:\sDo\snot\scall\ssqliteOsSync()\sif\sthe\sonly\schanges\swere\nchanges\sto\sTEMP\stables.\s(CVS\s530)
+C General:\r\no\sAdded\sglobal\sstatic\schars\smainPrompt\sand\scontinuePrompt.\r\no\sMoved\sArgv0\sdeclaration\sto\shead\sof\sfile.\sNeeded\sin\sdo_meta_command,\r\n\s\spreviously\sfound\sbelow\sthat.\r\no\sAdded\sstruct\sprevious_mode_data\sto\ssupport\snew\s.explain\stoggle\r\n\s\sfunctionality.\r\no\sAdded\snullvalue,\sexplainPrev\sand\soutfile\smembers\sto\r\n\s\sstruct\scallback_data.\r\no\sAdded\smodeDescr\sarray\sfor\snumber/text\stranslation\sofdisplay\smodes.\r\no\sModified\szHelp\sto\smatch\snew\sfunctionality.\r\n\r\ncallback():\r\no\sAdded\ssupport\sfor\s.nullvalue\r\n\r\ndo_meta_command():\r\no\sOutput\sfilename\sis\snow\ssaved\sto\scallback\sstruct.\sIf\susing\sstdout,\r\n\s\sthen\sthe\sstring\s"stdout"\sis\ssaved.\r\no\sExplain\sis\snow\sa\stoggle.\sWhen\sit\sis\sturned\son,\sthe\scurrent\svalues\sof\r\n\s\smode,\sheader\sand\scolWidth\sare\ssaved\sif\snot\salready\sin\sexplain\smode.\r\n\s\sWhen\sturned\soff,\sthose\svalues\sare\srestored.\r\no\sAllow\s.mode\splurals\scolumns\sand\slines\sand\sdot\scommand\splural\r\n\s\s.headers.\r\no\sAdded\sprocessing\sfor\snew\skeywords\s.quit,\s.nullvalue,\s.show,\s.prompt.\r\n\r\nmain():\r\no\sAdded\s-init\sas\san\soption\sto\soverride\s.sqliterc.\r\no\sAdded\s-nullvalue\sas\sa\scommand\sline\soption.\r\no\sProcesses\s.sqliterc.\r\n\r\nmain_init():\r\no\sGenesis.\sMoved\ssome\sinitialization\scode\shere\sfrom\sinside\smain()\sso\r\n\s\sthat\sit\scan\sbe\scalled\sinitially\sby\smain\sand\sagain\sif\s-init\sis\r\n\s\sspecified.\r\n\r\none_input_line():\r\no\sNow\stakes\sprompts\sfrom\ssettable\svalues.\r\n\r\nprocess_sqliterc():\r\no\sGenesis.\sRead\s.sqliterc\sfrom\suser's\shome\sdirectory\sand\spass\sit\sto\r\n\s\sprocess_input().\sFile\sshould\scontain\smeta\scommands\sfor\ssetups.\s(CVS\s531)
-D 2002-04-18T01:56:58
+D 2002-04-18T02:46:52
 F Makefile.in 50f1b3351df109b5774771350d8c1b8d3640130d
 F Makefile.template 89e373b2dad0321df00400fa968dc14b61a03296
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -39,7 +39,7 @@ F src/parse.y 9a8a2311dd95101bb02b3991042e619eea49729a
 F src/printf.c 300a90554345751f26e1fc0c0333b90a66110a1d
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c 92aef3f69e90dc065d680d88b1f075409e9249bb
-F src/shell.c 66bf0478c35343d9b795e435b54b45a4ab29f2ef
+F src/shell.c 33e2574f368b86429a4c024904f8b59fb1e85d2d
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in ffcacf73b5ed1a4939205d29a704a185758fa6a6
 F src/sqliteInt.h e47ca9267a4c4a98e9f8d90c2df994a18f23d699
@@ -131,7 +131,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 7edd13468e24d79939f0fa1e58f3b686422ca826
+P 33da20b9c1a8eef16ad7ab5929bb8937c75090f2
-R d6ef54d3be3cb5d13a1592b37489d27e
+R 22639d7fa7e5265cffcc98ada271b214
-U drh
+U persicom
-Z aa513408483afd37049a6b0b765b2614
+Z 815a973506ea65e8eef7ca2e9e1c8d70

manifest.uuid

@@ -1 +1 @@
-33da20b9c1a8eef16ad7ab5929bb8937c75090f2
+e751338c468cdad79efcc5cd5b924eb2c1eb3c3a

src/shell.c

@@ -12,13 +12,16 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.50 2002/04/13 23:42:24 drh Exp $
+** $Id: shell.c,v 1.51 2002/04/18 02:46:52 persicom Exp $
 */
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include "sqlite.h"
 #include <ctype.h>
+#include <pwd.h>
+#include <sys/types.h>
+
 #if !defined(_WIN32) && !defined(WIN32)
 # include <signal.h>
 #endif
@@ -38,6 +41,19 @@
 */
 static sqlite *db = 0;
 
+/*
+** This is the name of our program. It is set in main(), used
+** in a number of other places, mostly for error messages.
+*/
+static char *Argv0;
+
+/*
+** Prompt strings. Initialized in main. Settable with
+**   .prompt main continue
+*/
+static char mainPrompt[20];     /* First line prompt. default: "sqlite> "*/
+static char continuePrompt[20]; /* Continuation prompt. default: "   ...> " */
+
 /*
 ** This routine reads a line of text from standard input, stores
 ** the text in memory obtained from malloc() and returns a pointer
@@ -104,15 +120,21 @@ static char *one_input_line(const char *zPrior, FILE *in){
     return getline(0, in);
   }
   if( zPrior && zPrior[0] ){
-    zPrompt = "   ...> ";
+    zPrompt = continuePrompt;
   }else{
-    zPrompt = "sqlite> ";
+    zPrompt = mainPrompt;
   }
   zResult = readline(zPrompt);
   if( zResult ) add_history(zResult);
   return zResult;
 }
 
+struct previous_mode_data {
+  int valid;        /* Is there legit data in here? */
+  int mode;
+  int showHeader;
+  int colWidth[100];
+};
 /*
 ** An pointer to an instance of this structure is passed from
 ** the main program to the callback.  This is used to communicate
@@ -129,6 +151,11 @@ struct callback_data {
   char separator[20];    /* Separator character for MODE_List */
   int colWidth[100];     /* Requested width of each column when in column mode*/
   int actualWidth[100];  /* Actual width of each column */
+  char nullvalue[20];    /* The text to print when a NULL comes back from the database */
+  struct previous_mode_data explainPrev;
+                         /* Holds the mode information just before .explain ON */
+  char outfile[FILENAME_MAX];
+                         /* Filename for *out */
 };
 
 /*
@@ -140,6 +167,16 @@ struct callback_data {
 #define MODE_Semi     3  /* Same as MODE_List but append ";" to each line */
 #define MODE_Html     4  /* Generate an XHTML table */
 #define MODE_Insert   5  /* Generate SQL "insert" statements */
+#define MODE_NUM_OF   6
+
+char *modeDescr[MODE_NUM_OF] = {
+  "line",
+  "column",
+  "list",
+  "semi",
+  "html",
+  "insert"
+};
 
 /*
 ** Number of elements in an array
@@ -251,7 +288,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
       }
       if( p->cnt++>0 ) fprintf(p->out,"\n");
       for(i=0; i<nArg; i++){
-        fprintf(p->out,"%*s = %s\n", w, azCol[i], azArg[i] ? azArg[i] : 0);
+        fprintf(p->out,"%*s = %s\n", w, azCol[i], azArg[i] ? azArg[i] : p->nullvalue);
       }
       break;
     }
@@ -267,7 +304,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
           if( w<=0 ){
             w = strlen(azCol[i] ? azCol[i] : "");
             if( w<10 ) w = 10;
-            n = strlen(azArg && azArg[i] ? azArg[i] : "");
+            n = strlen(azArg && azArg[i] ? azArg[i] : p->nullvalue);
             if( w<n ) w = n;
           }
           if( i<ArraySize(p->actualWidth) ){
@@ -300,7 +337,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
            w = 10;
         }
         fprintf(p->out,"%-*.*s%s",w,w,
-            azArg[i] ? azArg[i] : "", i==nArg-1 ? "\n": "  ");
+            azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": "  ");
       }
       break;
     }
@@ -314,7 +351,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
       if( azArg==0 ) break;
       for(i=0; i<nArg; i++){
         char *z = azArg[i];
-        if( z==0 ) z = "";
+        if( z==0 ) z = p->nullvalue;
         fprintf(p->out, "%s", z);
         if( i<nArg-1 ){
           fprintf(p->out, "%s", p->separator);
@@ -338,7 +375,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
       fprintf(p->out,"<TR>");
       for(i=0; i<nArg; i++){
         fprintf(p->out,"<TD>");
-        output_html_string(p->out, azArg[i] ? azArg[i] : "");
+        output_html_string(p->out, azArg[i] ? azArg[i] : p->nullvalue);
         fprintf(p->out,"</TD>\n");
       }
       fprintf(p->out,"</TD></TR>\n");
@@ -435,20 +472,37 @@ static char zHelp[] =
   ".dump ?TABLE? ...      Dump the database in an text format\n"
   ".echo ON|OFF           Turn command echo on or off\n"
   ".exit                  Exit this program\n"
-  ".explain               Set output mode suitable for EXPLAIN\n"
+  ".explain ON|OFF        Turn output mode suitable for EXPLAIN on or off.\n"
-  ".header ON|OFF         Turn display of headers on or off\n"
+  "                       \"off\" will revert to the output mode that was\n"
+  "                       previously in effect\n"
+  ".header(s) ON|OFF      Turn display of headers on or off\n"
   ".help                  Show this message\n"
   ".indices TABLE         Show names of all indices on TABLE\n"
-  ".mode MODE             Set mode to one of \"line\", \"column\", \n"
+  ".mode MODE             Set mode to one of \"line(s)\", \"column(s)\", \n"
   "                       \"insert\", \"list\", or \"html\"\n"
   ".mode insert TABLE     Generate SQL insert statements for TABLE\n"
+  ".nullvalue STRING      Print STRING instead of nothing for NULL data\n"
   ".output FILENAME       Send output to FILENAME\n"
   ".output stdout         Send output to the screen\n"
+  ".prompt MAIN CONTINUE  Replace the standard prompts\n"
+  "                       \"sqlite > \" and \"   ...> \"\n"
+  "                       with the strings MAIN and CONTINUE\n"
+  "                       CONTINUE is optional.\n"
+  "                       Special characters are:\n"
+  ".quit                  Exit this program\n"
   ".read FILENAME         Execute SQL in FILENAME\n"
   ".reindex ?TABLE?       Rebuild indices\n"
 /*  ".rename OLD NEW        Change the name of a table or index\n" */
   ".schema ?TABLE?        Show the CREATE statements\n"
   ".separator STRING      Change separator string for \"list\" mode\n"
+  ".show                  Show the current values for the following:\n"
+  "                       .echo\n"
+  "                       .explain\n"
+  "                       .mode\n"
+  "                       .nullvalue\n"
+  "                       .output\n"
+  "                       .separator\n"
+  "                       .width\n"
   ".tables ?PATTERN?      List names of tables matching a pattern\n"
   ".timeout MS            Try opening locked tables for MS milliseconds\n"
   ".width NUM NUM ...     Set column widths for \"column\" mode\n"
@@ -539,17 +593,51 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     exit(0);
   }else
 
-  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
+  if( c=='e' && strncmp(azArg[0], "explain", n)==0 && nArg>1){
-    p->mode = MODE_Column;
+    int j;
-    p->showHeader = 1;
+    char *z = azArg[1];
-    p->colWidth[0] = 4;
+    int val = atoi(azArg[1]);
-    p->colWidth[1] = 12;
+    for(j=0; z[j]; j++){
-    p->colWidth[2] = 10;
+      if( isupper(z[j]) ) z[j] = tolower(z[j]);
-    p->colWidth[3] = 10;
+    }
-    p->colWidth[4] = 35;
+    if( strcmp(z,"on")==0 ){
+      val = 1;
+    }else if( strcmp(z,"yes")==0 ){
+      val = 1;
+    }
+    if(val == 1) {
+      if(!p->explainPrev.valid) {
+        p->explainPrev.valid = 1;
+        p->explainPrev.mode = p->mode;
+        p->explainPrev.showHeader = p->showHeader;
+        memcpy(p->explainPrev.colWidth,p->colWidth,sizeof(p->colWidth));
+      }
+      /* We could put this code under the !p->explainValid
+      ** condition so that it does not execute if we are already in
+      ** explain mode. However, always executing it allows us an easy
+      ** was to reset to explain mode in case the user previously
+      ** did an .explain followed by a .width, .mode or .header
+      ** command.
+      */
+      p->mode = MODE_Column;
+      p->showHeader = 1;
+      memset(p->colWidth,0,ArraySize(p->colWidth));
+      p->colWidth[0] = 4;
+      p->colWidth[1] = 12;
+      p->colWidth[2] = 10;
+      p->colWidth[3] = 10;
+      p->colWidth[4] = 35;
+    }else if (p->explainPrev.valid) {
+      p->explainPrev.valid = 0;
+      p->mode = p->explainPrev.mode;
+      p->showHeader = p->explainPrev.showHeader;
+      memcpy(p->colWidth,p->explainPrev.colWidth,sizeof(p->colWidth));
+    }
   }else
 
-  if( c=='h' && strncmp(azArg[0], "header", n)==0 && nArg>1 ){
+  if( c=='h' && (strncmp(azArg[0], "header", n)==0
+                 ||
+                 strncmp(azArg[0], "headers", n)==0 )&& nArg>1 ){
     int j;
     char *z = azArg[1];
     int val = atoi(azArg[1]);
@@ -588,9 +676,13 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
 
   if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg>=2 ){
     int n2 = strlen(azArg[1]);
-    if( strncmp(azArg[1],"line",n2)==0 ){
+    if( strncmp(azArg[1],"line",n2)==0
+        ||
+        strncmp(azArg[1],"lines",n2)==0 ){
       p->mode = MODE_Line;
-    }else if( strncmp(azArg[1],"column",n2)==0 ){
+    }else if( strncmp(azArg[1],"column",n2)==0
+              ||
+              strncmp(azArg[1],"columns",n2)==0 ){
       p->mode = MODE_Column;
     }else if( strncmp(azArg[1],"list",n2)==0 ){
       p->mode = MODE_List;
@@ -608,21 +700,42 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     }
   }else
 
+  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 && nArg==2 ) {
+    sprintf(p->nullvalue, "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
+  }else
+
   if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){
     if( p->out!=stdout ){
       fclose(p->out);
     }
     if( strcmp(azArg[1],"stdout")==0 ){
       p->out = stdout;
+      strcpy(p->outfile,"stdout");
     }else{
       p->out = fopen(azArg[1], "w");
       if( p->out==0 ){
         fprintf(stderr,"can't write to \"%s\"\n", azArg[1]);
         p->out = stdout;
+      } else {
+         strcpy(p->outfile,azArg[1]);
       }
     }
   }else
 
+  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 && nArg==2 || nArg==3){
+    if( nArg >= 2) {
+      strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
+    }
+    if( nArg >= 3) {
+      strncpy(continuePrompt,azArg[2],(int)ArraySize(continuePrompt)-1);
+    }
+  }else
+
+  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
+    sqlite_close(db);
+    exit(0);
+  }else
+
   if( c=='r' && strncmp(azArg[0], "read", n)==0 && nArg==2 ){
     FILE *alt = fopen(azArg[1], "r");
     if( alt==0 ){
@@ -713,6 +826,21 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     sprintf(p->separator, "%.*s", (int)ArraySize(p->separator)-1, azArg[1]);
   }else
 
+  if( c=='s' && strncmp(azArg[0], "show", n)==0){
+    int i;
+    fprintf(p->out,"%9.9s: %s\n","echo", p->echoOn ? "on" : "off");
+    fprintf(p->out,"%9.9s: %s\n","explain", p->explainPrev.valid ? "on" : "off");
+    fprintf(p->out,"%9.9s: %s\n","mode", modeDescr[p->mode]);
+    fprintf(p->out,"%9.9s: %s\n","nullvalue", p->nullvalue);
+    fprintf(p->out,"%9.9s: %s\n","output", strlen(p->outfile) ? p->outfile : "stdout");
+    fprintf(p->out,"%9.9s: %s\n","separator", p->separator);
+    fprintf(p->out,"%9.9s: ","width");
+    for (i=0;i<(int)ArraySize(p->colWidth) && p->colWidth[i] != 0;i++) {
+        fprintf(p->out,"%d ",p->colWidth[i]);
+    }
+    fprintf(p->out,"\n\n");
+  }else
+
   if( c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0 ){
     char **azResult;
     int nRow, rc;
@@ -771,12 +899,11 @@ static void do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
   }else
 
   {
-    fprintf(stderr, "unknown command: \"%s\". Enter \".help\" for help\n",
+    fprintf(stderr, "unknown command or invalid arguments: \"%s\". Enter \".help\" for help\n",
       azArg[0]);
   }
 }
 
-static char *Argv0;
 static void process_input(struct callback_data *p, FILE *in){
   char *zLine;
   char *zSql = 0;
@@ -829,20 +956,106 @@ static void process_input(struct callback_data *p, FILE *in){
   }
 }
 
+static void process_sqliterc(struct callback_data *p,
+                             char *sqliterc_override){
+
+  char *home_dir = NULL;
+  char *sqliterc = sqliterc_override;
+  struct passwd *pwent;
+  uid_t uid = getuid();
+  FILE *in = NULL;
+
+  if (sqliterc == NULL) {
+    /* Figure out the user's home directory */
+    while( (pwent=getpwent()) != NULL) {
+      if(pwent->pw_uid == uid) {
+        home_dir = pwent->pw_dir;
+        break;
+      }
+    }
+
+    if (!home_dir) {
+      home_dir = getenv("HOME");
+      if (!home_dir) {
+        home_dir = getenv("HOMEPATH"); /* Windows? */
+      }
+      if (!home_dir) {
+        printf("Cannot find home directory from which to load .sqliterc\n");
+        return;
+      }
+    }
+
+    /* With the home directory, open the init file and process */
+    sqliterc = (char *)calloc(strlen(home_dir) +
+                              strlen("/.sqliterc") +
+                              1,
+                              sizeof(char));
+    if( sqliterc==0 ){
+      fprintf(stderr,"%s: out of memory!\n", Argv0);
+      exit(1);
+    }
+    sprintf(sqliterc,"%s/.sqliterc",home_dir);
+  }
+  in = fopen(sqliterc,"r");
+  if(!in) {
+    /* File either had an error or was not found. Since I cannot
+     * tell, I cannot bark. */
+    return;
+  } else {
+    printf("Loading resources from %s\n",sqliterc);
+    process_input(p,in);
+    close (in);
+  }
+  return;
+}
+
+void main_init(struct callback_data *data) {
+  memset(data, 0, sizeof(*data));
+  data->mode = MODE_List;
+  strcpy(data->separator,"|");
+  data->showHeader = 0;
+  strcpy(mainPrompt,"sqlite> ");
+  strcpy(continuePrompt,"   ...> ");
+}
+
 int main(int argc, char **argv){
   char *zErrMsg = 0;
   struct callback_data data;
+  int origArgc = argc;
+  char **origArgv = argv;
 
   Argv0 = argv[0];
-  memset(&data, 0, sizeof(data));
+  main_init(&data);
-  data.mode = MODE_List;
+  process_sqliterc(&data,NULL);
-  strcpy(data.separator,"|");
+
-  data.showHeader = 0;
 #ifdef SIGINT
   signal(SIGINT, interrupt_handler);
 #endif
   while( argc>=2 && argv[1][0]=='-' ){
-    if( strcmp(argv[1],"-html")==0 ){
+    if( argc>=3 && strcmp(argv[1],"-init")==0 ){
+      /* If we get a -init to do, we have to pretend that
+      ** it replaced the .sqliterc file. Soooo, in order to
+      ** do that we need to start from scratch...*/
+      main_init(&data);
+
+      /* treat this file as the sqliterc... */
+      process_sqliterc(&data,argv[2]);
+
+      /* fix up the command line so we do not re-read
+      ** the option next time around... */
+      {
+        int i = 1;
+        for(i=1;i<=argc-2;i++) {
+          argv[i] = argv[i+2];
+        }
+      }
+      origArgc-=2;
+
+      /* and reset the command line options to be re-read.*/
+      argv = origArgv;
+      argc = origArgc;
+
+    }else if( strcmp(argv[1],"-html")==0 ){
       data.mode = MODE_Html;
       argc--;
       argv++;
@@ -862,6 +1075,10 @@ int main(int argc, char **argv){
       sprintf(data.separator,"%.*s",(int)sizeof(data.separator)-1,argv[2]);
       argc -= 2;
       argv += 2;
+    }else if( argc>=3 && strcmp(argv[1],"-nullvalue")==0 ){
+      sprintf(data.nullvalue,"%.*s",(int)sizeof(data.nullvalue)-1,argv[2]);
+      argc -= 2;
+      argv += 2;
     }else if( strcmp(argv[1],"-header")==0 ){
       data.showHeader = 1;
       argc--;