-/*-----------------------------------------------------------------------------+
-| The ncurses menu library is Copyright (C) 1995-1997 |
-| by Juergen Pfeifer <Juergen.Pfeifer@T-Online.de> |
-| All Rights Reserved. |
-| |
-| Permission to use, copy, modify, and distribute this software and its |
-| documentation for any purpose and without fee is hereby granted, provided |
-| that the above copyright notice appear in all copies and that both that |
-| copyright notice and this permission notice appear in supporting |
-| documentation, and that the name of the above listed copyright holder(s) not |
-| be used in advertising or publicity pertaining to distribution of the |
-| software without specific, written prior permission. |
-| |
-| THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO |
-| THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- |
-| NESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR |
-| ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RE- |
-| SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, |
-| NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH |
-| THE USE OR PERFORMANCE OF THIS SOFTWARE. |
-+-----------------------------------------------------------------------------*/
+/****************************************************************************
+ * Copyright (c) 1998 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+ * "Software"), to deal in the Software without restriction, including *
+ * without limitation the rights to use, copy, modify, merge, publish, *
+ * distribute, distribute with modifications, sublicense, and/or sell *
+ * copies of the Software, and to permit persons to whom the Software is *
+ * furnished to do so, subject to the following conditions: *
+ * *
+ * The above copyright notice and this permission notice shall be included *
+ * in all copies or substantial portions of the Software. *
+ * *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
+ * *
+ * Except as contained in this notice, the name(s) of the above copyright *
+ * holders shall not be used in advertising or otherwise to promote the *
+ * sale, use or other dealings in this Software without prior written *
+ * authorization. *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 *
+ ****************************************************************************/
/***************************************************************************
-* Module menu_item_new *
+* Module m_item_new *
* Create and destroy menu items *
-* Set and get marker string for menu
+* Set and get marker string for menu *
***************************************************************************/
#include "menu.priv.h"
-MODULE_ID("$Id: m_item_new.c,v 1.5 1997/05/01 16:47:26 juergen Exp $")
+MODULE_ID("$Id: m_item_new.c,v 1.11 1999/05/16 17:28:49 juergen Exp $")
/*---------------------------------------------------------------------------
| Facility : libnmenu
*item = _nc_Default_Item; /* hope we have struct assignment */
item->name.length = strlen(name);
- item->name.str = (char *)malloc(1 + item->name.length);
- if (item->name.str)
- {
- strcpy(item->name.str, name);
- }
- else
- {
- free(item);
- SET_ERROR( E_SYSTEM_ERROR );
- return (ITEM *)0;
- }
-
+ item->name.str = name;
+
if (description && (*description != '\0') &&
Is_Printable_String(description))
{
item->description.length = strlen(description);
- item->description.str =
- (char *)malloc(1 + item->description.length);
- if (item->description.str)
- {
- strcpy(item->description.str, description);
- }
- else
- {
- free(item->name.str);
- free(item);
- SET_ERROR( E_SYSTEM_ERROR );
- return (ITEM *)0;
- }
+ item->description.str = description;
}
else
{
if (item->imenu)
RETURN( E_CONNECTED );
- if (item->name.str)
- free(item->name.str);
- if (item->description.str)
- free (item->description.str);
free(item);
RETURN( E_OK );
if (menu->mark)
{
strcpy(menu->mark, mark);
- menu->status |= _MARK_ALLOCATED;
+ if (menu != &_nc_Default_Menu)
+ menu->status |= _MARK_ALLOCATED;
}
else
{
projects / ncurses.git / blobdiff