From 3fc8b5eb9473e93197dc56e94b48b59d30ab40bb Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 9 Oct 2015 16:11:19 +0000 Subject: [PATCH] partial oksh sync, up to commit 80be547da108d5c241ae068290ca3e331446aa41? --- edit.c | 8 ++++---- exec.c | 4 ++-- funcs.c | 6 +++--- jobs.c | 10 +++++----- lex.c | 6 +++--- main.c | 6 +++--- misc.c | 6 +++--- sh.h | 6 +++--- var.c | 6 +++--- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/edit.c b/edit.c index a836c43..5433e6a 100644 --- a/edit.c +++ b/edit.c @@ -1,12 +1,12 @@ /* $OpenBSD: edit.c,v 1.41 2015/09/01 13:12:31 tedu Exp $ */ /* $OpenBSD: edit.h,v 1.9 2011/05/30 17:14:35 martynas Exp $ */ -/* $OpenBSD: emacs.c,v 1.51 2015/09/01 13:12:31 tedu Exp $ */ -/* $OpenBSD: vi.c,v 1.29 2015/09/01 13:12:31 tedu Exp $ */ +/* $OpenBSD: emacs.c,v 1.52 2015/09/10 22:48:58 nicm Exp $ */ +/* $OpenBSD: vi.c,v 1.30 2015/09/10 22:48:58 nicm Exp $ */ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, * 2011, 2012, 2013, 2014, 2015 - * mirabilos + * mirabilos * * Provided that these terms and disclaimer and all copyright notices * are retained or reproduced in an accompanying document, permission @@ -28,7 +28,7 @@ #ifndef MKSH_NO_CMDLINE_EDITING -__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.291 2015/09/05 19:19:01 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.292 2015/10/09 16:11:13 tg Exp $"); /* * in later versions we might use libtermcap for this, but since external diff --git a/exec.c b/exec.c index 2b3a612..3e601df 100644 --- a/exec.c +++ b/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.51 2015/04/18 18:28:36 deraadt Exp $ */ +/* $OpenBSD: exec.c,v 1.52 2015/09/10 22:48:58 nicm Exp $ */ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.164 2015/10/09 15:28:20 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.165 2015/10/09 16:11:14 tg Exp $"); #ifndef MKSH_DEFAULT_EXECSHELL #define MKSH_DEFAULT_EXECSHELL MKSH_UNIXROOT "/bin/sh" diff --git a/funcs.c b/funcs.c index 1c021f8..9f097f5 100644 --- a/funcs.c +++ b/funcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_ksh.c,v 1.35 2015/09/01 13:12:31 tedu Exp $ */ +/* $OpenBSD: c_ksh.c,v 1.37 2015/09/10 22:48:58 nicm Exp $ */ /* $OpenBSD: c_sh.c,v 1.46 2015/07/20 20:46:24 guenther Exp $ */ /* $OpenBSD: c_test.c,v 1.18 2009/03/01 20:11:06 otto Exp $ */ /* $OpenBSD: c_ulimit.c,v 1.19 2013/11/28 10:33:37 sobrado Exp $ */ @@ -6,7 +6,7 @@ /*- * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, * 2010, 2011, 2012, 2013, 2014, 2015 - * mirabilos + * mirabilos * * Provided that these terms and disclaimer and all copyright notices * are retained or reproduced in an accompanying document, permission @@ -38,7 +38,7 @@ #endif #endif -__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.283 2015/09/05 19:19:04 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.284 2015/10/09 16:11:14 tg Exp $"); #if HAVE_KILLPG /* diff --git a/jobs.c b/jobs.c index 919a88b..0e355a9 100644 --- a/jobs.c +++ b/jobs.c @@ -1,9 +1,9 @@ -/* $OpenBSD: jobs.c,v 1.41 2015/04/18 18:28:36 deraadt Exp $ */ +/* $OpenBSD: jobs.c,v 1.43 2015/09/10 22:48:58 nicm Exp $ */ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, * 2012, 2013, 2014, 2015 - * mirabilos + * mirabilos * * Provided that these terms and disclaimer and all copyright notices * are retained or reproduced in an accompanying document, permission @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.115 2015/09/05 19:19:05 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.116 2015/10/09 16:11:15 tg Exp $"); #if HAVE_KILLPG #define mksh_killpg killpg @@ -86,7 +86,7 @@ struct job { int flags; /* see JF_* */ volatile int state; /* job state */ int status; /* exit status of last process */ - int32_t age; /* number of jobs started */ + int age; /* number of jobs started */ Coproc_id coproc_id; /* 0 or id of coprocess output pipe */ #ifndef MKSH_UNEMPLOYED mksh_ttyst ttystat; /* saved tty state for stopped jobs */ @@ -118,7 +118,7 @@ static Job *async_job; static pid_t async_pid; static int nzombie; /* # of zombies owned by this process */ -static int32_t njobs; /* # of jobs started */ +static int njobs; /* # of jobs started */ #ifndef CHILD_MAX #define CHILD_MAX 25 diff --git a/lex.c b/lex.c index d3fabe2..c0388f2 100644 --- a/lex.c +++ b/lex.c @@ -1,9 +1,9 @@ -/* $OpenBSD: lex.c,v 1.50 2015/07/30 14:59:12 zhuk Exp $ */ +/* $OpenBSD: lex.c,v 1.51 2015/09/10 22:48:58 nicm Exp $ */ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, * 2011, 2012, 2013, 2014, 2015 - * mirabilos + * mirabilos * * Provided that these terms and disclaimer and all copyright notices * are retained or reproduced in an accompanying document, permission @@ -23,7 +23,7 @@ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.209 2015/09/06 19:47:00 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.210 2015/10/09 16:11:16 tg Exp $"); /* * states while lexing word diff --git a/main.c b/main.c index 9e746e8..770439f 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,6 @@ -/* $OpenBSD: main.c,v 1.56 2015/09/01 17:46:31 tedu Exp $ */ +/* $OpenBSD: main.c,v 1.57 2015/09/10 22:48:58 nicm Exp $ */ /* $OpenBSD: tty.c,v 1.10 2014/08/10 02:44:26 guenther Exp $ */ -/* $OpenBSD: io.c,v 1.25 2014/08/11 20:28:47 guenther Exp $ */ +/* $OpenBSD: io.c,v 1.26 2015/09/11 08:00:27 guenther Exp $ */ /* $OpenBSD: table.c,v 1.16 2015/09/01 13:12:31 tedu Exp $ */ /*- @@ -34,7 +34,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/main.c,v 1.303 2015/10/05 17:58:59 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/main.c,v 1.304 2015/10/09 16:11:16 tg Exp $"); extern char **environ; diff --git a/misc.c b/misc.c index f0924df..2923e35 100644 --- a/misc.c +++ b/misc.c @@ -1,10 +1,10 @@ -/* $OpenBSD: misc.c,v 1.40 2015/03/18 15:12:36 tedu Exp $ */ +/* $OpenBSD: misc.c,v 1.41 2015/09/10 22:48:58 nicm Exp $ */ /* $OpenBSD: path.c,v 1.13 2015/09/05 09:47:08 jsg Exp $ */ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, * 2011, 2012, 2013, 2014, 2015 - * mirabilos + * mirabilos * * Provided that these terms and disclaimer and all copyright notices * are retained or reproduced in an accompanying document, permission @@ -30,7 +30,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.239 2015/09/05 19:19:07 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.240 2015/10/09 16:11:17 tg Exp $"); #define KSH_CHVT_FLAG #ifdef MKSH_SMALL diff --git a/sh.h b/sh.h index ecf2ec9..f0ee8ff 100644 --- a/sh.h +++ b/sh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sh.h,v 1.33 2013/12/18 13:53:12 millert Exp $ */ +/* $OpenBSD: sh.h,v 1.35 2015/09/10 22:48:58 nicm Exp $ */ /* $OpenBSD: shf.h,v 1.6 2005/12/11 18:53:51 deraadt Exp $ */ /* $OpenBSD: table.h,v 1.8 2012/02/19 07:52:30 otto Exp $ */ /* $OpenBSD: tree.h,v 1.10 2005/03/28 21:28:22 deraadt Exp $ */ @@ -172,7 +172,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.745 2015/10/05 17:59:00 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.746 2015/10/09 16:11:18 tg Exp $"); #endif #define MKSH_VERSION "R51 2015/10/05" @@ -1028,7 +1028,7 @@ EXTERN Getopt user_opt; /* parsing state for getopts builtin command */ /* This for co-processes */ /* something that won't (realisticly) wrap */ -typedef int32_t Coproc_id; +typedef int Coproc_id; struct coproc { void *job; /* 0 or job of co-process using input pipe */ diff --git a/var.c b/var.c index 6c0165b..d8e31ae 100644 --- a/var.c +++ b/var.c @@ -1,9 +1,9 @@ -/* $OpenBSD: var.c,v 1.43 2015/09/01 13:12:31 tedu Exp $ */ +/* $OpenBSD: var.c,v 1.44 2015/09/10 11:37:42 jca Exp $ */ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, * 2011, 2012, 2013, 2014, 2015 - * mirabilos + * mirabilos * * Provided that these terms and disclaimer and all copyright notices * are retained or reproduced in an accompanying document, permission @@ -28,7 +28,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/var.c,v 1.194 2015/09/05 19:19:12 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/var.c,v 1.195 2015/10/09 16:11:19 tg Exp $"); /*- * Variables