#include #include #include #include #include #include #include "pager.h" #include "run-command.h" #include "sigchain.h" #include "subcmd-config.h" /* * This is split up from the rest of git so that we can do * something different on Windows. */ static int spawned_pager; static int pager_columns; void pager_init(const char *pager_env) { subcmd_config.pager_env = pager_env; } static void pager_preexec(void) { /* * Work around bug in "less" by not starting it until we * have real input */ fd_set in; FD_ZERO(&in); FD_SET(0, &in); select(1, &in, NULL, &in, NULL); setenv("LESS", "FRSX", 0); } static const char *pager_argv[] = { "sh", "-c", NULL, NULL }; static struct child_process pager_process; static void wait_for_pager(void) { fflush(stdout); fflush(stderr); /* signal EOF to pager */ close(1); close(2); finish_command(&pager_process); } static void wait_for_pager_signal(int signo) { wait_for_pager(); sigchain_pop(signo); raise(signo); } void setup_pager(void) { const char *pager = getenv(subcmd_config.pager_env); struct winsize sz; if (!isatty(1)) return; if (ioctl(1, TIOCGWINSZ, &sz) == 0) pager_columns = sz.ws_col; if (!pager) pager = getenv("PAGER"); if (!(pager || access("/usr/bin/pager", X_OK))) pager = "/usr/bin/pager"; if (!(pager || access("/usr/bin/less", X_OK))) pager = "/usr/bin/less"; if (!pager) pager = "cat"; if (!*pager || !strcmp(pager, "cat")) return; spawned_pager = 1; /* means we are emitting to terminal */ /* spawn the pager */ pager_argv[2] = pager; pager_process.argv = pager_argv; pager_process.in = -1; pager_process.preexec_cb = pager_preexec; if (start_command(&pager_process)) return; /* original process continues, but writes to the pipe */ dup2(pager_process.in, 1); if (isatty(2)) dup2(pager_process.in, 2); close(pager_process.in); /* this makes sure that the parent terminates after the pager */ sigchain_push_common(wait_for_pager_signal); atexit(wait_for_pager); } int pager_in_use(void) { return spawned_pager; } int pager_get_columns(void) { char *s; s = getenv("COLUMNS"); if (s) return atoi(s); return (pager_columns ? pager_columns : 80) - 2; } lue='grep'>log msg
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/wpa.h')
Linus Torvalds <torvalds@linux-foundation.org>
2016-12-25 14:30:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-25 14:30:04 -0800
commit3ddc76dfc786cc6f87852693227fb0b1f124f807 (patch)
tree8192b4721e05cf6823087f9696db8c0c8f144b02 /net/xfrm/xfrm_sysctl.c
parentb272f732f888d4cf43c943a40c9aaa836f9b7431 (diff)
parent1f3a8e49d8f28f498b8694464623ac20aebfe62a (diff)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer type cleanups from Thomas Gleixner: "This series does a tree wide cleanup of types related to timers/timekeeping. - Get rid of cycles_t and use a plain u64. The type is not really helpful and caused more confusion than clarity - Get rid of the ktime union. The union has become useless as we use the scalar nanoseconds storage unconditionally now. The 32bit timespec alike storage got removed due to the Y2038 limitations some time ago. That leaves the odd union access around for no reason. Clean it up. Both changes have been done with coccinelle and a small amount of manual mopping up" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ktime: Get rid of ktime_equal() ktime: Cleanup ktime_set() usage ktime: Get rid of the union clocksource: Use a plain u64 instead of cycle_t
Diffstat (limited to 'net/xfrm/xfrm_sysctl.c')