Module Name: src Committed By: yamt Date: Thu May 22 15:51:25 UTC 2014
Modified Files: src/external/bsd/tmux/dist [yamt-pagecache]: cmd-if-shell.c input.c log.c tmux.1 tmux.h src/external/bsd/tmux/usr.bin/tmux [yamt-pagecache]: Makefile Removed Files: src/external/bsd/tmux/dist/compat [yamt-pagecache]: asprintf.c bitstring.h closefrom.c daemon.c fgetln.c forkpty-aix.c forkpty-hpux.c forkpty-sunos.c getopt.c queue.h setenv.c strcasestr.c strlcat.c strlcpy.c strsep.c tree.h unvis.c vis.c vis.h Log Message: sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ src/external/bsd/tmux/dist/cmd-if-shell.c \ src/external/bsd/tmux/dist/tmux.1 cvs rdiff -u -r1.4 -r1.4.2.1 src/external/bsd/tmux/dist/input.c cvs rdiff -u -r1.2 -r1.2.2.1 src/external/bsd/tmux/dist/log.c cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/tmux/dist/tmux.h cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/tmux/dist/compat/asprintf.c \ src/external/bsd/tmux/dist/compat/bitstring.h \ src/external/bsd/tmux/dist/compat/closefrom.c \ src/external/bsd/tmux/dist/compat/daemon.c \ src/external/bsd/tmux/dist/compat/fgetln.c \ src/external/bsd/tmux/dist/compat/forkpty-aix.c \ src/external/bsd/tmux/dist/compat/forkpty-sunos.c \ src/external/bsd/tmux/dist/compat/getopt.c \ src/external/bsd/tmux/dist/compat/queue.h \ src/external/bsd/tmux/dist/compat/setenv.c \ src/external/bsd/tmux/dist/compat/strcasestr.c \ src/external/bsd/tmux/dist/compat/strlcat.c \ src/external/bsd/tmux/dist/compat/strlcpy.c \ src/external/bsd/tmux/dist/compat/strsep.c \ src/external/bsd/tmux/dist/compat/tree.h \ src/external/bsd/tmux/dist/compat/unvis.c \ src/external/bsd/tmux/dist/compat/vis.c \ src/external/bsd/tmux/dist/compat/vis.h cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/tmux/dist/compat/forkpty-hpux.c cvs rdiff -u -r1.9 -r1.9.2.1 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/tmux/dist/cmd-if-shell.c diff -u src/external/bsd/tmux/dist/cmd-if-shell.c:1.1.1.2 src/external/bsd/tmux/dist/cmd-if-shell.c:1.1.1.2.2.1 --- src/external/bsd/tmux/dist/cmd-if-shell.c:1.1.1.2 Wed Aug 17 18:40:04 2011 +++ src/external/bsd/tmux/dist/cmd-if-shell.c Thu May 22 15:51:25 2014 @@ -1,4 +1,4 @@ -/* $Id: cmd-if-shell.c,v 1.1.1.2 2011/08/17 18:40:04 jmmv Exp $ */ +/* $Id: cmd-if-shell.c,v 1.1.1.2.2.1 2014/05/22 15:51:25 yamt Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <m...@tiagocunha.org> @@ -97,11 +97,9 @@ cmd_if_shell_free(void *data) { struct cmd_if_shell_data *cdata = data; struct cmd_ctx *ctx = &cdata->ctx; - struct msg_exit_data exitdata; if (ctx->cmdclient != NULL) { ctx->cmdclient->references--; - exitdata.retcode = ctx->cmdclient->retcode; ctx->cmdclient->flags |= CLIENT_EXIT; } if (ctx->curclient != NULL) Index: src/external/bsd/tmux/dist/tmux.1 diff -u src/external/bsd/tmux/dist/tmux.1:1.1.1.2 src/external/bsd/tmux/dist/tmux.1:1.1.1.2.2.1 --- src/external/bsd/tmux/dist/tmux.1:1.1.1.2 Wed Aug 17 18:40:03 2011 +++ src/external/bsd/tmux/dist/tmux.1 Thu May 22 15:51:25 2014 @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.1.1.2 2011/08/17 18:40:03 jmmv Exp $ +.\" $Id: tmux.1,v 1.1.1.2.2.1 2014/05/22 15:51:25 yamt Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <n...@users.sourceforge.net> .\" @@ -3008,4 +3008,4 @@ bind-key S command-prompt "new-window -n .Sh SEE ALSO .Xr pty 4 .Sh AUTHORS -.An Nicholas Marriott Aq n...@users.sourceforge.net +.An Nicholas Marriott Aq Mt n...@users.sourceforge.net Index: src/external/bsd/tmux/dist/input.c diff -u src/external/bsd/tmux/dist/input.c:1.4 src/external/bsd/tmux/dist/input.c:1.4.2.1 --- src/external/bsd/tmux/dist/input.c:1.4 Wed Aug 17 19:28:36 2011 +++ src/external/bsd/tmux/dist/input.c Thu May 22 15:51:25 2014 @@ -1,4 +1,4 @@ -/* $Id: input.c,v 1.4 2011/08/17 19:28:36 jmmv Exp $ */ +/* $Id: input.c,v 1.4.2.1 2014/05/22 15:51:25 yamt Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <n...@users.sourceforge.net> @@ -49,7 +49,7 @@ /* Helper functions. */ int input_split(struct input_ctx *); int input_get(struct input_ctx *, u_int, int, int); -void input_reply(struct input_ctx *, const char *, ...); +void input_reply(struct input_ctx *, const char *, ...) __printflike(2, 3); /* Transition entry/exit handlers. */ void input_clear(struct input_ctx *); Index: src/external/bsd/tmux/dist/log.c diff -u src/external/bsd/tmux/dist/log.c:1.2 src/external/bsd/tmux/dist/log.c:1.2.2.1 --- src/external/bsd/tmux/dist/log.c:1.2 Thu Aug 25 16:41:51 2011 +++ src/external/bsd/tmux/dist/log.c Thu May 22 15:51:25 2014 @@ -1,4 +1,4 @@ -/* $Id: log.c,v 1.2 2011/08/25 16:41:51 joerg Exp $ */ +/* $Id: log.c,v 1.2.2.1 2014/05/22 15:51:25 yamt Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <n...@users.sourceforge.net> @@ -39,7 +39,7 @@ FILE *log_file; /* Debug level. */ int log_level; -void log_vwrite(int, const char *, va_list); +void log_vwrite(int, const char *, va_list) __printflike(2, 0); __dead void log_vfatal(const char *, va_list); /* Open logging to tty. */ @@ -105,6 +105,12 @@ log_vwrite(int pri, const char *msg, va_ } /* Log a warning with error string. */ +#if __GNUC_PREREQ__(4, 6) || defined(__clang__) +#pragma GCC diagnostic push +#endif +#if __GNUC_PREREQ__(4, 5) || defined(__clang__) +#pragma GCC diagnostic ignored "-Wformat-nonliteral" +#endif void printflike1 log_warn(const char *msg, ...) { @@ -118,6 +124,9 @@ log_warn(const char *msg, ...) free(fmt); va_end(ap); } +#if __GNUC_PREREQ__(4, 6) || defined(__clang__) +#pragma GCC diagnostic push +#endif /* Log a warning. */ void printflike1 Index: src/external/bsd/tmux/dist/tmux.h diff -u src/external/bsd/tmux/dist/tmux.h:1.3 src/external/bsd/tmux/dist/tmux.h:1.3.2.1 --- src/external/bsd/tmux/dist/tmux.h:1.3 Sat Sep 17 01:50:08 2011 +++ src/external/bsd/tmux/dist/tmux.h Thu May 22 15:51:25 2014 @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.3 2011/09/17 01:50:08 christos Exp $ */ +/* $Id: tmux.h,v 1.3.2.1 2014/05/22 15:51:25 yamt Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <n...@users.sourceforge.net> @@ -80,6 +80,9 @@ extern char **environ; #define unused __attribute__ ((unused)) /* Attribute to make gcc check printf-like arguments. */ +#define vprintflike2 __attribute__ ((format (printf, 2, 0))) +#define vprintflike3 __attribute__ ((format (printf, 3, 0))) +#define vprintflike5 __attribute__ ((format (printf, 5, 0))) #define printflike1 __attribute__ ((format (printf, 1, 2))) #define printflike2 __attribute__ ((format (printf, 2, 3))) #define printflike3 __attribute__ ((format (printf, 3, 4))) @@ -1803,7 +1806,7 @@ void printflike3 screen_write_puts(struc struct grid_cell *, const char *, ...); void printflike5 screen_write_nputs(struct screen_write_ctx *, ssize_t, struct grid_cell *, int, const char *, ...); -void screen_write_vnputs(struct screen_write_ctx *, +void vprintflike5 screen_write_vnputs(struct screen_write_ctx *, ssize_t, struct grid_cell *, int, const char *, va_list); void screen_write_parsestyle( struct grid_cell *, struct grid_cell *, const char *); @@ -1980,13 +1983,13 @@ extern const struct window_mode window_c extern const struct window_mode window_copy_mode; void window_copy_init_from_pane(struct window_pane *); void window_copy_init_for_output(struct window_pane *); -void window_copy_add(struct window_pane *, const char *, ...); -void window_copy_vadd(struct window_pane *, const char *, va_list); +void printflike2 window_copy_add(struct window_pane *, const char *, ...); +void vprintflike2 window_copy_vadd(struct window_pane *, const char *, va_list); void window_copy_pageup(struct window_pane *); /* window-choose.c */ extern const struct window_mode window_choose_mode; -void window_choose_vadd( +void vprintflike3 window_choose_vadd( struct window_pane *, int, const char *, va_list); void printflike3 window_choose_add( struct window_pane *, int, const char *, ...); @@ -2066,9 +2069,9 @@ void *xmalloc(size_t); void *xrealloc(void *, size_t, size_t); void xfree(void *); int printflike2 xasprintf(char **, const char *, ...); -int xvasprintf(char **, const char *, va_list); +int vprintflike2 xvasprintf(char **, const char *, va_list); int printflike3 xsnprintf(char *, size_t, const char *, ...); -int xvsnprintf(char *, size_t, const char *, va_list); +int vprintflike3 xvsnprintf(char *, size_t, const char *, va_list); /* utmp.c */ struct window_utmp *utmp_create(const char *); Index: src/external/bsd/tmux/usr.bin/tmux/Makefile diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.9 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.9.2.1 --- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.9 Sat Sep 17 01:48:46 2011 +++ src/external/bsd/tmux/usr.bin/tmux/Makefile Thu May 22 15:51:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/09/17 01:48:46 christos Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2014/05/22 15:51:25 yamt Exp $ .include <bsd.own.mk> @@ -179,7 +179,8 @@ CPPFLAGS+= -DHAVE_INTTYPES_H=1 CPPFLAGS+= -DHAVE_PATHS_H=1 CPPFLAGS+= -DHAVE_STDINT_H=1 CPPFLAGS+= -DHAVE_SYS_DIR_H=1 -CPPFLAGS+= -DHAVE_SYS_TREE_H=1 +CPPFLAGS+= -DHAVE_QUEUE_H=1 +CPPFLAGS+= -DHAVE_TREE_H=1 CPPFLAGS+= -DHAVE_TERM_H=1 CPPFLAGS+= -DHAVE_UTIL_H=1 CPPFLAGS+= -DHAVE_LIBRT=1