mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-03 16:46:18 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		
							
								
								
									
										7
									
								
								job.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								job.c
									
									
									
									
									
								
							@@ -52,12 +52,7 @@ job_run(const char *cmd, struct session *s, const char *cwd,
 | 
			
		||||
	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0)
 | 
			
		||||
		return (NULL);
 | 
			
		||||
 | 
			
		||||
	env = environ_create();
 | 
			
		||||
	environ_copy(global_environ, env);
 | 
			
		||||
	if (s != NULL)
 | 
			
		||||
		environ_copy(s->environ, env);
 | 
			
		||||
	server_fill_environ(s, env);
 | 
			
		||||
 | 
			
		||||
	env = environ_for_session(s);
 | 
			
		||||
	switch (pid = fork()) {
 | 
			
		||||
	case -1:
 | 
			
		||||
		environ_free(env);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user