From 53d221284bb3ea20ad68950a4adfeeaa48794509 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 7 Mar 2012 18:05:07 -0600 Subject: [PATCH] Update: rename/move fl_execute into fll_execute This is done so that it can utilize some level_1 dependencies, such as fl_serialize. --- .../fl_execute => level_2/fll_execute}/c/execute.c | 8 ++++---- .../fl_execute => level_2/fll_execute}/c/execute.h | 20 +++++++++++--------- .../fll_execute}/data/build/settings | 6 +++--- 3 files changed, 18 insertions(+), 16 deletions(-) rename {level_1/fl_execute => level_2/fll_execute}/c/execute.c (90%) rename {level_1/fl_execute => level_2/fll_execute}/c/execute.h (60%) rename {level_1/fl_execute => level_2/fll_execute}/data/build/settings (83%) diff --git a/level_1/fl_execute/c/execute.c b/level_2/fll_execute/c/execute.c similarity index 90% rename from level_1/fl_execute/c/execute.c rename to level_2/fll_execute/c/execute.c index 42351e7..76a297e 100644 --- a/level_1/fl_execute/c/execute.c +++ b/level_2/fll_execute/c/execute.c @@ -8,14 +8,14 @@ * Provides program execution operations similart to system() * TODO: I should implement a function that will find the program based on PATH so that static paths do not have to be used */ -#include +#include #ifdef __cplusplus extern "C"{ #endif -#ifndef _di_fl_execute_path_ - f_return_status fl_execute_path(const f_string program_path, const f_dynamic_strings arguments, f_s_int *results){ +#ifndef _di_fll_execute_path_ + f_return_status fll_execute_path(const f_string program_path, const f_dynamic_strings arguments, f_s_int *results){ #ifndef _di_level_1_parameter_checking_ if (results == f_null) return f_invalid_parameter; @@ -67,7 +67,7 @@ extern "C"{ return f_none; } -#endif // _di_fl_execute_path_ +#endif // _di_fll_execute_path_ #ifdef __cplusplus } // extern "C" diff --git a/level_1/fl_execute/c/execute.h b/level_2/fll_execute/c/execute.h similarity index 60% rename from level_1/fl_execute/c/execute.h rename to level_2/fll_execute/c/execute.h index 9bc8b4b..7011956 100644 --- a/level_1/fl_execute/c/execute.h +++ b/level_2/fll_execute/c/execute.h @@ -7,8 +7,8 @@ * * Provides program execution operations similar to system() */ -#ifndef _FL_execute_h -#define _FL_execute_h +#ifndef _FLL_execute_h +#define _FLL_execute_h // libc includes #include @@ -21,22 +21,24 @@ #include #include +// fll-1 includes + #ifdef __cplusplus extern "C"{ #endif -#ifndef _di_fl_execute_path_ +#ifndef _di_fll_execute_path_ // This will execute a program given some path + program name (such as "/bin/bash") - extern f_return_status fl_execute_path(const f_string program_path, const f_dynamic_strings arguments, f_s_int *results); -#endif // _di_fl_execute_path_ + extern f_return_status fll_execute_path(const f_string program_path, const f_dynamic_strings arguments, f_s_int *results); +#endif // _di_fll_execute_path_ -#ifndef _di_fl_execute_program_ +#ifndef _di_fll_execute_program_ // This will find the program based on PATH environment so that static paths do not have to be used as with f_execute_path - extern f_return_status fl_execute_program(const f_string program_name, const f_string arguments[], f_s_int *results); -#endif // _di_fl_execute_program_ + extern f_return_status fll_execute_program(const f_string program_name, const f_string arguments[], f_s_int *results); +#endif // _di_fll_execute_program_ #ifdef __cplusplus } // extern "C" #endif -#endif // _FL_execute_h +#endif // _FLL_execute_h diff --git a/level_1/fl_execute/data/build/settings b/level_2/fll_execute/data/build/settings similarity index 83% rename from level_1/fl_execute/data/build/settings rename to level_2/fll_execute/data/build/settings index a7ba8a8..002cc2b 100644 --- a/level_1/fl_execute/data/build/settings +++ b/level_2/fll_execute/data/build/settings @@ -1,10 +1,10 @@ # fss-0000 -project_name fl_execute -project_level 1 +project_name fll_execute +project_level 2 version_major 0 -version_minor 2 +version_minor 3 version_micro 0 build_compiler gcc -- 1.8.3.1