diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the arbitrary line length limit

Browse Source
This commit is contained in:
Eric Fischer
2017-10-10 15:06:12 -07:00
parent 19117d8060
commit face450102
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csv.cpp
+19 -8
View File
@@ -2,11 +2,11 @@
#define MAXLINE 10000 /* XXX */ #define MAXLINE 10000 /* XXX */
std::vector<std::string> csv_split(char *s) { std::vector<std::string> csv_split(const char *s) {
std::vector<std::string> ret; std::vector<std::string> ret;
while (*s && *s != '\n' && *s != '\r') { while (*s && *s != '\n' && *s != '\r') {
char *start = s; const char *start = s;
int within = 0; int within = 0;
for (; *s && *s != '\n' && *s != '\r'; s++) { for (; *s && *s != '\n' && *s != '\r'; s++) {
@@ -48,6 +48,18 @@ std::string csv_dequote(std::string s) {
return out; return out;
} }
std::string getline(FILE *f) {
std::string out;
int c;
while ((c = getc(f)) != EOF) {
out.push_back(c);
if (c == '\n') {
break;
}
}
return out;
}
void readcsv(char *fn, std::vector<std::string> &header, std::map<std::string, std::vector<std::string>> &mapping) { void readcsv(char *fn, std::vector<std::string> &header, std::map<std::string, std::vector<std::string>> &mapping) {
FILE *f = fopen(fn, "r"); FILE *f = fopen(fn, "r");
if (f == NULL) { if (f == NULL) {
@@ -55,16 +67,16 @@ void readcsv(char *fn, std::vector<std::string> &header, std::map<std::string, s
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
char s[MAXLINE]; std::string s;
if (fgets(s, MAXLINE, f)) { if ((s = getline(f)).size() > 0) {
header = csv_split(s); header = csv_split(s.c_str());
for (size_t i = 0; i < header.size(); i++) { for (size_t i = 0; i < header.size(); i++) {
header[i] = csv_dequote(header[i]); header[i] = csv_dequote(header[i]);
} }
} }
while (fgets(s, MAXLINE, f)) { while ((s = getline(f)).size() > 0) {
std::vector<std::string> line = csv_split(s); std::vector<std::string> line = csv_split(s.c_str());
if (line.size() > 0) { if (line.size() > 0) {
line[0] = csv_dequote(line[0]); line[0] = csv_dequote(line[0]);
} }
@@ -80,4 +92,3 @@ void readcsv(char *fn, std::vector<std::string> &header, std::map<std::string, s
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }