Remove lesstif, it never really up with openmotif and isn't relevant anymore.

Depending ports and the infrastructure will taken care of shortly.

ok aja@ sthen@
This commit is contained in:
jasper 2011-04-10 17:54:34 +00:00
parent 19a13622f3
commit 7a4f9fe888
24 changed files with 1 additions and 1406 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.445 2011/04/07 14:54:58 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.446 2011/04/10 17:54:34 jasper Exp $
# $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
SUBDIR =
@ -141,7 +141,6 @@
SUBDIR += krusader
SUBDIR += lablgtk2
SUBDIR += league-fonts
SUBDIR += lesstif
SUBDIR += libdnd
SUBDIR += liberation-fonts
SUBDIR += libgdiplus

View File

@ -1,65 +0,0 @@
# $OpenBSD: Makefile,v 1.60 2010/10/24 21:15:33 ajacoutot Exp $
# $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $
COMMENT= API-compatible clone of the Motif toolkit
DISTNAME= lesstif-0.92.6
REVISION= 2
SHARED_LIBS= Mrm 1.2 \
Uil 1.2 \
Xm 1.2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/}
HOMEPAGE= http://www.lesstif.org/
# GPL/LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE SM X11 Xau Xdmcp Xext Xt c pthread-stubs xcb
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_GROFF = Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/Xlt ${WRKSRC}/lib/Xbae
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-static \
--enable-production \
--enable-build-12 \
--disable-build-20 \
--disable-build-21 \
--enable-default-12 \
--disable-build-Xbae \
--disable-build-Xlt \
--disable-debug \
--with-editres
.if defined(HAVE_MOTIF) && ${HAVE_MOTIF:L} == "yes"
IS_INTERACTIVE= Yes
pre-install:
@echo "***********************************************************"
@echo "* W a r n i n g *"
@echo "* This port will overwrite your Motif installation. *"
@echo "***********************************************************"
@echo -n "Is this ok? (y/n) ==> "
@(read ans; \
case x"$$ans" in \
xy*|xY*) \
return 0; \
;; \
*) \
echo "Okay, I won't install it then...."; \
echo "(Don't worry about the following \"*** Error code 1\"s)"; \
return 1; \
;; \
esac)
.endif
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (lesstif-0.92.6.tar.gz) = xvwbe3nn1eLmn2p2PNlz3Q==
RMD160 (lesstif-0.92.6.tar.gz) = 0nHz8utJNK8g+wmfqGQZ20nzcqI=
SHA1 (lesstif-0.92.6.tar.gz) = zx7fV0d8n1V4lmUK3o2z6vwDYjs=
SHA256 (lesstif-0.92.6.tar.gz) = 4k+AGrR5/NUdLwv1VydbM6EWm2uHoPYtWOCAcIEYv6c=
SIZE (lesstif-0.92.6.tar.gz) = 3884005

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-Makefile.in,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- Makefile.in.orig Thu Dec 21 13:42:37 2000
+++ Makefile.in Thu Jan 12 00:58:07 2006
@@ -128,14 +128,14 @@ AUTOMAKE_OPTIONS = 1.4
# Lets put the informational stuff in a sub directory to avoid
# poluting /usr/local for default installs.
#
-rootdir = $(exec_prefix)/LessTif
+rootdir = $(pkgdatadir)
root_DATA = AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS KNOWN_BUGS README RELEASE-POLICY release-notes.txt
EXTRA_DIST = acconfig.h configure BUG-REPORTING CREDITS KNOWN_BUGS RELEASE-POLICY NOTES
-htmldir = $(exec_prefix)/LessTif/doc
+htmldir = $(pkgdatadir)/doc/html
html_DATA = release-notes.html
#install-data-hook:

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- configure.orig Thu Dec 21 13:42:35 2000
+++ configure Thu Jan 12 00:58:07 2006
@@ -807,7 +807,7 @@ else
fi
-PACKAGE=lesstif
+PACKAGE=LessTif
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile.in,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- doc/Makefile.in.orig Thu Dec 21 13:42:41 2000
+++ doc/Makefile.in Thu Jan 12 00:58:07 2006
@@ -120,7 +120,7 @@ EXTRA_DIST = $(DATA)
SUBDIRS = www.lesstif.org lessdox
-rootdir = $(exec_prefix)/LessTif/doc
+rootdir = $(pkgdatadir)/doc/html
root_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt GeoUtils.txt Geometry.html SyntheticResources.txt UIL.txt XmStrings.txt thread.html INSTALL.html
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-doc_lessdox_clients_Makefile.in,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- doc/lessdox/clients/Makefile.in.orig Thu Dec 21 13:42:41 2000
+++ doc/lessdox/clients/Makefile.in Thu Jan 12 00:58:07 2006
@@ -118,16 +118,16 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
SUFFIXES = .1 .3 .5 .html
-mandir = $(exec_prefix)/LessTif/doc/man
-man1dir = $(exec_prefix)/LessTif/doc/man/man1
-man3dir = $(exec_prefix)/LessTif/doc/man/man3
-man5dir = $(exec_prefix)/LessTif/doc/man/man5
+mandir = @mandir@
+man1dir = $(mandir)/man1
+man3dir = $(mandir)/man3
+man5dir = $(mandir)/man5
-man1_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 xbae.1 xlt.1
+man1_DATA = mwm.1 xmbind.1 lesstif.1 uil.1
man3_DATA =
man5_DATA = mwmrc.5
-htmldir = $(exec_prefix)/LessTif/doc/html
+htmldir = $(pkgdatadir)/doc/html
html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html uil.html xlt.html xbae.html

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-doc_lessdox_functions_Makefile.in,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- doc/lessdox/functions/Makefile.in.orig Thu Dec 21 13:42:41 2000
+++ doc/lessdox/functions/Makefile.in Thu Jan 12 00:58:07 2006
@@ -118,16 +118,16 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
SUFFIXES = .1 .3 .5 .html
-mandir = $(exec_prefix)/LessTif/doc/man
-man1dir = $(exec_prefix)/LessTif/doc/man/man1
-man3dir = $(exec_prefix)/LessTif/doc/man/man3
-man5dir = $(exec_prefix)/LessTif/doc/man/man5
+mandir = @mandir@
+man1dir = $(mandir)/man1
+man3dir = $(mandir)/man3
+man5dir = $(mandir)/man5
man1_DATA =
man3_DATA =
man5_DATA =
-htmldir = $(exec_prefix)/LessTif/doc/html
+htmldir = $(pkgdatadir)/doc/html
html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} ${man5_DATA:.5=.html}

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-doc_lessdox_widgets_Makefile.in,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- doc/lessdox/widgets/Makefile.in.orig Thu Dec 21 13:42:41 2000
+++ doc/lessdox/widgets/Makefile.in Thu Jan 12 00:58:07 2006
@@ -118,10 +118,10 @@ MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(man1_DATA) $(man3_DATA) $(man5_DATA)
SUFFIXES = .1 .3 .5 .html
-mandir = $(prefix)/LessTif/doc/man
-man1dir = $(prefix)/LessTif/doc/man/man1
-man3dir = $(prefix)/LessTif/doc/man/man3
-man5dir = $(prefix)/LessTif/doc/man/man5
+mandir= @mandir@
+man1dir= $(mandir)/man1
+man3dir= $(mandir)/man3
+man5dir= $(mandir)/man5
man1_DATA =
man3_DATA = XmClipboard.3 LessTifInternals.3 XmArrowButton.3 XmArrowButtonGadget.3 XmBulletinBoard.3 XmCascadeButton.3 XmCascadeButtonGadget.3 XmComboBox.3 XmCommand.3 XmDesktop.3 XmDialogShell.3 XmDialogShellExt.3 XmDisplay.3 XmDragContext.3 XmDragIcon.3 XmDragOverShell.3 XmDrawingArea.3 XmDrawnButton.3 XmDropSiteManager.3 XmDropTransfer.3 XmFileSelectionBox.3 XmForm.3 XmFrame.3 XmGadget.3 XmGrabShell.3 XmIconGadget.3 XmLabel.3 XmLabelGadget.3 XmList.3 XmMainWindow.3 XmManager.3 XmMenuShell.3 XmMessageBox.3 XmNotebook.3 XmPanedWindow.3 XmPrimitive.3 XmProtocol.3 XmPushButton.3 XmPushButtonGadget.3 XmRowColumn.3 XmSash.3 XmScale.3 XmScreen.3 XmScrollBar.3 XmScrolledWindow.3 XmSelectionBox.3 XmSeparator.3 XmSeparatorGadget.3 XmSpinBox.3 XmTearOffButton.3 XmText.3 XmTextField.3 XmToggleButton.3 XmToggleButtonGadget.3 XmVendorShell.3 XmWorld.3
@@ -137,7 +137,7 @@ man3_DATA = XmClipboard.3 LessTifInter
man5_DATA =
-htmldir = $(prefix)/LessTif/doc/html
+htmldir = $(pkgdatadir)/doc/html
html_DATA = ${man1_DATA:.1=.html} ${man3_DATA:.3=.html} ${man5_DATA:.5=.html}
@@ -352,7 +352,7 @@ $(html_DATA): $(MAN2HTML)
# in both the http://www.lesstif.org and the locally installed case.
#
install-data-hook:
- if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
+# if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-doc_www.lesstif.org_Makefile.in,v 1.4 2006/01/12 00:08:47 naddy Exp $
--- doc/www.lesstif.org/Makefile.in.orig Thu Dec 21 13:42:41 2000
+++ doc/www.lesstif.org/Makefile.in Thu Jan 12 00:58:07 2006
@@ -125,14 +125,14 @@ SUBDIRS = images
# Lets put the informational stuff in a sub directory to avoid
# polluting /usr/local for default installs.
#
-docdir = $(exec_prefix)/LessTif/doc
+docdir = $(pkgdatadir)/doc/html
doc_DATA = COPYING.LIB.html FAQ.html INSTALL.html apps.html bugs.html cdrom.html core.html current.html cvs.html download.html index.html links.html lists.html mirrors.html platforms.html release-policy.html test_policy.html test_summary.html testers.html versions.html web_button.html known.html help.html Advocacy.html Xbae.html Xlt.html feedback.html
-rootdir = $(exec_prefix)/LessTif
+rootdir = $(pkgdatadir)
root_DATA = Install
-root2dir = $(exec_prefix)/LessTif
+root2dir = $(pkgdatadir)
root2_DATA = FAQ
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../include/LTconfig.h

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_www.lesstif.org_images_Makefile.in,v 1.4 2006/01/12 00:08:47 naddy Exp $
--- doc/www.lesstif.org/images/Makefile.in.orig Thu Dec 21 13:42:41 2000
+++ doc/www.lesstif.org/images/Makefile.in Thu Jan 12 00:58:07 2006
@@ -124,7 +124,7 @@ EXTRA_DIST = $(DATA)
# Lets put the informational stuff in a sub directory to avoid
# poluting /usr/local for default installs.
#
-rootdir = $(exec_prefix)/LessTif/doc/images
+rootdir = $(pkgdatadir)/doc/html/images
root_DATA = hungry.png lesstif-realsmall.png lesstif-small.png lesstif.png ltsunlogo.png lesstif.jpg ltsunlogo.jpg vh32.jpg vh32.png vh40.jpg vh40.png
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-include_Motif-1_2_XmI_XmXpmI_h,v 1.1 2004/09/01 22:57:36 pvalchev Exp $
--- include/Motif-1.2/XmI/XmXpmI.h.orig Thu Sep 21 14:49:43 2000
+++ include/Motif-1.2/XmI/XmXpmI.h Wed Sep 1 20:30:12 2004
@@ -90,6 +90,11 @@ extern FILE *popen();
boundCheckingCalloc((long)(nelem),(long) (elsize))
#endif
+#if defined(SCO) || defined(__USLC__)
+#include <stdint.h> /* For SIZE_MAX */
+#endif
+#include <limits.h>
+
#define XPMMAXCMTLEN BUFSIZ
typedef struct {
unsigned int type;
@@ -187,9 +192,9 @@ typedef struct _xpmHashAtom {
} *xpmHashAtom;
typedef struct {
- int size;
- int limit;
- int used;
+ unsigned int size;
+ unsigned int limit;
+ unsigned int used;
xpmHashAtom *atomTable;
} xpmHashTable;

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-include_Motif-2_0_XmI_XpmI_h,v 1.1 2004/09/01 22:57:36 pvalchev Exp $
--- include/Motif-2.0/XmI/XpmI.h.orig Thu Sep 21 14:56:42 2000
+++ include/Motif-2.0/XmI/XpmI.h Wed Sep 1 20:30:12 2004
@@ -92,6 +92,11 @@ extern FILE *popen();
boundCheckingCalloc((long)(nelem),(long) (elsize))
#endif
+#if defined(SCO) || defined(__USLC__)
+#include <stdint.h> /* For SIZE_MAX */
+#endif
+#include <limits.h>
+
#define XPMMAXCMTLEN BUFSIZ
typedef struct {
unsigned int type;
@@ -189,9 +194,9 @@ typedef struct _xpmHashAtom {
} *xpmHashAtom;
typedef struct {
- int size;
- int limit;
- int used;
+ unsigned int size;
+ unsigned int limit;
+ unsigned int used;
xpmHashAtom *atomTable;
} xpmHashTable;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_Makefile.in,v 1.3 2006/01/12 00:08:47 naddy Exp $
--- lib/Makefile.in.orig Thu Dec 21 13:42:38 2000
+++ lib/Makefile.in Thu Jan 12 00:58:07 2006
@@ -116,7 +116,7 @@ xmVERSION = @xmVERSION@
xmVer = @xmVer@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = config Xm Mrm Uil Xm-2.0 Mrm-2.0 Uil-2.0 Xm-2.1 Mrm-2.1 Uil-2.1 @BuildXltDir@ @BuildXbaeDir@ Dt
+SUBDIRS = config Xm Mrm Uil @BuildXltDir@ @BuildXbaeDir@ Dt
DIST_SUBDIRS = config Xm Mrm Uil Xm-2.0 Mrm-2.0 Uil-2.0 Xm-2.1 Mrm-2.1 Uil-2.1 Xlt Xbae Dt

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_Mrm_Makefile_in,v 1.1 2006/01/12 01:05:23 naddy Exp $
--- lib/Mrm/Makefile.in.orig Thu Jan 12 00:52:22 2006
+++ lib/Mrm/Makefile.in Thu Jan 12 00:54:00 2006
@@ -366,7 +366,7 @@ mostlyclean distclean maintainer-clean
install-data-hook:
@Version_1_2_TRUE@@LibtoolShared_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so.1*
-@Version_1_2_TRUE@@LibtoolShared_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.1* .)
+@Version_1_2_TRUE@@LibtoolShared_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.so.* .)
@Version_1_2_TRUE@@DefaultVersion12_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libMrm.la
@Version_1_2_TRUE@@DefaultVersion12_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libMrm.la .)
@Version_1_2_TRUE@@DefaultVersion12_TRUE@@LibtoolShared_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libMrm.so

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_Uil_Makefile_in,v 1.1 2006/01/12 01:05:23 naddy Exp $
--- lib/Uil/Makefile.in.orig Thu Jan 12 00:52:44 2006
+++ lib/Uil/Makefile.in Thu Jan 12 00:54:08 2006
@@ -366,7 +366,7 @@ mostlyclean distclean maintainer-clean
install-data-hook:
@Version_1_2_TRUE@@LibtoolShared_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libUil.so.1*
-@Version_1_2_TRUE@@LibtoolShared_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so.1* .)
+@Version_1_2_TRUE@@LibtoolShared_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.so.* .)
@Version_1_2_TRUE@@DefaultVersion12_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libUil.la
@Version_1_2_TRUE@@DefaultVersion12_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libUil.la .)
@Version_1_2_TRUE@@DefaultVersion12_TRUE@@LibtoolShared_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libUil.so

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_Uil_uillex_c,v 1.1 2003/01/02 06:39:31 pvalchev Exp $
--- lib/Uil/uillex.c.orig Thu Dec 12 01:25:29 2002
+++ lib/Uil/uillex.c Thu Dec 12 01:25:43 2002
@@ -435,7 +435,7 @@ unput(Uil_parse_data *pd)
extern int
_uil_next_lexeme(Uil_parse_data *pd)
{
- char ch, ch2, *ptr;
+ signed char ch, ch2, *ptr;
int have_point;
sym_entry *e;

View File

@ -1,339 +0,0 @@
$OpenBSD: patch-lib_Xm-2_0_Xpm_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $
--- lib/Xm-2.0/Xpm.c.orig Fri Sep 22 22:35:14 2000
+++ lib/Xm-2.0/Xpm.c Wed Sep 1 20:30:12 2004
@@ -53,7 +53,7 @@ int xpmParseDataAndCreate(Display *displ
XpmAttributes *attributes);
/* 3.2 backward compatibility code */
-LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
XpmColor ***oldct));
LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
@@ -64,12 +64,15 @@ LFUNC(FreeOldColorTable, void, (XpmColor
static int
CreateOldColorTable(ct, ncolors, oldct)
XpmColor *ct;
- int ncolors;
+ unsigned int ncolors;
XpmColor ***oldct;
{
XpmColor **colorTable, **color;
int a;
+ if (ncolors >= SIZE_MAX / sizeof(XpmColor *))
+ return XpmNoMemory;
+
colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
if (!colorTable) {
*oldct = NULL;
@@ -1302,6 +1305,8 @@ WritePixels(FILE *file, unsigned int wid
unsigned int x, y, h;
h = height - 1;
+ if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp)
+ return XpmNoMemory;
p = buf = (char *) XpmMalloc(width * cpp + 3);
if (!buf)
return (XpmNoMemory);
@@ -2289,6 +2294,9 @@ XpmCreateImageFromXpmImage(display, imag
ErrorStatus = XpmSuccess;
+ if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
+ return (XpmNoMemory);
+
/* malloc pixels index tables */
image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
if (!image_pixels)
@@ -2461,6 +2469,8 @@ CreateXImage(display, visual, depth, for
return (XpmNoMemory);
#if !defined(FOR_MSW) && !defined(AMIGA)
+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
+ return XpmNoMemory;
/* now that bytes_per_line must have been set properly alloc data */
(*image_return)->data =
(char *) XpmMalloc((*image_return)->bytes_per_line * height);
@@ -3531,6 +3541,9 @@ xpmParseDataAndCreate(display, data, ima
xpmGetCmt(data, &colors_cmt);
/* malloc pixels index tables */
+ if (ncolors >= SIZE_MAX / sizeof(Pixel))
+ return XpmNoMemory;
+
image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
if (!image_pixels)
RETURN(XpmNoMemory);
@@ -3789,8 +3802,9 @@ ParseAndPutPixels(
}
obm = SelectObject(*dc, image->bitmap);
#endif
+ if (ncolors > 256)
+ return (XpmFileInvalid);
-
memset((char *)colidx, 0, 256 * sizeof(short));
for (a = 0; a < ncolors; a++)
colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
@@ -3894,6 +3908,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
char *s;
char buf[BUFSIZ];
+ if (cpp >= sizeof(buf))
+ return (XpmFileInvalid);
+
buf[cpp] = '\0';
if (USE_HASHTABLE) {
xpmHashAtom *slot;
@@ -4300,7 +4317,7 @@ xpmGetCmt(mdata, cmt)
{
if (!mdata->type)
*cmt = NULL;
- else if (mdata->CommentLength) {
+ else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
*cmt = (char *) XpmMalloc(mdata->CommentLength + 1);
strncpy(*cmt, mdata->Comment, mdata->CommentLength);
(*cmt)[mdata->CommentLength] = '\0';
@@ -4510,7 +4527,7 @@ HashTableGrows(table)
xpmHashTable *table;
{
xpmHashAtom *atomTable = table->atomTable;
- int size = table->size;
+ unsigned int size = table->size;
xpmHashAtom *t, *p;
int i;
int oldSize = size;
@@ -4519,6 +4536,8 @@ HashTableGrows(table)
HASH_TABLE_GROWS
table->size = size;
table->limit = size / 3;
+ if (size >= SIZE_MAX / sizeof(*atomTable))
+ return (XpmNoMemory);
atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
if (!atomTable)
return (XpmNoMemory);
@@ -4579,6 +4598,8 @@ xpmHashTableInit(table)
table->size = INITIAL_HASH_SIZE;
table->limit = table->size / 3;
table->used = 0;
+ if (table->size >= SIZE_MAX / sizeof(*atomTable))
+ return (XpmNoMemory);
atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
if (!atomTable)
return (XpmNoMemory);
@@ -4899,7 +4920,7 @@ xpmParseValues(data, width, height, ncol
unsigned int *extensions;
{
unsigned int l;
- char buf[BUFSIZ];
+ char buf[BUFSIZ + 1];
if (!data->format) { /* XPM 2 or 3 */
@@ -5008,10 +5029,10 @@ xpmParseColors(data, ncolors, cpp, color
XpmColor **colorTablePtr;
xpmHashTable *hashtable;
{
- unsigned int key, l, a, b;
+ unsigned int key, l, a, b, len;
unsigned int curkey; /* current color key */
unsigned int lastwaskey; /* key read */
- char buf[BUFSIZ];
+ char buf[BUFSIZ+1];
char curbuf[BUFSIZ]; /* current buffer */
char **sptr, *s;
XpmColor *color;
@@ -5019,6 +5040,8 @@ xpmParseColors(data, ncolors, cpp, color
char **defaults;
int ErrorStatus;
+ if (ncolors >= SIZE_MAX / sizeof(XpmColor))
+ return (XpmNoMemory);
colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
if (!colorTable)
return (XpmNoMemory);
@@ -5030,6 +5053,10 @@ xpmParseColors(data, ncolors, cpp, color
/*
* read pixel value
*/
+ if (cpp >= SIZE_MAX - 1) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
color->string = (char *) XpmMalloc(cpp + 1);
if (!color->string) {
xpmFreeColorTable(colorTable, ncolors);
@@ -5067,13 +5094,14 @@ xpmParseColors(data, ncolors, cpp, color
}
if (!lastwaskey && key < NKEYS) { /* open new key */
if (curkey) { /* flush string */
- s = (char *) XpmMalloc(strlen(curbuf) + 1);
+ len = strlen(curbuf) + 1;
+ s = (char *) XpmMalloc(len);
if (!s) {
xpmFreeColorTable(colorTable, ncolors);
return (XpmNoMemory);
}
defaults[curkey] = s;
- strcpy(s, curbuf);
+ memcpy(s, curbuf, len);
}
curkey = key + 1; /* set new key */
*curbuf = '\0'; /* reset curbuf */
@@ -5084,9 +5112,9 @@ xpmParseColors(data, ncolors, cpp, color
return (XpmFileInvalid);
}
if (!lastwaskey)
- strcat(curbuf, " "); /* append space */
+ strlcat(curbuf, " ", sizeof(curbuf)); /* append space */
buf[l] = '\0';
- strcat(curbuf, buf);/* append buf */
+ strlcat(curbuf, buf, sizeof(curbuf));/* append buf */
lastwaskey = 0;
}
}
@@ -5094,12 +5122,13 @@ xpmParseColors(data, ncolors, cpp, color
xpmFreeColorTable(colorTable, ncolors);
return (XpmFileInvalid);
}
- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
+ len = strlen(curbuf) + 1;
+ s = defaults[curkey] = (char *) XpmMalloc(len);
if (!s) {
xpmFreeColorTable(colorTable, ncolors);
return (XpmNoMemory);
}
- strcpy(s, curbuf);
+ memcpy(s, curbuf, len);
}
} else { /* XPM 1 */
/* get to the beginning of the first string */
@@ -5112,6 +5141,10 @@ xpmParseColors(data, ncolors, cpp, color
/*
* read pixel value
*/
+ if (cpp >= SIZE_MAX - 1) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
color->string = (char *) XpmMalloc(cpp + 1);
if (!color->string) {
xpmFreeColorTable(colorTable, ncolors);
@@ -5140,16 +5173,17 @@ xpmParseColors(data, ncolors, cpp, color
*curbuf = '\0'; /* init curbuf */
while ((l = xpmNextWord(data, buf, BUFSIZ))) {
if (*curbuf != '\0')
- strcat(curbuf, " ");/* append space */
+ strlcat(curbuf, " ", sizeof(curbuf));/* append space */
buf[l] = '\0';
- strcat(curbuf, buf); /* append buf */
+ strlcat(curbuf, buf, sizeof(curbuf)); /* append buf */
}
- s = (char *) XpmMalloc(strlen(curbuf) + 1);
+ len = strlen(curbuf) + 1;
+ s = (char *) XpmMalloc(len);
if (!s) {
xpmFreeColorTable(colorTable, ncolors);
return (XpmNoMemory);
}
- strcpy(s, curbuf);
+ memcpy(s, curbuf, len);
color->c_color = s;
*curbuf = '\0'; /* reset curbuf */
if (a < ncolors - 1)
@@ -5174,6 +5208,9 @@ ParsePixels(data, width, height, ncolors
unsigned int *iptr, *iptr2;
unsigned int a, x, y;
+ if ((height > 0 && width >= SIZE_MAX / height) ||
+ width * height >= SIZE_MAX / sizeof(unsigned int))
+ return XpmNoMemory;
#ifndef FOR_MSW
iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
#else
@@ -5197,6 +5234,9 @@ ParsePixels(data, width, height, ncolors
{
unsigned short colidx[256];
+ if (ncolors > 256)
+ return (XpmFileInvalid);
+
memset((char *)colidx, 0, 256 * sizeof(short));
for (a = 0; a < ncolors; a++)
colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
@@ -5274,6 +5314,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
char *s;
char buf[BUFSIZ];
+ if (cpp >= sizeof(buf))
+ return (XpmFileInvalid);
+
buf[cpp] = '\0';
if (USE_HASHTABLE) {
xpmHashAtom *slot;
@@ -5757,7 +5800,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
XpmAttributes *attributes));
-LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
+ unsigned int ncolors,
Pixel *pixels, unsigned int mask,
unsigned int cpp, XpmAttributes *attributes));
@@ -5882,11 +5926,17 @@ XpmCreateXpmImageFromImage(display, imag
else
cpp = 0;
+ if ((height > 0 && width >= SIZE_MAX / height) ||
+ width * height >= SIZE_MAX / sizeof(unsigned int))
+ RETURN(XpmNoMemory);
pmap.pixelindex =
(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
if (!pmap.pixelindex)
RETURN(XpmNoMemory);
+ if (pmap.size >= SIZE_MAX / sizeof(Pixel))
+ RETURN(XpmNoMemory);
+
pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
if (!pmap.pixels)
RETURN(XpmNoMemory);
@@ -5951,7 +6001,8 @@ XpmCreateXpmImageFromImage(display, imag
* get rgb values and a string of char, and possibly a name for each
* color
*/
-
+ if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
+ RETURN(XpmNoMemory);
colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
if (!colorTable)
RETURN(XpmNoMemory);
@@ -6010,6 +6061,8 @@ ScanTransparentColor(color, cpp, attribu
/* first get a character string */
a = 0;
+ if (cpp >= SIZE_MAX - 1)
+ return (XpmNoMemory);
if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
return (XpmNoMemory);
*s++ = printable[c = a % MAXPRINTABLE];
@@ -6057,7 +6110,7 @@ static int
ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
Display *display;
XpmColor *colors;
- int ncolors;
+ unsigned int ncolors;
Pixel *pixels;
unsigned int mask;
unsigned int cpp;
@@ -6101,6 +6154,8 @@ ScanOtherColors(display, colors, ncolors
}
/* first get character strings and rgb values */
+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
+ return (XpmNoMemory);
xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
if (!xcolors)
return (XpmNoMemory);

View File

@ -1,329 +0,0 @@
$OpenBSD: patch-lib_Xm_LTXpm_c,v 1.1 2004/09/01 22:57:36 pvalchev Exp $
--- lib/Xm/LTXpm.c.orig Fri Sep 22 22:35:11 2000
+++ lib/Xm/LTXpm.c Wed Sep 1 20:33:45 2004
@@ -53,7 +53,7 @@ int _LtxpmParseDataAndCreate(Display *di
_LtXpmAttributes *attributes);
/* 3.2 backward compatibility code */
-LFUNC(CreateOldColorTable, int, (_LtXpmColor *ct, int ncolors,
+LFUNC(CreateOldColorTable, int, (_LtXpmColor *ct, unsigned int ncolors,
_LtXpmColor ***oldct));
LFUNC(FreeOldColorTable, void, (_LtXpmColor **colorTable, int ncolors));
@@ -64,12 +64,15 @@ LFUNC(FreeOldColorTable, void, (_LtXpmCo
static int
CreateOldColorTable(ct, ncolors, oldct)
_LtXpmColor *ct;
- int ncolors;
+ unsigned int ncolors;
_LtXpmColor ***oldct;
{
_LtXpmColor **colorTable, **color;
int a;
+ if (ncolors >= SIZE_MAX / sizeof(_LtXpmColor *))
+ return _LtXpmNoMemory;
+
colorTable = (_LtXpmColor **) _LtXpmMalloc(ncolors * sizeof(_LtXpmColor *));
if (!colorTable) {
*oldct = NULL;
@@ -2290,6 +2293,9 @@ _LtXpmCreateImageFromXpmImage(display, i
ErrorStatus = _LtXpmSuccess;
+ if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
+ return (_LtXpmNoMemory);
+
/* malloc pixels index tables */
image_pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * image->ncolors);
if (!image_pixels)
@@ -2462,6 +2468,8 @@ CreateXImage(display, visual, depth, for
return (_LtXpmNoMemory);
#if !defined(FOR_MSW) && !defined(AMIGA)
+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
+ return _LtXpmNoMemory;
/* now that bytes_per_line must have been set properly alloc data */
(*image_return)->data =
(char *) _LtXpmMalloc((*image_return)->bytes_per_line * height);
@@ -3532,6 +3540,9 @@ _LtxpmParseDataAndCreate(display, data,
_LtxpmGetCmt(data, &colors_cmt);
/* malloc pixels index tables */
+ if (ncolors >= SIZE_MAX / sizeof(Pixel))
+ return _LtXpmNoMemory;
+
image_pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * ncolors);
if (!image_pixels)
RETURN(_LtXpmNoMemory);
@@ -3790,8 +3801,9 @@ ParseAndPutPixels(
}
obm = SelectObject(*dc, image->bitmap);
#endif
+ if (ncolors > 256)
+ return (_LtXpmFileInvalid);
-
memset((char *)colidx, 0, 256 * sizeof(short));
for (a = 0; a < ncolors; a++)
colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
@@ -3895,6 +3907,9 @@ if (cidx[f]) _LtXpmFree(cidx[f]);}
char *s;
char buf[BUFSIZ];
+ if (cpp >= sizeof(buf))
+ return (_LtXpmFileInvalid);
+
buf[cpp] = '\0';
if (USE_HASHTABLE) {
xpmHashAtom *slot;
@@ -4301,7 +4316,7 @@ _LtxpmGetCmt(mdata, cmt)
{
if (!mdata->type)
*cmt = NULL;
- else if (mdata->CommentLength) {
+ else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 1) {
*cmt = (char *) _LtXpmMalloc(mdata->CommentLength + 1);
strncpy(*cmt, mdata->Comment, mdata->CommentLength);
(*cmt)[mdata->CommentLength] = '\0';
@@ -4511,7 +4526,7 @@ HashTableGrows(table)
xpmHashTable *table;
{
xpmHashAtom *atomTable = table->atomTable;
- int size = table->size;
+ unsigned int size = table->size;
xpmHashAtom *t, *p;
int i;
int oldSize = size;
@@ -4520,6 +4535,8 @@ HashTableGrows(table)
HASH_TABLE_GROWS
table->size = size;
table->limit = size / 3;
+ if (size >= SIZE_MAX / sizeof(*atomTable))
+ return (_LtXpmNoMemory);
atomTable = (xpmHashAtom *) _LtXpmMalloc(size * sizeof(*atomTable));
if (!atomTable)
return (_LtXpmNoMemory);
@@ -4580,6 +4597,8 @@ _LtxpmHashTableInit(table)
table->size = INITIAL_HASH_SIZE;
table->limit = table->size / 3;
table->used = 0;
+ if (table->size >= SIZE_MAX / sizeof(*atomTable))
+ return (_LtXpmNoMemory);
atomTable = (xpmHashAtom *) _LtXpmMalloc(table->size * sizeof(*atomTable));
if (!atomTable)
return (_LtXpmNoMemory);
@@ -4900,7 +4919,7 @@ _LtxpmParseValues(data, width, height, n
unsigned int *extensions;
{
unsigned int l;
- char buf[BUFSIZ];
+ char buf[BUFSIZ + 1];
if (!data->format) { /* XPM 2 or 3 */
@@ -5009,10 +5028,10 @@ _LtxpmParseColors(data, ncolors, cpp, co
_LtXpmColor **colorTablePtr;
xpmHashTable *hashtable;
{
- unsigned int key, l, a, b;
+ unsigned int key, l, a, b, len;
unsigned int curkey; /* current color key */
unsigned int lastwaskey; /* key read */
- char buf[BUFSIZ];
+ char buf[BUFSIZ+1];
char curbuf[BUFSIZ]; /* current buffer */
char **sptr, *s;
_LtXpmColor *color;
@@ -5020,6 +5039,8 @@ _LtxpmParseColors(data, ncolors, cpp, co
char **defaults;
int ErrorStatus;
+ if (ncolors >= SIZE_MAX / sizeof(_LtXpmColor))
+ return (_LtXpmNoMemory);
colorTable = (_LtXpmColor *) _LtXpmCalloc(ncolors, sizeof(_LtXpmColor));
if (!colorTable)
return (_LtXpmNoMemory);
@@ -5031,6 +5052,10 @@ _LtxpmParseColors(data, ncolors, cpp, co
/*
* read pixel value
*/
+ if (cpp >= SIZE_MAX - 1) {
+ _LtxpmFreeColorTable(colorTable, ncolors);
+ return (_LtXpmNoMemory);
+ }
color->string = (char *) _LtXpmMalloc(cpp + 1);
if (!color->string) {
_LtxpmFreeColorTable(colorTable, ncolors);
@@ -5068,13 +5093,14 @@ _LtxpmParseColors(data, ncolors, cpp, co
}
if (!lastwaskey && key < NKEYS) { /* open new key */
if (curkey) { /* flush string */
- s = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
+ len = strlen(curbuf) + 1;
+ s = (char *) _LtXpmMalloc(len);
if (!s) {
_LtxpmFreeColorTable(colorTable, ncolors);
return (_LtXpmNoMemory);
}
defaults[curkey] = s;
- strcpy(s, curbuf);
+ memcpy(s, curbuf, len);
}
curkey = key + 1; /* set new key */
*curbuf = '\0'; /* reset curbuf */
@@ -5085,9 +5111,9 @@ _LtxpmParseColors(data, ncolors, cpp, co
return (_LtXpmFileInvalid);
}
if (!lastwaskey)
- strcat(curbuf, " "); /* append space */
+ strlcat(curbuf, " ", sizeof(curbuf)); /* append space */
buf[l] = '\0';
- strcat(curbuf, buf);/* append buf */
+ strlcat(curbuf, buf, sizeof(curbuf));/* append buf */
lastwaskey = 0;
}
}
@@ -5095,12 +5121,13 @@ _LtxpmParseColors(data, ncolors, cpp, co
_LtxpmFreeColorTable(colorTable, ncolors);
return (_LtXpmFileInvalid);
}
- s = defaults[curkey] = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
+ len = strlen(curbuf) + 1;
+ s = defaults[curkey] = (char *) _LtXpmMalloc(len);
if (!s) {
_LtxpmFreeColorTable(colorTable, ncolors);
return (_LtXpmNoMemory);
}
- strcpy(s, curbuf);
+ memcpy(s, curbuf, len);
}
} else { /* XPM 1 */
/* get to the beginning of the first string */
@@ -5113,6 +5140,10 @@ _LtxpmParseColors(data, ncolors, cpp, co
/*
* read pixel value
*/
+ if (cpp >= SIZE_MAX - 1) {
+ _LtxpmFreeColorTable(colorTable, ncolors);
+ return (_LtXpmNoMemory);
+ }
color->string = (char *) _LtXpmMalloc(cpp + 1);
if (!color->string) {
_LtxpmFreeColorTable(colorTable, ncolors);
@@ -5141,16 +5172,17 @@ _LtxpmParseColors(data, ncolors, cpp, co
*curbuf = '\0'; /* init curbuf */
while ((l = _LtxpmNextWord(data, buf, BUFSIZ))) {
if (*curbuf != '\0')
- strcat(curbuf, " ");/* append space */
+ strlcat(curbuf, " ", sizeof(curbuf));/* append space */
buf[l] = '\0';
- strcat(curbuf, buf); /* append buf */
+ strlcat(curbuf, buf, sizeof(curbuf)); /* append buf */
}
- s = (char *) _LtXpmMalloc(strlen(curbuf) + 1);
+ len = strlen(curbuf) + 1;
+ s = (char *) _LtXpmMalloc(len);
if (!s) {
_LtxpmFreeColorTable(colorTable, ncolors);
return (_LtXpmNoMemory);
}
- strcpy(s, curbuf);
+ memcpy(s, curbuf, len);
color->c_color = s;
*curbuf = '\0'; /* reset curbuf */
if (a < ncolors - 1)
@@ -5175,6 +5207,9 @@ ParsePixels(data, width, height, ncolors
unsigned int *iptr, *iptr2;
unsigned int a, x, y;
+ if ((height > 0 && width >= SIZE_MAX / height) ||
+ width * height >= SIZE_MAX / sizeof(unsigned int))
+ return _LtXpmNoMemory;
#ifndef FOR_MSW
iptr2 = (unsigned int *) _LtXpmMalloc(sizeof(unsigned int) * width * height);
#else
@@ -5198,6 +5233,9 @@ ParsePixels(data, width, height, ncolors
{
unsigned short colidx[256];
+ if (ncolors > 256)
+ return (_LtXpmFileInvalid);
+
memset((char *)colidx, 0, 256 * sizeof(short));
for (a = 0; a < ncolors; a++)
colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
@@ -5275,6 +5313,9 @@ if (cidx[f]) _LtXpmFree(cidx[f]);}
char *s;
char buf[BUFSIZ];
+ if (cpp >= sizeof(buf))
+ return (_LtXpmFileInvalid);
+
buf[cpp] = '\0';
if (USE_HASHTABLE) {
xpmHashAtom *slot;
@@ -5758,7 +5799,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
LFUNC(ScanTransparentColor, int, (_LtXpmColor *color, unsigned int cpp,
_LtXpmAttributes *attributes));
-LFUNC(ScanOtherColors, int, (Display *display, _LtXpmColor *colors, int ncolors,
+LFUNC(ScanOtherColors, int, (Display *display, _LtXpmColor *colors,
+ unsigned int ncolors,
Pixel *pixels, unsigned int mask,
unsigned int cpp, _LtXpmAttributes *attributes));
@@ -5883,11 +5925,17 @@ _LtXpmCreateXpmImageFromImage(display, i
else
cpp = 0;
+ if ((height > 0 && width >= SIZE_MAX / height) ||
+ width * height >= SIZE_MAX / sizeof(unsigned int))
+ RETURN(_LtXpmNoMemory);
pmap.pixelindex =
(unsigned int *) _LtXpmCalloc(width * height, sizeof(unsigned int));
if (!pmap.pixelindex)
RETURN(_LtXpmNoMemory);
+ if (pmap.size >= SIZE_MAX / sizeof(Pixel))
+ RETURN(_LtXpmNoMemory);
+
pmap.pixels = (Pixel *) _LtXpmMalloc(sizeof(Pixel) * pmap.size);
if (!pmap.pixels)
RETURN(_LtXpmNoMemory);
@@ -5953,6 +6001,8 @@ _LtXpmCreateXpmImageFromImage(display, i
* color
*/
+ if (pmap.ncolors >= SIZE_MAX / sizeof(_LtXpmColor))
+ RETURN(_LtXpmNoMemory);
colorTable = (_LtXpmColor *) _LtXpmCalloc(pmap.ncolors, sizeof(_LtXpmColor));
if (!colorTable)
RETURN(_LtXpmNoMemory);
@@ -6011,6 +6061,8 @@ ScanTransparentColor(color, cpp, attribu
/* first get a character string */
a = 0;
+ if (cpp >= SIZE_MAX - 1)
+ return (_LtXpmNoMemory);
if (!(s = color->string = (char *) _LtXpmMalloc(cpp + 1)))
return (_LtXpmNoMemory);
*s++ = printable[c = a % MAXPRINTABLE];
@@ -6058,7 +6110,7 @@ static int
ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
Display *display;
_LtXpmColor *colors;
- int ncolors;
+ unsigned int ncolors;
Pixel *pixels;
unsigned int mask;
unsigned int cpp;
@@ -6102,6 +6154,8 @@ ScanOtherColors(display, colors, ncolors
}
/* first get character strings and rgb values */
+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
+ return (_LtXpmNoMemory);
xcolors = (XColor *) _LtXpmMalloc(sizeof(XColor) * ncolors);
if (!xcolors)
return (_LtXpmNoMemory);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_Xm_Makefile_in,v 1.1 2006/01/12 01:05:23 naddy Exp $
--- lib/Xm/Makefile.in.orig Thu Jan 12 00:52:52 2006
+++ lib/Xm/Makefile.in Thu Jan 12 00:54:17 2006
@@ -404,7 +404,7 @@ mostlyclean distclean maintainer-clean
install-data-hook:
@Version_1_2_TRUE@@LibtoolShared_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libXm.so.1*
-@Version_1_2_TRUE@@LibtoolShared_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.1* .)
+@Version_1_2_TRUE@@LibtoolShared_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.so.* .)
@Version_1_2_TRUE@@DefaultVersion12_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libXm.la
@Version_1_2_TRUE@@DefaultVersion12_TRUE@ (cd $(DESTDIR)$(prefix)/lib && $(LN_S) ../LessTif/Motif1.2/lib/libXm.la .)
@Version_1_2_TRUE@@DefaultVersion12_TRUE@@LibtoolShared_TRUE@ -rm -f $(DESTDIR)$(prefix)/lib/libXm.so

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-scripts_man2html_c,v 1.1 2005/03/15 20:37:39 alek Exp $
--- scripts/man2html.c.orig Thu Dec 21 13:12:21 2000
+++ scripts/man2html.c Mon Mar 14 08:02:45 2005
@@ -689,6 +689,7 @@ static char
for (upto = 1;
(len = fread(man_buf + upto, 1, LARGE_STR_MAX, stdin)) > 0;
upto += len) {
+ man_buf[upto+len] = '\0';
man_buf = strgrow(man_buf, LARGE_STR_MAX);
}
man_buf[upto] = '\n';

View File

@ -1,3 +0,0 @@
LessTif is an API compatible clone of the Motif toolkit. Currently
LessTif is partially implemented with most of the API in place.
Saying this a lot of the internal functionality is still missing.

View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/26 18:45:10 naddy Exp $
@lib LessTif/Motif1.2/lib/libMrm.so.${LIBMrm_VERSION}
@lib LessTif/Motif1.2/lib/libUil.so.${LIBUil_VERSION}
@lib LessTif/Motif1.2/lib/libXm.so.${LIBXm_VERSION}
@lib lib/libMrm.so.${LIBMrm_VERSION}
@lib lib/libUil.so.${LIBUil_VERSION}
@lib lib/libXm.so.${LIBXm_VERSION}

View File

@ -1,365 +0,0 @@
@comment $OpenBSD: PLIST,v 1.26 2004/09/18 13:19:26 espie Exp $
@conflict openmotif-*
LessTif/
LessTif/Motif1.2/
LessTif/Motif1.2/bin/
LessTif/Motif1.2/bin/mwm
LessTif/Motif1.2/bin/uil
LessTif/Motif1.2/bin/xmbind
LessTif/Motif1.2/include/
LessTif/Motif1.2/include/Mrm/
LessTif/Motif1.2/include/Mrm/MrmAppl.h
LessTif/Motif1.2/include/Mrm/MrmDecls.h
LessTif/Motif1.2/include/Mrm/MrmPrivate.h
LessTif/Motif1.2/include/Mrm/MrmPublic.h
LessTif/Motif1.2/include/Xm/
LessTif/Motif1.2/include/Xm/ArrowB.h
LessTif/Motif1.2/include/Xm/ArrowBG.h
LessTif/Motif1.2/include/Xm/ArrowBGP.h
LessTif/Motif1.2/include/Xm/ArrowBP.h
LessTif/Motif1.2/include/Xm/AtomMgr.h
LessTif/Motif1.2/include/Xm/BaseClassP.h
LessTif/Motif1.2/include/Xm/BulletinB.h
LessTif/Motif1.2/include/Xm/BulletinBP.h
LessTif/Motif1.2/include/Xm/CacheP.h
LessTif/Motif1.2/include/Xm/CascadeB.h
LessTif/Motif1.2/include/Xm/CascadeBG.h
LessTif/Motif1.2/include/Xm/CascadeBGP.h
LessTif/Motif1.2/include/Xm/CascadeBP.h
LessTif/Motif1.2/include/Xm/Command.h
LessTif/Motif1.2/include/Xm/CommandP.h
LessTif/Motif1.2/include/Xm/CutPaste.h
LessTif/Motif1.2/include/Xm/CutPasteP.h
LessTif/Motif1.2/include/Xm/DesktopP.h
LessTif/Motif1.2/include/Xm/DialogS.h
LessTif/Motif1.2/include/Xm/DialogSEP.h
LessTif/Motif1.2/include/Xm/DialogSP.h
LessTif/Motif1.2/include/Xm/Display.h
LessTif/Motif1.2/include/Xm/DisplayP.h
LessTif/Motif1.2/include/Xm/DragC.h
LessTif/Motif1.2/include/Xm/DragCP.h
LessTif/Motif1.2/include/Xm/DragDrop.h
LessTif/Motif1.2/include/Xm/DragIcon.h
LessTif/Motif1.2/include/Xm/DragIconP.h
LessTif/Motif1.2/include/Xm/DragOverS.h
LessTif/Motif1.2/include/Xm/DragOverSP.h
LessTif/Motif1.2/include/Xm/DrawP.h
LessTif/Motif1.2/include/Xm/DrawingA.h
LessTif/Motif1.2/include/Xm/DrawingAP.h
LessTif/Motif1.2/include/Xm/DrawnB.h
LessTif/Motif1.2/include/Xm/DrawnBP.h
LessTif/Motif1.2/include/Xm/DropSMgr.h
LessTif/Motif1.2/include/Xm/DropSMgrP.h
LessTif/Motif1.2/include/Xm/DropTrans.h
LessTif/Motif1.2/include/Xm/DropTransP.h
LessTif/Motif1.2/include/Xm/ExtObjectP.h
LessTif/Motif1.2/include/Xm/FileSB.h
LessTif/Motif1.2/include/Xm/FileSBP.h
LessTif/Motif1.2/include/Xm/Form.h
LessTif/Motif1.2/include/Xm/FormP.h
LessTif/Motif1.2/include/Xm/Frame.h
LessTif/Motif1.2/include/Xm/FrameP.h
LessTif/Motif1.2/include/Xm/GadgetP.h
LessTif/Motif1.2/include/Xm/Label.h
LessTif/Motif1.2/include/Xm/LabelG.h
LessTif/Motif1.2/include/Xm/LabelGP.h
LessTif/Motif1.2/include/Xm/LabelP.h
LessTif/Motif1.2/include/Xm/List.h
LessTif/Motif1.2/include/Xm/ListP.h
LessTif/Motif1.2/include/Xm/MainW.h
LessTif/Motif1.2/include/Xm/MainWP.h
LessTif/Motif1.2/include/Xm/ManagerP.h
LessTif/Motif1.2/include/Xm/MenuShell.h
LessTif/Motif1.2/include/Xm/MenuShellP.h
LessTif/Motif1.2/include/Xm/MenuUtilP.h
LessTif/Motif1.2/include/Xm/MessageB.h
LessTif/Motif1.2/include/Xm/MessageBP.h
LessTif/Motif1.2/include/Xm/MwmUtil.h
LessTif/Motif1.2/include/Xm/PanedW.h
LessTif/Motif1.2/include/Xm/PanedWP.h
LessTif/Motif1.2/include/Xm/PrimitiveP.h
LessTif/Motif1.2/include/Xm/Protocols.h
LessTif/Motif1.2/include/Xm/ProtocolsP.h
LessTif/Motif1.2/include/Xm/PushB.h
LessTif/Motif1.2/include/Xm/PushBG.h
LessTif/Motif1.2/include/Xm/PushBGP.h
LessTif/Motif1.2/include/Xm/PushBP.h
LessTif/Motif1.2/include/Xm/RCUtilsP.h
LessTif/Motif1.2/include/Xm/RepType.h
LessTif/Motif1.2/include/Xm/RowColumn.h
LessTif/Motif1.2/include/Xm/RowColumnP.h
LessTif/Motif1.2/include/Xm/SashP.h
LessTif/Motif1.2/include/Xm/Scale.h
LessTif/Motif1.2/include/Xm/ScaleP.h
LessTif/Motif1.2/include/Xm/Screen.h
LessTif/Motif1.2/include/Xm/ScreenP.h
LessTif/Motif1.2/include/Xm/ScrollBar.h
LessTif/Motif1.2/include/Xm/ScrollBarP.h
LessTif/Motif1.2/include/Xm/ScrolledW.h
LessTif/Motif1.2/include/Xm/ScrolledWP.h
LessTif/Motif1.2/include/Xm/SelectioB.h
LessTif/Motif1.2/include/Xm/SelectioBP.h
LessTif/Motif1.2/include/Xm/SeparatoG.h
LessTif/Motif1.2/include/Xm/SeparatoGP.h
LessTif/Motif1.2/include/Xm/Separator.h
LessTif/Motif1.2/include/Xm/SeparatorP.h
LessTif/Motif1.2/include/Xm/ShellEP.h
LessTif/Motif1.2/include/Xm/TearOffBP.h
LessTif/Motif1.2/include/Xm/TearOffP.h
LessTif/Motif1.2/include/Xm/Text.h
LessTif/Motif1.2/include/Xm/TextF.h
LessTif/Motif1.2/include/Xm/TextFP.h
LessTif/Motif1.2/include/Xm/TextFSelP.h
LessTif/Motif1.2/include/Xm/TextInP.h
LessTif/Motif1.2/include/Xm/TextOutP.h
LessTif/Motif1.2/include/Xm/TextP.h
LessTif/Motif1.2/include/Xm/TextSelP.h
LessTif/Motif1.2/include/Xm/TextStrSoP.h
LessTif/Motif1.2/include/Xm/ToggleB.h
LessTif/Motif1.2/include/Xm/ToggleBG.h
LessTif/Motif1.2/include/Xm/ToggleBGP.h
LessTif/Motif1.2/include/Xm/ToggleBP.h
LessTif/Motif1.2/include/Xm/TransltnsP.h
LessTif/Motif1.2/include/Xm/VaSimpleP.h
LessTif/Motif1.2/include/Xm/VendorS.h
LessTif/Motif1.2/include/Xm/VendorSEP.h
LessTif/Motif1.2/include/Xm/VendorSP.h
LessTif/Motif1.2/include/Xm/VirtKeys.h
LessTif/Motif1.2/include/Xm/VirtKeysP.h
LessTif/Motif1.2/include/Xm/WorldP.h
LessTif/Motif1.2/include/Xm/Xm.h
LessTif/Motif1.2/include/Xm/XmAll.h
LessTif/Motif1.2/include/Xm/XmP.h
LessTif/Motif1.2/include/Xm/XmStrDefs.h
LessTif/Motif1.2/include/Xm/XmosP.h
LessTif/Motif1.2/include/uil/
LessTif/Motif1.2/include/uil/Uil.h
LessTif/Motif1.2/include/uil/UilDBDef.h
LessTif/Motif1.2/include/uil/UilDef.h
LessTif/Motif1.2/include/uil/UilSymDef.h
LessTif/Motif1.2/include/uil/UilSymGl.h
LessTif/Motif1.2/lib/
LessTif/Motif1.2/lib/libMrm.a
LessTif/Motif1.2/lib/libMrm.la
LessTif/Motif1.2/lib/libUil.a
LessTif/Motif1.2/lib/libUil.la
LessTif/Motif1.2/lib/libXm.a
LessTif/Motif1.2/lib/libXm.la
LessTif/Motif2.0/
LessTif/Motif2.0/bin/
LessTif/Motif2.1/
LessTif/Motif2.1/bin/
bin/mwm
bin/mxmkmf
bin/uil
bin/xmbind
include/Mrm
include/Xm
include/uil
lib/X11/app-defaults/Mwm
lib/X11/config/
lib/X11/config/LessTif.rules
lib/X11/config/LessTif.tmpl
lib/X11/config/host.def
lib/X11/mwm/
lib/X11/mwm/README
lib/X11/mwm/alt.map
lib/X11/mwm/system.mwmrc
lib/libMrm.a
lib/libMrm.la
@comment lib/libMrm.so
lib/libUil.a
lib/libUil.la
@comment lib/libUil.so
lib/libXm.a
lib/libXm.la
@comment lib/libXm.so
@man man/man1/lesstif.1
@man man/man1/mwm.1
@man man/man1/uil.1
@man man/man1/xmbind.1
@man man/man3/LessTifInternals.3
@man man/man3/XmArrowButton.3
@man man/man3/XmArrowButtonGadget.3
@man man/man3/XmBulletinBoard.3
@man man/man3/XmCascadeButton.3
@man man/man3/XmCascadeButtonGadget.3
@man man/man3/XmClipboard.3
@man man/man3/XmComboBox.3
@man man/man3/XmCommand.3
@man man/man3/XmDesktop.3
@man man/man3/XmDialogShell.3
@man man/man3/XmDialogShellExt.3
@man man/man3/XmDisplay.3
@man man/man3/XmDragContext.3
@man man/man3/XmDragIcon.3
@man man/man3/XmDragOverShell.3
@man man/man3/XmDrawingArea.3
@man man/man3/XmDrawnButton.3
@man man/man3/XmDropSiteManager.3
@man man/man3/XmDropTransfer.3
@man man/man3/XmFileSelectionBox.3
@man man/man3/XmForm.3
@man man/man3/XmFrame.3
@man man/man3/XmGadget.3
@man man/man3/XmGrabShell.3
@man man/man3/XmIconGadget.3
@man man/man3/XmLabel.3
@man man/man3/XmLabelGadget.3
@man man/man3/XmList.3
@man man/man3/XmMainWindow.3
@man man/man3/XmManager.3
@man man/man3/XmMenuShell.3
@man man/man3/XmMessageBox.3
@man man/man3/XmNotebook.3
@man man/man3/XmPanedWindow.3
@man man/man3/XmPrimitive.3
@man man/man3/XmProtocol.3
@man man/man3/XmPushButton.3
@man man/man3/XmPushButtonGadget.3
@man man/man3/XmRowColumn.3
@man man/man3/XmSash.3
@man man/man3/XmScale.3
@man man/man3/XmScreen.3
@man man/man3/XmScrollBar.3
@man man/man3/XmScrolledWindow.3
@man man/man3/XmSelectionBox.3
@man man/man3/XmSeparator.3
@man man/man3/XmSeparatorGadget.3
@man man/man3/XmSpinBox.3
@man man/man3/XmTearOffButton.3
@man man/man3/XmText.3
@man man/man3/XmTextField.3
@man man/man3/XmToggleButton.3
@man man/man3/XmToggleButtonGadget.3
@man man/man3/XmVendorShell.3
@man man/man3/XmWorld.3
@man man/man5/mwmrc.5
share/LessTif/
share/LessTif/AUTHORS
share/LessTif/BUG-REPORTING
share/LessTif/COPYING
share/LessTif/COPYING.LIB
share/LessTif/CREDITS
share/LessTif/FAQ
share/LessTif/Install
share/LessTif/KNOWN_BUGS
share/LessTif/README
share/LessTif/RELEASE-POLICY
share/LessTif/doc/
share/LessTif/doc/html/
share/LessTif/doc/html/Advocacy.html
share/LessTif/doc/html/All.html
share/LessTif/doc/html/COPYING.LIB.html
share/LessTif/doc/html/Clipboard.txt
share/LessTif/doc/html/DragAndDrop.txt
share/LessTif/doc/html/FAQ.html
share/LessTif/doc/html/Form.txt
share/LessTif/doc/html/GeoUtils.txt
share/LessTif/doc/html/Geometry.html
share/LessTif/doc/html/INSTALL.html
share/LessTif/doc/html/LessTifInternals.html
share/LessTif/doc/html/SyntheticResources.txt
share/LessTif/doc/html/UIL.txt
share/LessTif/doc/html/Xbae.html
share/LessTif/doc/html/Xlt.html
share/LessTif/doc/html/XmArrowButton.html
share/LessTif/doc/html/XmArrowButtonGadget.html
share/LessTif/doc/html/XmBulletinBoard.html
share/LessTif/doc/html/XmCascadeButton.html
share/LessTif/doc/html/XmCascadeButtonGadget.html
share/LessTif/doc/html/XmClipboard.html
share/LessTif/doc/html/XmComboBox.html
share/LessTif/doc/html/XmCommand.html
share/LessTif/doc/html/XmDesktop.html
share/LessTif/doc/html/XmDialogShell.html
share/LessTif/doc/html/XmDialogShellExt.html
share/LessTif/doc/html/XmDisplay.html
share/LessTif/doc/html/XmDragContext.html
share/LessTif/doc/html/XmDragIcon.html
share/LessTif/doc/html/XmDragOverShell.html
share/LessTif/doc/html/XmDrawingArea.html
share/LessTif/doc/html/XmDrawnButton.html
share/LessTif/doc/html/XmDropSiteManager.html
share/LessTif/doc/html/XmDropTransfer.html
share/LessTif/doc/html/XmFileSelectionBox.html
share/LessTif/doc/html/XmForm.html
share/LessTif/doc/html/XmFrame.html
share/LessTif/doc/html/XmGadget.html
share/LessTif/doc/html/XmGrabShell.html
share/LessTif/doc/html/XmIconGadget.html
share/LessTif/doc/html/XmLabel.html
share/LessTif/doc/html/XmLabelGadget.html
share/LessTif/doc/html/XmList.html
share/LessTif/doc/html/XmMainWindow.html
share/LessTif/doc/html/XmManager.html
share/LessTif/doc/html/XmMenuShell.html
share/LessTif/doc/html/XmMessageBox.html
share/LessTif/doc/html/XmNotebook.html
share/LessTif/doc/html/XmPanedWindow.html
share/LessTif/doc/html/XmPrimitive.html
share/LessTif/doc/html/XmProtocol.html
share/LessTif/doc/html/XmPushButton.html
share/LessTif/doc/html/XmPushButtonGadget.html
share/LessTif/doc/html/XmRowColumn.html
share/LessTif/doc/html/XmSash.html
share/LessTif/doc/html/XmScale.html
share/LessTif/doc/html/XmScreen.html
share/LessTif/doc/html/XmScrollBar.html
share/LessTif/doc/html/XmScrolledWindow.html
share/LessTif/doc/html/XmSelectionBox.html
share/LessTif/doc/html/XmSeparator.html
share/LessTif/doc/html/XmSeparatorGadget.html
share/LessTif/doc/html/XmSpinBox.html
share/LessTif/doc/html/XmStrings.txt
share/LessTif/doc/html/XmTearOffButton.html
share/LessTif/doc/html/XmText.html
share/LessTif/doc/html/XmTextField.html
share/LessTif/doc/html/XmToggleButton.html
share/LessTif/doc/html/XmToggleButtonGadget.html
share/LessTif/doc/html/XmVendorShell.html
share/LessTif/doc/html/XmWorld.html
share/LessTif/doc/html/apps.html
share/LessTif/doc/html/bugs.html
share/LessTif/doc/html/cdrom.html
share/LessTif/doc/html/core.html
share/LessTif/doc/html/current.html
share/LessTif/doc/html/cvs.html
share/LessTif/doc/html/download.html
share/LessTif/doc/html/feedback.html
share/LessTif/doc/html/help.html
share/LessTif/doc/html/images/
share/LessTif/doc/html/images/hungry.png
share/LessTif/doc/html/images/lesstif-realsmall.png
share/LessTif/doc/html/images/lesstif-small.png
share/LessTif/doc/html/images/lesstif.jpg
share/LessTif/doc/html/images/lesstif.png
share/LessTif/doc/html/images/ltsunlogo.jpg
share/LessTif/doc/html/images/ltsunlogo.png
share/LessTif/doc/html/images/vh32.jpg
share/LessTif/doc/html/images/vh32.png
share/LessTif/doc/html/images/vh40.jpg
share/LessTif/doc/html/images/vh40.png
share/LessTif/doc/html/index.html
share/LessTif/doc/html/known.html
share/LessTif/doc/html/lesstif.html
share/LessTif/doc/html/links.html
share/LessTif/doc/html/lists.html
share/LessTif/doc/html/mirrors.html
share/LessTif/doc/html/mwm.html
share/LessTif/doc/html/mwmrc.html
share/LessTif/doc/html/platforms.html
share/LessTif/doc/html/release-notes.html
share/LessTif/doc/html/release-policy.html
share/LessTif/doc/html/test_policy.html
share/LessTif/doc/html/test_summary.html
share/LessTif/doc/html/testers.html
share/LessTif/doc/html/thread.html
share/LessTif/doc/html/uil.html
share/LessTif/doc/html/versions.html
share/LessTif/doc/html/web_button.html
share/LessTif/doc/html/xbae.html
share/LessTif/doc/html/xlt.html
share/LessTif/doc/html/xmbind.html
share/LessTif/release-notes.txt
%%SHARED%%