Use current viewid while fields expanding. Fix issue #14.

git-svn-id: https://klish.googlecode.com/svn/trunk@161 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb

clish/clish_config_callback.c

@@ -49,7 +49,7 @@ clish_config_callback(const clish_shell_t * shell,
 			char *pattern;
 
 			lub_string_cat(&command, "-s");
-			pattern = clish_command__get_pattern(cmd, pargv);
+			pattern = clish_command__get_pattern(cmd, viewid, pargv);
 			if (!pattern) {
 				lub_string_free(command);
 				return BOOL_FALSE;
@@ -104,7 +104,7 @@ clish_config_callback(const clish_shell_t * shell,
 			char *pattern;
 
 			lub_string_cat(&command, "-u");
-			pattern = clish_command__get_pattern(cmd, pargv);
+			pattern = clish_command__get_pattern(cmd, viewid, pargv);
 			if (!pattern) {
 				lub_string_free(command);
 				return BOOL_FALSE;
@@ -146,7 +146,7 @@ clish_config_callback(const clish_shell_t * shell,
 
 			lub_string_cat(&command, "-d");
 
-			file = clish_command__get_file(cmd, pargv);
+			file = clish_command__get_file(cmd, viewid, pargv);
 			if (file) {
 				lub_string_cat(&command, " -f \"");
 				if (file[0] != '\0')
@@ -175,7 +175,7 @@ clish_config_callback(const clish_shell_t * shell,
 		{
 			char *file;
 			lub_string_cat(&command, "-d -f ");
-			file = clish_command__get_file(cmd, pargv);
+			file = clish_command__get_file(cmd, viewid, pargv);
 			lub_string_cat(&command, file);
 			lub_string_free(file);
 			break;
@@ -207,7 +207,7 @@ clish_config_callback(const clish_shell_t * shell,
 		{
 			char *filename;
 
-			filename = clish_command__get_file(cmd, pargv);
+			filename = clish_command__get_file(cmd, viewid, pargv);
 			if (filename) {
 				FILE *fd;
 				char str[1024];

clish/command.h

@@ -28,12 +28,12 @@ typedef enum {
  *----------------- */
 clish_command_t *clish_command_new(const char *name, const char *text);
 clish_command_t *clish_command_new_link(const char *name,
-					const clish_command_t * ref);
+	const clish_command_t * ref);
 int clish_command_bt_compare(const void *clientnode, const void *clientkey);
 void clish_command_bt_getkey(const void *clientnode, lub_bintree_key_t * key);
 size_t clish_command_bt_offset(void);
 clish_command_t *clish_command_choose_longest(clish_command_t * cmd1,
-					      clish_command_t * cmd2);
+	clish_command_t * cmd2);
 int
 clish_command_diff(const clish_command_t * cmd1, const clish_command_t * cmd2);
 /*-----------------
@@ -56,20 +56,20 @@ const char *clish_command__get_builtin(const clish_command_t * instance);
 const char *clish_command__get_escape_chars(const clish_command_t * instance);
 const clish_param_t *clish_command__get_args(const clish_command_t * instance);
 char *clish_command__get_action(const clish_command_t * instance,
-				const char *viewid, clish_pargv_t * pargv);
+	const char *viewid, clish_pargv_t * pargv);
 clish_view_t *clish_command__get_view(const clish_command_t * instance);
 char *clish_command__get_viewid(const clish_command_t * instance,
-				const char *viewid, clish_pargv_t * pargv);
+	const char *viewid, clish_pargv_t * pargv);
 const unsigned clish_command__get_param_count(const clish_command_t * instance);
 const clish_param_t *clish_command__get_param(const clish_command_t * instance,
-					      unsigned index);
+	unsigned index);
 clish_paramv_t *clish_command__get_paramv(const clish_command_t * instance);
 void clish_command__set_action(clish_command_t * instance, const char *action);
 void
 clish_command__set_builtin(clish_command_t * instance, const char *builtin);
 void
 clish_command__set_escape_chars(clish_command_t * instance,
-				const char *escape_chars);
+	const char *escape_chars);
 void clish_command__set_args(clish_command_t * instance, clish_param_t * args);
 void clish_command__set_detail(clish_command_t * instance, const char *detail);
 void clish_command__set_view(clish_command_t * instance, clish_view_t * view);
@@ -79,7 +79,7 @@ clish_view_t *clish_command__get_pview(const clish_command_t * instance);
 unsigned clish_command__get_depth(const clish_command_t * instance);
 void
 clish_command__set_cfg_op(clish_command_t * instance,
-			  clish_config_operation_t operation);
+	clish_config_operation_t operation);
 clish_config_operation_t
 clish_command__get_cfg_op(const clish_command_t * instance);
 void clish_command__set_priority(clish_command_t * instance, unsigned short priority);
@@ -87,10 +87,10 @@ unsigned short clish_command__get_priority(const clish_command_t * instance);
 void
 clish_command__set_pattern(clish_command_t * instance, const char *pattern);
 char *clish_command__get_pattern(const clish_command_t * instance,
-				 clish_pargv_t * pargv);
+	const char * viewid, clish_pargv_t * pargv);
 void clish_command__set_file(clish_command_t * instance, const char *file);
 char *clish_command__get_file(const clish_command_t * instance,
-			      clish_pargv_t * pargv);
+	const char * viewid, clish_pargv_t * pargv);
 void clish_command__set_splitter(clish_command_t * instance, bool_t splitter);
 bool_t clish_command__get_splitter(const clish_command_t * instance);
 bool_t clish_command__get_seq(const clish_command_t * instance);

clish/command/command.c

@@ -447,9 +447,9 @@ void clish_command__set_pattern(clish_command_t * this, const char *pattern)
 
 /*--------------------------------------------------------- */
 char *clish_command__get_pattern(const clish_command_t * this,
-				 clish_pargv_t * pargv)
+	const char *viewid, clish_pargv_t * pargv)
 {
-	return clish_variable_expand(this->pattern, this->viewid, this, pargv);
+	return clish_variable_expand(this->pattern, viewid, this, pargv);
 }
 
 /*--------------------------------------------------------- */
@@ -461,9 +461,9 @@ void clish_command__set_file(clish_command_t * this, const char *file)
 
 /*--------------------------------------------------------- */
 char *clish_command__get_file(const clish_command_t * this,
-			      clish_pargv_t * pargv)
+	const char *viewid, clish_pargv_t * pargv)
 {
-	return clish_variable_expand(this->file, this->viewid, this, pargv);
+	return clish_variable_expand(this->file, viewid, this, pargv);
 }
 
 /*--------------------------------------------------------- */