aboutsummaryrefslogtreecommitdiff
path: root/src/modules/sdlog2
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-08-14 22:53:42 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-08-14 22:53:42 +0200
commitaebdd6e05969e415db2f7f939229163dddc35f23 (patch)
tree874008b07d83ed81acb09cfa1015d8a60e87a821 /src/modules/sdlog2
parent27d0885453711a3d3ab6abf3cf227afc837e14bd (diff)
parentd2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff)
downloadpx4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.tar.gz
px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.tar.bz2
px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.zip
Merged master
Diffstat (limited to 'src/modules/sdlog2')
-rw-r--r--src/modules/sdlog2/sdlog2.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c
index ab3983019..fefa539f9 100644
--- a/src/modules/sdlog2/sdlog2.c
+++ b/src/modules/sdlog2/sdlog2.c
@@ -606,6 +606,15 @@ int sdlog2_thread_main(int argc, char *argv[])
errx(1, "unable to create logging folder, exiting.");
}
+ const char *converter_in = "/etc/logging/conv.zip";
+ char* converter_out = malloc(150);
+ sprintf(converter_out, "%s/conv.zip", folder_path);
+
+ if (file_copy(converter_in, converter_out)) {
+ errx(1, "unable to copy conversion scripts, exiting.");
+ }
+ free(converter_out);
+
/* only print logging path, important to find log file later */
warnx("logging to directory: %s", folder_path);
@@ -1318,7 +1327,7 @@ int file_copy(const char *file_old, const char *file_new)
fclose(source);
fclose(target);
- return ret;
+ return OK;
}
void handle_command(struct vehicle_command_s *cmd)