diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-15 08:41:40 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-15 08:41:40 +0200 |
commit | 7232a6f1438acc24d77f3ef684266f071a95b8d6 (patch) | |
tree | e2e4a1eecff4724a54a4659bd05f6297cb53a44f /src/modules | |
parent | 3dcd5dbd0e25432049e5ba6971851931764ae043 (diff) | |
parent | 1f39904cea60e0291a13acd4642771e217cfd411 (diff) | |
download | px4-firmware-7232a6f1438acc24d77f3ef684266f071a95b8d6.tar.gz px4-firmware-7232a6f1438acc24d77f3ef684266f071a95b8d6.tar.bz2 px4-firmware-7232a6f1438acc24d77f3ef684266f071a95b8d6.zip |
Merge branch 'master' of github.com:PX4/Firmware into gimbal_rc_control
Diffstat (limited to 'src/modules')
-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 ec8033202..080aa550c 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); @@ -1251,7 +1260,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) |