github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-27 16:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enable specified files to be read

Browse Source
This commit is contained in:
Jan-Piet Mens
2015-08-24 20:16:13 +02:00
parent af54bd5d3e
commit c8983d8456
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocat.c
+36 -3
View File
@@ -16,6 +16,37 @@ typedef enum {
RAW,
} output_type;
#if 0
void csv_output(JsonNode *json, output_type otype)
{
JsonNode *arr, *one, *j;
short virgin = 1;
arr = json_find_member(json, "locations");
json_foreach(one, arr) {
if (virgin) {
virgin = !virgin;
/* Print headings from key names */
json_foreach(j, one) {
if (j->key)
printf("%s%c", j->key, (j->next) ? ',' : '\n');
}
}
/* Now the values */
json_foreach(j, one) {
if (j->tag == JSON_STRING) {
printf("%s%c", j->string_, (j->next) ? ',' : '\n');
} else if (j->tag == JSON_NUMBER) {
/* hmm; what do I do with ints ? */
printf("%lf%c", j->number_, (j->next) ? ',' : '\n');
}
}
}
}
#endif
#if 1
void csv_output(JsonNode *json, output_type otype)
{
JsonNode *arr, *one, *j;
@@ -69,6 +100,7 @@ void csv_output(JsonNode *json, output_type otype)
}
}
}
#endif
void usage(char *prog)
{
@@ -255,11 +287,12 @@ int main(int argc, char **argv)
if (argc == 0 && !username && !device) {
fprintf(stderr, "%s: nothing to do. Specify filename or --user and --device\n", progname);
return (-1);
} else if (username && device && (argc > 0)) {
} else if (argc == 0 && (!username || !device)) {
fprintf(stderr, "%s: must specify username and device\n", progname);
return (-1);
} else if ((username || device) && (argc > 0)) {
fprintf(stderr, "%s: filename with --user and --device is not supported\n", progname);
return (-1);
} else if (!username || !device) {
usage(progname);
}