Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

Browse Source 
- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
Lionel Sambuc
2013-12-06 12:04:52 +01:00
parent ff10274392
commit 84d9c625bf
4655 changed files with 379317 additions and 151059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libmenu/internals.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: internals.c,v 1.15 2012/06/27 11:53:36 blymn Exp $ */
/* $NetBSD: internals.c,v 1.17 2013/10/18 19:53:59 christos Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.com.au)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: internals.c,v 1.15 2012/06/27 11:53:36 blymn Exp $");
__RCSID("$NetBSD: internals.c,v 1.17 2013/10/18 19:53:59 christos Exp $");
#include <menu.h>
#include <ctype.h>
@@ -446,7 +446,9 @@ _menui_draw_item(MENU *menu, int item)
* all others unless the menu unmark string is set in which
* case the unmark string is written.
*/
if (menu->items[item]->selected == 1) {
if ((menu->items[item]->selected == 1) ||
(((menu->opts & O_ONEVALUE) == O_ONEVALUE) &&
(menu->cur_item == item))) {
if (menu->mark.string != NULL) {
for (j = 0; j < menu->mark.length; j++) {
waddch(menu->scrwin,
@@ -515,7 +517,7 @@ _menui_draw_item(MENU *menu, int item)
int
_menui_draw_menu(MENU *menu)
{
int rowmajor, i, j, k, row = -1, col = -1, stride;
int rowmajor, i, j, k, row = -1, stride;
int incr, cur_row, offset, row_count;
rowmajor = ((menu->opts & O_ROWMAJOR) == O_ROWMAJOR);
@@ -553,7 +555,6 @@ _menui_draw_menu(MENU *menu)
wattrset(menu->scrwin, menu->back);
if (row < 0) {
row = menu->items[menu->item_count - 1]->row;
col = menu->items[menu->item_count - 1]->col;
}
wmove(menu->scrwin, cur_row,

13
lib/libmenu/menu.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: menu.c,v 1.17 2012/03/21 05:33:27 matt Exp $ */
/* $NetBSD: menu.c,v 1.18 2012/12/30 12:27:09 blymn Exp $ */
/*-
* Copyright (c) 1998-1999 Brett Lymn (blymn@baea.com.au, brett_lymn@yahoo.com.au)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: menu.c,v 1.17 2012/03/21 05:33:27 matt Exp $");
__RCSID("$NetBSD: menu.c,v 1.18 2012/12/30 12:27:09 blymn Exp $");
#include <ctype.h>
#include <menu.h>
@@ -445,7 +445,8 @@ MENU *
new_menu(ITEM **items)
{
MENU *the_menu;
char mark[2];
if ((the_menu = (MENU *)malloc(sizeof(MENU))) == NULL)
return NULL;
@@ -483,6 +484,12 @@ new_menu(ITEM **items)
(unsigned) _menui_default_menu.unmark.length+ 1 );
}
/* default mark needs to be set */
mark[0] = '-';
mark[1] = '\0';
set_menu_mark(the_menu, mark);
/* now attach the items, if any */
if (items != NULL) {
if(set_menu_items(the_menu, items) < 0) {