Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
db105546
Unverified
Commit
db105546
authored
May 07, 2020
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'uli42-pr/drop_nxwin' into 3.6.x
Attributes GH PR #917:
https://github.com/ArcticaProject/nx-libs/pull/917
parents
f2dc8121
1796f823
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
314 deletions
+1
-314
fix-fprintf-usage.patch
debian/patches-pending-evaluation/fix-fprintf-usage.patch
+0
-31
fix-icon-and-clipboard.patch
...n/patches-pending-evaluation/fix-icon-and-clipboard.patch
+0
-0
patches_nx-X11-fix_format.patch
...atches-pending-evaluation/patches_nx-X11-fix_format.patch
+0
-126
host.def
nx-X11/config/cf/host.def
+0
-10
Imakefile
nx-X11/programs/Xserver/Imakefile
+1
-147
No files found.
debian/patches-pending-evaluation/fix-fprintf-usage.patch
deleted
100644 → 0
View file @
f2dc8121
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Wed, 3 Jun 2009 00:49:01 +0000 (+0400)
Subject: fix fprintf using
X-Git-Tag: 3.3.0-alt16.1~1^2
X-Git-Url: http://git.etersoft.ru?p=rx%2Fnx.git;a=commitdiff_plain;h=f68888aab5c92e99f398f5fe7407edf09e2c86ce
fix fprintf using
+--- a/nx-X11/config/imake/imake.c
++++ b/nx-X11/config/imake/imake.c
+@@ -1015,7 +1015,7 @@ get_libc_version(FILE *inFile)
+ abort ();
+
+ while (fgets (command, len, fp))
+- fprintf (inFile, command);
++ fwrite (command, strlen(command), 1, inFile);
+
+ len = pclose (fp);
+ remove (aout);
+
+--- a/nx-X11/extras/rman/rman.c.orig 2009-06-03 04:29:39 +0400
++++ b/nx-X11/extras/rman/rman.c 2009-06-03 05:19:07 +0400
+@@ -1432,7 +1432,7 @@ HTML(enum command cmd)
+ break;
+ case BEGINSECTION: break;
+ case ENDSECTION:
+- if (sectheadid==NAME && message!=NULL) printf(message);
++ if (sectheadid==NAME && message!=NULL) printf("%s",message);
+ break;
+ case BEGINSUBSECTION: break;
+ case ENDSUBSECTION: break;
debian/patches-pending-evaluation/fix-icon-and-clipboard.patch
deleted
100644 → 0
View file @
f2dc8121
This diff is collapsed.
Click to expand it.
debian/patches-pending-evaluation/patches_nx-X11-fix_format.patch
deleted
100644 → 0
View file @
f2dc8121
diff --git a/nx/lib/xtrans/Xtransint.h b/nx/lib/xtrans/Xtransint.h
index 88d2230..8d3d1cb 100644
--- a/nx/lib/xtrans/Xtransint.h
+++ b/nx/lib/xtrans/Xtransint.h
@@ -443,7 +443,7 @@ static int trans_mkdir (
int hack= 0, saveerrno=errno; \
struct timeval tp;\
gettimeofday(&tp,0); \
- ErrorF(__xtransname); \
+ ErrorF("%s", __xtransname); \
ErrorF(x+hack,a,b,c); \
ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
errno=saveerrno; \
@@ -453,7 +453,7 @@ static int trans_mkdir (
int hack= 0, saveerrno=errno; \
struct timeval tp;\
gettimeofday(&tp,0); \
- fprintf(stderr, __xtransname); fflush(stderr); \
+ fprintf(stderr, "%s", __xtransname); fflush(stderr); \
fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
fflush(stderr); \
@@ -465,14 +465,14 @@ static int trans_mkdir (
/* Use ErrorF() for the X server */
#define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
int hack= 0, saveerrno=errno; \
- ErrorF(__xtransname); \
+ ErrorF("%s", __xtransname); \
ErrorF(x+hack,a,b,c); \
errno=saveerrno; \
} else ((void)0)
#else
#define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
int hack= 0, saveerrno=errno; \
- fprintf(stderr, __xtransname); fflush(stderr); \
+ fprintf(stderr, "%s", __xtransname); fflush(stderr); \
fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
errno=saveerrno; \
} else ((void)0)
diff --git a/nx/lib/Xaw/DisplayList.c b/nx/lib/Xaw/DisplayList.c
index e43621b..5b2dfe6 100644
--- a/nx/lib/Xaw/DisplayList.c
+++ b/nx/lib/Xaw/DisplayList.c
@@ -293,7 +293,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
}
if (fp)
{
- XmuSnprintf(cname, fp - fname + 1, fname);
+ XmuSnprintf(cname, fp - fname + 1, "%s", fname);
memmove(fname, fp + 1, strlen(fp));
lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
if (!lc)
diff --git a/nx/programs/Xserver/os/log.c b/nx/programs/Xserver/os/log.c
index d3aef03..c8d0d5b 100644
--- a/nx/programs/Xserver/os/log.c
+++ b/nx/programs/Xserver/os/log.c
@@ -692,9 +692,9 @@ Error(char *str)
return;
sprintf(err, "%s: ", str);
strcat(err, strerror(saveErrno));
- LogWrite(-1, err);
+ LogWrite(-1, "%s", err);
} else
- LogWrite(-1, strerror(saveErrno));
+ LogWrite(-1, "%s", strerror(saveErrno));
}
void
diff --git a/nx/programs/Xserver/GL/glx/glximports.c b/nx/programs/Xserver/GL/glx/glximports.c
index fae2346..6e1f0db 100644
--- a/nx/programs/Xserver/GL/glx/glximports.c
+++ b/nx/programs/Xserver/GL/glx/glximports.c
@@ -110,12 +110,12 @@ void *__glXImpRealloc(__GLcontext *gc, void *addr, size_t newSize)
void __glXImpWarning(__GLcontext *gc, char *msg)
{
- ErrorF((char *)msg);
+ ErrorF("%s", (char *)msg);
}
void __glXImpFatal(__GLcontext *gc, char *msg)
{
- ErrorF((char *)msg);
+ ErrorF("%s", (char *)msg);
__glXAbort();
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 64b6583..0e0f9e1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -454,7 +454,7 @@ void OsVendorVErrorFFunction(const char *f, va_list args)
nxagentStartRedirectToClientsLog();
- fprintf(stderr, buffer);
+ fprintf(stderr, "%s", buffer);
nxagentEndRedirectToClientsLog();
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c
index 963cfa2..2f778b7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
@@ -232,7 +232,7 @@ static int nxagentPrintError(dpy, event, fp)
int nxagentExitHandler(const char *message)
{
- FatalError(message);
+ FatalError("%s", message);
return 0;
}
diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c
index 90fb23f..b494286 100644
--- a/nxauth/programs/nxauth/process.c
+++ b/nxauth/programs/nxauth/process.c
@@ -974,7 +974,7 @@ fprintfhex(register FILE *fp, int len, char *cp)
char *hex;
hex = bintohex(len, cp);
- fprintf(fp, hex);
+ fprintf(fp, "%s", hex);
free(hex);
}
nx-X11/config/cf/host.def
View file @
db105546
...
...
@@ -96,16 +96,6 @@
#endif
/*
* Define this symbol to build the NX enhanced MS Windows
* X server for Cygnus environment.
*
#define NXWinServer YES
*/
#if defined(cygwinArchitecture)
#define NXWinServer NO
#endif
/*
* Set the default server (ie the one that gets the sym-link to "X")
*
#define ServerToInstall Xorg
...
...
nx-X11/programs/Xserver/Imakefile
View file @
db105546
...
...
@@ -184,13 +184,6 @@ XCOMM
#if defined(NXAgentServer) && NXAgentServer
NXAGENT = nxagent
#endif
#if defined(NXWinServer) && NXWinServer
NXWIN = NXWin
#endif
#if (defined(NXAgentServer) && NXAgentServer) || \
(defined(NXWinServer) && NXWinServer)
MakeMutex($(NXAGENT) $(NXWIN))
#endif
MakeMutex($(STDDIRS) fb)
#endif
...
...
@@ -413,151 +406,12 @@ nxagent_static_nolibs: nxagent
$(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_INSTALL_LOAD_FLAGS)
#endif /* NXAgentServer */
#if defined(NXWinServer) && NXWinServer
XCOMM
XCOMM X Server for MS Windows
XCOMM
FBSUBDIR = fb
MIDAMAGEDIR = miext/damage
SHADOWDIR = miext/shadow
#if BuildXWinLayer
LAYERDIR = miext/layer
XWINLAYERLIB = $(LAYER)
#else
LAYERDIR =
XWINLAYERLIB =
#endif
#if BuildXWinMultiWindowExtWM
ROOTLESSDIR = miext/rootless
ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \
$(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \
$(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel)
#else
ROOTLESSDIR =
ROOTLESSLIB =
#endif
NXWINDDXDIR = hw/nxwin
#if BuildXWinXF86Config
XWINPARSERDIR = hw/xfree86/parser
XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
#else
XWINPARSERDIR =
XWINPARSERLIB =
#endif
XWINOPENGLLIB =
NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin)
NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \
$(DEPDIRS) $(XWINPARSERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NXWin.res
NXWINLIBS = PreFbLibs $(NXWINLIB) FbPostFbLibs $(NXWINLIB) $(XWINLAYERLIB) \
$(SHADOW) $(XWINPARSERLIB) $(ROOTLESSLIB) $(OS)
#if BuildXWinMultiWindow || BuildXWinClipboard
XWINX11 = $(XONLYLIB)
# if defined(Win32Architecture)
PTHREADLIB = -lpthreadGC
# endif
#endif
#if defined(Win32Architecture)
XWINW32 = -lgdi32 -lwsock32 $(PTHREADLIB)
#else
XWINW32 = -lgdi32
#endif
NXWINSYSLIBS = $(LDPRELIBS) $(XWINX11) $(SYSLIBS) $(XWINW32)
NXWINNXLIBS = -L../../../nxcomp -lXcomp
/*
* These flags cause NXWin.exe to be a Windows executable, which
* prevents NXWin.exe from opening a Command Prompt window when it is
* started. However, the flags also prevent NXWin.exe from outputting
* its status and error message to a Command Prompt; thus, one most
* implement a method to redirect status and error messages to a file
* before enabling these flags.
*/
EXTRA_LDOPTIONS = -e _mainCRTStartup
#if HasParallelMake
MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS))
#endif
#if ForceServerRemake
$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
#ifdef mingwArchitecture
NXWINSERVERNAME=NXming
#else
NXWINSERVERNAME=NXWin
#endif
ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
$(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS))
#ifndef ServerToInstall
# define ServerToInstall $(NXWINSERVERNAME)
#endif
#endif /* NXWinServer */
#if 0
#if defined(NXWinServer) && NXWinServer
XCOMM
XCOMM X Server for MS Windows
XCOMM
FBDIR = fb
SHADOWDIR = miext/shadow
LAYERDIR = miext/layer
NXWINDDXDIR = hw/nxwin
XWINPARSERDIR = hw/xfree86/parser
XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(nxwin)
NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \
$(DEPDIRS) $(XWINPARSERDIR)
#NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NX.res \
$(NXWINDDXDIR)/NXwindow.o \
$(NXWINDDXDIR)/NXdispatch.o $(NXWINDDXDIR)/NXproperty.o \
$(NXWINDDXDIR)/NXevents.o
NXWINOBJS = $(NXWINDDXDIR)/stubs.o $(NXWINDDXDIR)/NX.res
NXWINLIBS = PreFbLibs $(NXWINLIB) FbPostFbLibs $(LAYER) $(SHADOW) \
$(XWINPARSERLIB)
NXWINSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32 -lddraw
NXWINNXLIBS = -L../../../nxcomp -lXcomp
/*
* These flags cause NXWin.exe to be a Windows executable, which
* prevents NXWin.exe from opening a Command Prompt window when it is
* started. However, the flags also prevent NXWin.exe from outputting
* its status and error message to a Command Prompt; thus, one most
* implement a method to redirect status and error messages to a file
* before enabling these flags.
*/
EXTRA_LDOPTIONS = -mwindows -e _mainCRTStartup
#if HasParallelMake
MakeMutex($(NXWINDIRS) $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS))
#endif
#if ForceServerRemake
$(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS):: $(NXWINDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
ServerTarget(NXWin,$(NXWINDIRS),$(NXWINOBJS), \
$(NXWINLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(NXWINSYSLIBS) $(NXWINNXLIBS))
#ifndef ServerToInstall
#define ServerToInstall NXWin
#endif
#endif /* NXWinServer */
#endif
MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) \
$(HPDDXDIR) $(XFREE86DDXDIR) \
$(NXAGENTDDXDIR)
$(NXWINDDXDIR)
$(NXAGENTDDXDIR)
SUBDIRS = $(STDDIRS) \
$(IPLANDIRS) $(ILBMDIR) \
$(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment