diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2013-10-18 11:02:55 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2013-10-18 11:02:55 +0200 |
commit | 3a571ea18f9b54ac07dd5ec5d54655aaf9603dd5 (patch) | |
tree | 0e4280b14f65dc1c3326e658e44eee554454ac50 /src/modules/sdlog2 | |
parent | 717bcf4ed29ab09ccbb8eacc3bb0dbb61543cac7 (diff) | |
parent | 53c85a24eaf64bcac81e86c1e9ba0df10cdbb5da (diff) | |
download | px4-firmware-3a571ea18f9b54ac07dd5ec5d54655aaf9603dd5.tar.gz px4-firmware-3a571ea18f9b54ac07dd5ec5d54655aaf9603dd5.tar.bz2 px4-firmware-3a571ea18f9b54ac07dd5ec5d54655aaf9603dd5.zip |
Merge branch 'master' into inav_sonar_indep
Diffstat (limited to 'src/modules/sdlog2')
-rw-r--r-- | src/modules/sdlog2/sdlog2.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 76ff27e56..e2f412662 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -583,6 +583,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(120); + 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); @@ -1266,7 +1275,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) |