mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Make command exec functions return an enum rather than -1/0/1 values and
add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
This commit is contained in:
		@@ -29,10 +29,9 @@
 | 
			
		||||
 * Runs a command without a window.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
int	cmd_run_shell_exec(struct cmd *, struct cmd_ctx *);
 | 
			
		||||
 | 
			
		||||
void	cmd_run_shell_callback(struct job *);
 | 
			
		||||
void	cmd_run_shell_free(void *);
 | 
			
		||||
enum cmd_retval	 cmd_run_shell_exec(struct cmd *, struct cmd_ctx *);
 | 
			
		||||
void		 cmd_run_shell_callback(struct job *);
 | 
			
		||||
void		 cmd_run_shell_free(void *);
 | 
			
		||||
 | 
			
		||||
const struct cmd_entry cmd_run_shell_entry = {
 | 
			
		||||
	"run-shell", "run",
 | 
			
		||||
@@ -49,7 +48,7 @@ struct cmd_run_shell_data {
 | 
			
		||||
	struct cmd_ctx	 ctx;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
enum cmd_retval
 | 
			
		||||
cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
{
 | 
			
		||||
	struct args			*args = self->args;
 | 
			
		||||
@@ -67,7 +66,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
 | 
			
		||||
 | 
			
		||||
	job_run(shellcmd, cmd_run_shell_callback, cmd_run_shell_free, cdata);
 | 
			
		||||
 | 
			
		||||
	return (1);	/* don't let client exit */
 | 
			
		||||
	return (CMD_RETURN_YIELD);	/* don't let client exit */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user