summaryrefslogtreecommitdiff
path: root/src/cli_objects.c
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2011-02-22 16:33:45 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2011-02-22 16:33:45 -0800
commit95b4b15c8b0d47a7323cd74858714023c7a22a22 (patch)
tree53d6ed54ecfdc38ffedcf910c8e22ac0a7758e88 /src/cli_objects.c
parent0c45579ce0c5672677c8fb9f9ea82d404c0e01a2 (diff)
downloadvyatta-cfg-95b4b15c8b0d47a7323cd74858714023c7a22a22.tar.gz
vyatta-cfg-95b4b15c8b0d47a7323cd74858714023c7a22a22.zip
clean up dead code etc. etc. etc.
Diffstat (limited to 'src/cli_objects.c')
-rw-r--r--src/cli_objects.c102
1 files changed, 6 insertions, 96 deletions
diff --git a/src/cli_objects.c b/src/cli_objects.c
index 8685c6a..9d389e2 100644
--- a/src/cli_objects.c
+++ b/src/cli_objects.c
@@ -26,12 +26,9 @@ static boolean in_delete_action=FALSE;
static valstruct cli_value;
static boolean in_commit=FALSE; /* TRUE if in commit program*/
static boolean in_exec=FALSE; /* TRUE if in exec */
-static boolean _is_echo=FALSE;
-static boolean _is_silent_msg=FALSE;
static first_seg f_seg_a;
static first_seg f_seg_c;
static first_seg f_seg_m;
-static int in_cond_tik=0;
/******************** Accessors: ************************/
@@ -86,22 +83,6 @@ void set_in_exec(boolean b) {
in_exec=b;
}
-boolean is_echo(void) {
- return _is_echo;
-}
-
-void set_echo(boolean b) {
- _is_echo=b;
-}
-
-boolean is_silent_msg(void) {
- return _is_silent_msg;
-}
-
-void set_silent_msg(boolean b) {
- _is_silent_msg=b;
-}
-
valstruct* get_cli_value_ptr(void) {
return &cli_value;
}
@@ -118,18 +99,6 @@ first_seg* get_f_seg_m_ptr(void) {
return &f_seg_m;
}
-int is_in_cond_tik(void) {
- return in_cond_tik;
-}
-
-void set_in_cond_tik(int ict) {
- in_cond_tik=ict;
-}
-
-void dec_in_cond_tik(void) {
- --in_cond_tik;
-}
-
const char* get_tdirp(void) {
const char* tdirp=getenv(ENV_T_DIR);
@@ -178,8 +147,9 @@ const char* get_tmpp(void) {
return tmpp;
}
-char* get_elevp(void) {
-
+static char *
+get_elevp(void)
+{
static char elevp_buffer[2049];
static char* elevp=NULL;
@@ -196,8 +166,9 @@ char* get_elevp(void) {
return elevp;
}
-char* get_tlevp(void) {
-
+static char *
+get_tlevp(void)
+{
static char tlevp_buffer[2049];
static char* tlevp=NULL;
@@ -216,67 +187,6 @@ char* get_tlevp(void) {
/************************* Init ***************************/
-void init_edit()
-{
- int elevlen = 0;
- int tlevlen = 0;
-
- init_paths(TRUE);
- if (!get_elevp())
- bye("Not in configuration mode");
- if (!get_tlevp())
- bye("INTERNAL: environment var |%s| is not set",ENV_TEMPLATE_LEVEL);
- elevlen = strlen(get_elevp());
- tlevlen = strlen(get_tlevp());
- if (elevlen > 0 && get_elevp()[elevlen - 1]=='/') {
- /* cut off terminateing slash */
- --elevlen;
- get_elevp()[elevlen] = 0;
- }
- if (elevlen) {
- char *slashp;
- char * scanp;
- if (*get_elevp()!='/')
- INTERNAL;
- scanp = get_elevp() + 1;
- while (TRUE) {
- slashp = strchr(scanp, '/');
- if (slashp)
- *slashp = 0;
- push_path_no_escape(&m_path, scanp);
- if (slashp) {
- *slashp = '/';
- scanp = slashp+1;
- }else
- break;
- }
- }
- switch_path(MPATH);
- if (tlevlen > 0 && get_tlevp()[tlevlen - 1]=='/') {
- /* cut off terminateing slash */
- --tlevlen;
- get_tlevp()[tlevlen] = 0;
- }
- if (tlevlen) {
- char *slashp;
- char * scanp;
- if (*get_tlevp()!='/')
- INTERNAL;
- scanp = get_tlevp() + 1;
- while (TRUE) {
- slashp = strchr(scanp, '/');
- if (slashp)
- *slashp = 0;
- push_path(&t_path, scanp);
- if (slashp) {
- *slashp = '/';
- scanp = slashp+1;
- }else
- break;
- }
- }
-}
-
void init_paths(boolean for_commit)
{
struct stat statbuf;