mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		@@ -248,8 +248,8 @@ cmd_capture_pane_exec(struct cmd *self, struct cmdq_item *item)
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			file_print_buffer(c, buf, len);
 | 
								file_print_buffer(c, buf, len);
 | 
				
			||||||
			file_print(c, "\n");
 | 
								file_print(c, "\n");
 | 
				
			||||||
			free(buf);
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							free(buf);
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
		bufname = NULL;
 | 
							bufname = NULL;
 | 
				
			||||||
		if (args_has(args, 'b'))
 | 
							if (args_has(args, 'b'))
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								format.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								format.c
									
									
									
									
									
								
							@@ -4930,7 +4930,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
 | 
				
			|||||||
	struct window_pane		 *wp = ft->wp;
 | 
						struct window_pane		 *wp = ft->wp;
 | 
				
			||||||
	const char			 *errstr, *copy, *cp, *cp2;
 | 
						const char			 *errstr, *copy, *cp, *cp2;
 | 
				
			||||||
	const char			 *marker = NULL;
 | 
						const char			 *marker = NULL;
 | 
				
			||||||
	const char			 *time_format = NULL;
 | 
						char				 *time_format = NULL;
 | 
				
			||||||
	char				 *copy0, *condition, *found, *new;
 | 
						char				 *copy0, *condition, *found, *new;
 | 
				
			||||||
	char				 *value, *left, *right;
 | 
						char				 *value, *left, *right;
 | 
				
			||||||
	size_t				  valuelen;
 | 
						size_t				  valuelen;
 | 
				
			||||||
@@ -5465,6 +5465,7 @@ done:
 | 
				
			|||||||
	free(sub);
 | 
						free(sub);
 | 
				
			||||||
	format_free_modifiers(list, count);
 | 
						format_free_modifiers(list, count);
 | 
				
			||||||
	free(copy0);
 | 
						free(copy0);
 | 
				
			||||||
 | 
						free(time_format);
 | 
				
			||||||
	return (0);
 | 
						return (0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fail:
 | 
					fail:
 | 
				
			||||||
@@ -5473,6 +5474,7 @@ fail:
 | 
				
			|||||||
	free(sub);
 | 
						free(sub);
 | 
				
			||||||
	format_free_modifiers(list, count);
 | 
						format_free_modifiers(list, count);
 | 
				
			||||||
	free(copy0);
 | 
						free(copy0);
 | 
				
			||||||
 | 
						free(time_format);
 | 
				
			||||||
	return (-1);
 | 
						return (-1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user