mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Rather than constructing an entire termios struct from ttydefaults.h, just let
forkpty do it and then alter the bits that should be changed after fork. A little neater and more portable.
This commit is contained in:
		
							
								
								
									
										12
									
								
								session.c
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								session.c
									
									
									
									
									
								
							@@ -139,7 +139,12 @@ session_create(const char *name, const char *cmd, const char *cwd,
 | 
			
		||||
	environ_init(&s->environ);
 | 
			
		||||
	if (env != NULL)
 | 
			
		||||
		environ_copy(env, &s->environ);
 | 
			
		||||
	memcpy(&s->tio, tio, sizeof s->tio);
 | 
			
		||||
 | 
			
		||||
	s->tio = NULL;
 | 
			
		||||
	if (tio != NULL) {
 | 
			
		||||
		s->tio = xmalloc(sizeof *s->tio);
 | 
			
		||||
		memcpy(s->tio, tio, sizeof *s->tio);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	s->sx = sx;
 | 
			
		||||
	s->sy = sy;
 | 
			
		||||
@@ -182,6 +187,9 @@ session_destroy(struct session *s)
 | 
			
		||||
	while (!ARRAY_EMPTY(&sessions) && ARRAY_LAST(&sessions) == NULL)
 | 
			
		||||
		ARRAY_TRUNC(&sessions, 1);
 | 
			
		||||
 | 
			
		||||
	if (s->tio != NULL)
 | 
			
		||||
		xfree(s->tio);
 | 
			
		||||
 | 
			
		||||
	session_alert_cancel(s, NULL);
 | 
			
		||||
	environ_free(&s->environ);
 | 
			
		||||
	options_free(&s->options);
 | 
			
		||||
@@ -237,7 +245,7 @@ session_new(struct session *s,
 | 
			
		||||
 | 
			
		||||
	hlimit = options_get_number(&s->options, "history-limit");
 | 
			
		||||
	w = window_create(
 | 
			
		||||
	    name, cmd, shell, cwd, &env, &s->tio, s->sx, s->sy, hlimit, cause);
 | 
			
		||||
	    name, cmd, shell, cwd, &env, s->tio, s->sx, s->sy, hlimit, cause);
 | 
			
		||||
	if (w == NULL) {
 | 
			
		||||
		environ_free(&env);
 | 
			
		||||
		return (NULL);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user