Fossil

Check-in [60fd422275]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 60fd4222755ad6e5e1bfae77e1d994b1c77bd483
User & Date: jan.nijtmans 2014-02-26 14:06:38.172
Context
2014-02-27
14:21
Make the home-page "Documentation Index" link show the Primary Documents and not jump to the Permuted Index. check-in: 735d953fa2 user: drh tags: trunk
2014-02-26
14:06
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. check-in: 60fd422275 user: jan.nijtmans tags: trunk
08:58
Cherry-pick [http://www.sqlite.org/src/info/4043d87979|4043d87979], [http://www.sqlite.org/src/info/953cdd6ada|953cdd6ada] and [http://www.sqlite.org/src/info/23001a85cd|23001a85cd]: Ensure that _FILE_OFFSET_BITS and related macros are defined before any #include, for QNX. Meant for testing this change in SQLite in combination with the mingw4x fixes: [http://www.sqlite.org/src/timeline?r=mingw4x] check-in: 782c3bd265 user: jan.nijtmans tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/shell.c.
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;
}