JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x_bind cannot have the nonnull attribute

Browse Source 
cought by Frank “enstein” Terbeck «ft:#grml» (efftee), 10x
This commit is contained in:
tg 2010-02-23 18:13:04 +00:00
parent 5beee95d6b
commit 150a35a02d
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.361 2010/02/18 17:31:22 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.362 2010/02/23 18:13:00 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -25,7 +25,7 @@
# http://www.research.att.com/~gsf/public/ifs.sh # http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R39 2010/02/18 @(#)MIRBSD KSH R39 2010/02/23
description: description:
Check version of shell. Check version of shell.
stdin: stdin:

6
edit.c
View File

@ -25,7 +25,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.189 2010/01/29 09:34:26 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.190 2010/02/23 18:13:02 tg Exp $");
/* tty driver characters we are interested in */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -857,11 +857,7 @@ static void x_load_hist(char **);
static int x_search(char *, int, int); static int x_search(char *, int, int);
#ifndef MKSH_SMALL #ifndef MKSH_SMALL
static int x_search_dir(int); static int x_search_dir(int);
int x_bind(const char *, const char *, bool, bool)
#else
int x_bind(const char *, const char *, bool)
#endif #endif
MKSH_A_NONNULL((nonnull (1, 2)));
static int x_match(char *, char *); static int x_match(char *, char *);
static void x_redraw(int); static void x_redraw(int);
static void x_push(int); static void x_push(int);

8
funcs.c
View File

@ -25,7 +25,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.150 2010/01/28 15:18:48 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.151 2010/02/23 18:13:03 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -1683,12 +1683,6 @@ c_getopts(const char **wp)
return (optc < 0 ? 1 : rv); return (optc < 0 ? 1 : rv);
} }
#ifndef MKSH_SMALL
extern int x_bind(const char *, const char *, bool, bool);
#else
extern int x_bind(const char *, const char *, bool);
#endif
int int
c_bind(const char **wp) c_bind(const char **wp)
{ {

9
sh.h
View File

@ -150,9 +150,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.381 2010/02/18 17:31:23 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.382 2010/02/23 18:13:04 tg Exp $");
#endif #endif
#define MKSH_VERSION "R39 2010/02/18" #define MKSH_VERSION "R39 2010/02/23"
#ifndef MKSH_INCLUDES_ONLY #ifndef MKSH_INCLUDES_ONLY
@ -1350,6 +1350,11 @@ void afreeall(Area *);
void *aresize(void *, size_t, Area *); void *aresize(void *, size_t, Area *);
void afree(void *, Area *); /* can take NULL */ void afree(void *, Area *); /* can take NULL */
/* edit.c */ /* edit.c */
#ifndef MKSH_SMALL
int x_bind(const char *, const char *, bool, bool);
#else
int x_bind(const char *, const char *, bool);
#endif
void x_init(void); void x_init(void);
int x_read(char *, size_t); int x_read(char *, size_t);
/* eval.c */ /* eval.c */