diff options
| author |   millert <millert@openbsd.org> | 1999-02-24 06:37:12 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1999-02-24 06:37:12 +0000 |
| commit | 936c48d99accbe29fd16679ed55a4317c9695822 (patch) | |
| tree | 10a8e64cf036a526e43ca14b2cfc72619952884b /lib | |
| parent | This is 5.0, not 4.2 (diff) | |
| download | wireguard-openbsd-936c48d99accbe29fd16679ed55a4317c9695822.tar.xz wireguard-openbsd-936c48d99accbe29fd16679ed55a4317c9695822.zip | |
updates from ncurses-4.2-990220
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libmenu/m_item_opt.c | 9 | ||||
| -rw-r--r-- | lib/libmenu/m_opts.c | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/libmenu/m_item_opt.c b/lib/libmenu/m_item_opt.c index 7900d75c688..8dce6114bf4 100644 --- a/lib/libmenu/m_item_opt.c +++ b/lib/libmenu/m_item_opt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_item_opt.c,v 1.4 1998/07/24 16:39:02 millert Exp $ */ +/* $OpenBSD: m_item_opt.c,v 1.5 1999/02/24 06:37:12 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -39,7 +39,7 @@ #include "menu.priv.h" -MODULE_ID("$From: m_item_opt.c,v 1.6 1998/02/11 12:13:49 tom Exp $") +MODULE_ID("$From: m_item_opt.c,v 1.8 1999/02/18 16:12:15 juergen Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -54,6 +54,8 @@ MODULE_ID("$From: m_item_opt.c,v 1.6 1998/02/11 12:13:49 tom Exp $") +--------------------------------------------------------------------------*/ int set_item_opts(ITEM *item, Item_Options opts) { + opts &= ALL_ITEM_OPTS; + if (opts & ~ALL_ITEM_OPTS) RETURN(E_BAD_ARGUMENT); @@ -100,7 +102,7 @@ int item_opts_off(ITEM *item, Item_Options opts) else { Normalize_Item(citem); - opts = citem->opt & ~opts; + opts = citem->opt & ~(opts & ALL_ITEM_OPTS); return set_item_opts( item, opts ); } } @@ -119,6 +121,7 @@ int item_opts_on(ITEM *item, Item_Options opts) ITEM *citem = item; /* use a copy because set_item_opts must detect NULL item itself to adjust its behaviour */ + opts &= ALL_ITEM_OPTS; if (opts & ~ALL_ITEM_OPTS) RETURN(E_BAD_ARGUMENT); else diff --git a/lib/libmenu/m_opts.c b/lib/libmenu/m_opts.c index 6af6a0f2bcc..7006ebf8403 100644 --- a/lib/libmenu/m_opts.c +++ b/lib/libmenu/m_opts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_opts.c,v 1.4 1998/07/24 16:39:10 millert Exp $ */ +/* $OpenBSD: m_opts.c,v 1.5 1999/02/24 06:37:12 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -39,7 +39,7 @@ #include "menu.priv.h" -MODULE_ID("$From: m_opts.c,v 1.8 1998/02/11 12:13:49 tom Exp $") +MODULE_ID("$From: m_opts.c,v 1.10 1999/02/18 16:12:19 juergen Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -56,6 +56,8 @@ MODULE_ID("$From: m_opts.c,v 1.8 1998/02/11 12:13:49 tom Exp $") +--------------------------------------------------------------------------*/ int set_menu_opts(MENU * menu, Menu_Options opts) { + opts &= ALL_MENU_OPTS; + if (opts & ~ALL_MENU_OPTS) RETURN(E_BAD_ARGUMENT); @@ -114,6 +116,7 @@ int menu_opts_off(MENU *menu, Menu_Options opts) MENU *cmenu = menu; /* use a copy because set_menu_opts must detect NULL menu itself to adjust its behaviour */ + opts &= ALL_MENU_OPTS; if (opts & ~ALL_MENU_OPTS) RETURN(E_BAD_ARGUMENT); else @@ -142,6 +145,7 @@ int menu_opts_on(MENU * menu, Menu_Options opts) MENU *cmenu = menu; /* use a copy because set_menu_opts must detect NULL menu itself to adjust its behaviour */ + opts &= ALL_MENU_OPTS; if (opts & ~ALL_MENU_OPTS) RETURN(E_BAD_ARGUMENT); else |