diff options
| author | Andrew Choi <akochoi@shaw.ca> | 2002-12-02 17:13:46 +0000 |
|---|---|---|
| committer | Andrew Choi <akochoi@shaw.ca> | 2002-12-02 17:13:46 +0000 |
| commit | 72742a999a8b0ea7a67dd2c3c17f89579a2bb102 (patch) | |
| tree | 9149b74ee2c16995e06f2e93ab955b6eab044813 /src/macmenu.c | |
| parent | 4b5e69bd4436879d0f0969f2df1adb4fe2ceb922 (diff) | |
| download | emacs-72742a999a8b0ea7a67dd2c3c17f89579a2bb102.tar.gz | |
2002-12-02 Andrew Choi <akochoi@shaw.ca>
* macmenu.c (add_menu_item, fill_menubar): Truncate menu item
names to 255 characters.
* macterm.c (XTread_socket): If all frames have been collapsed,
expand the first one before handling drag-and-drop events.
* s/darwin.h (GETPGRP_NO_ARG): Delete. Replaced by GETPGRP_VOID,
which is detected by autoconf.
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index 128235c027b..05424ead2fa 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -2226,13 +2226,14 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu, int indent, strcpy (item_name, ""); for (i = 0; i < indent; i++) - strcat (item_name, " "); - strcat (item_name, wv->name); + strncat (item_name, " ", 255); + strncat (item_name, wv->name, 255); if (wv->key != NULL) { - strcat (item_name, " "); - strcat (item_name, wv->key); + strncat (item_name, " ", 255); + strncat (item_name, wv->key, 255); } + item_name[255] = 0; c2pstr (item_name); SetMenuItemText (menu, pos, item_name); @@ -2316,7 +2317,8 @@ fill_menubar (widget_value *wv) MenuHandle menu; Str255 title; - strcpy (title, wv->name); + strncpy (title, wv->name, 255); + title[255] = 0; c2pstr (title); menu = NewMenu (id, title); |