mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:17:31 +00:00 
			
		
		
		
	Sync OpenBSD patchset 332:
Regularise some fatal messages.
This commit is contained in:
		
							
								
								
									
										10
									
								
								server.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								server.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
/* $Id: server.c,v 1.189 2009-09-19 18:53:01 tcunha Exp $ */
 | 
			
		||||
/* $Id: server.c,v 1.190 2009-09-20 22:11:27 tcunha Exp $ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
@@ -438,7 +438,7 @@ server_child_signal(void)
 | 
			
		||||
		case -1:
 | 
			
		||||
			if (errno == ECHILD)
 | 
			
		||||
				return;
 | 
			
		||||
			fatal("waitpid");
 | 
			
		||||
			fatal("waitpid failed");
 | 
			
		||||
		case 0:
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
@@ -640,7 +640,7 @@ server_check_timers(struct client *c)
 | 
			
		||||
	s = c->session;
 | 
			
		||||
 | 
			
		||||
	if (gettimeofday(&tv, NULL) != 0)
 | 
			
		||||
		fatal("gettimeofday");
 | 
			
		||||
		fatal("gettimeofday failed");
 | 
			
		||||
 | 
			
		||||
	if (c->flags & CLIENT_IDENTIFY && timercmp(&tv, &c->identify_timer, >))
 | 
			
		||||
		server_clear_identify(c);
 | 
			
		||||
@@ -808,7 +808,7 @@ server_handle_client(struct client *c)
 | 
			
		||||
	xtimeout = options_get_number(&c->session->options, "repeat-time");
 | 
			
		||||
	if (xtimeout != 0 && c->flags & CLIENT_REPEAT) {
 | 
			
		||||
		if (gettimeofday(&tv, NULL) != 0)
 | 
			
		||||
			fatal("gettimeofday");
 | 
			
		||||
			fatal("gettimeofday failed");
 | 
			
		||||
		if (timercmp(&tv, &c->repeat_timer, >))
 | 
			
		||||
			c->flags &= ~(CLIENT_PREFIX|CLIENT_REPEAT);
 | 
			
		||||
	}
 | 
			
		||||
@@ -892,7 +892,7 @@ server_handle_client(struct client *c)
 | 
			
		||||
			tv.tv_sec = xtimeout / 1000;
 | 
			
		||||
			tv.tv_usec = (xtimeout % 1000) * 1000L;
 | 
			
		||||
			if (gettimeofday(&c->repeat_timer, NULL) != 0)
 | 
			
		||||
				fatal("gettimeofday");
 | 
			
		||||
				fatal("gettimeofday failed");
 | 
			
		||||
			timeradd(&c->repeat_timer, &tv, &c->repeat_timer);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user