Fossil

Differences From Artifact [f5d3cf3b60]:

• File src/shell.c — part of check-in [e327614047] at 2014-02-13 15:17:25 on branch trunk — Take over "Fixes to the editline support" and "Updates to the command-line shell" from SQLite trunk, keeping the two in sync better. Except for the addition of the ".save" command in "fossil sqlite3", it has no effect. (user: jan.nijtmans size: 119414) [more...]

To Artifact [6c93371e59]:

• File src/shell.c — part of check-in [60fd422275] at 2014-02-26 14:06:38 on branch trunk — Cherry-pick [http://www.sqlite.org/src/info/9c2e7612cd|9c2e7612cd]: In the command-line shell for CSV import, if the lines are \r\n terminated and the last field is blank, make sure an empty string and not a "\r" string is imported. (user: jan.nijtmans size: 119414)

1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903

  }else{
    while( c!=EOF && c!=cSep && c!='\n' ){
      csv_append_char(p, c);
      c = fgetc(p->in);
    }
    if( c=='\n' ){
      p->nLine++;
      if( p->n>1 && p->z[p->n-1]=='\r' ) p->n--;
    }
    p->cTerm = c;
  }
  if( p->z ) p->z[p->n] = 0;
  return p->z;
}

|

1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903

  }else{
    while( c!=EOF && c!=cSep && c!='\n' ){
      csv_append_char(p, c);
      c = fgetc(p->in);
    }
    if( c=='\n' ){
      p->nLine++;
      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
    }
    p->cTerm = c;
  }
  if( p->z ) p->z[p->n] = 0;
  return p->z;
}