Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Fixes compiler warning:
"fd.c", line 481: warning: statement not reached
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Performed with util/modular/x-indent-all.sh, followed by manual fixups
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Reading through Xtranssock.c reveals that when _X11TransConnect returns the
value TRANS_TRY_CONNECT_AGAIN, it turns off the abstract socket flag, so
that attempting _X11TransConnect might succeed the second time where it
failed the first time.
Now xscope will attempt the connection a second time when it receives the
TRANS_TRY_CONNECT_AGAIN return value on the first connection attempt.
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
In USE_XTRANS mode, MakeConnection() cycles through a selection of
protocol choices until it finds one where it can open a socket to
the server. It then attempts an X11 connection via that socket and
aborts if one isn't possible.
This patch modifies the code to try an alternate protocol if the X11
connection fails.
https://bugs.freedesktop.org/show_bug.cgi?id=46696
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Different platforms use different names for the fd_set members,
so use the existing Xpoll.h macros for greater portability.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=46689
Change fd_set debug output to display actual contents of first 32 or 64 bits.
In xscope-1.3.1, MainLoop() contains debug(128,...) code that appears
intended to display the fd_set contents before and after the main
select() call. In most implementations, fd_set will be a struct though
it is printed as an int, thus the actual debug output is unlikely to
usefully reflect the actual fd_set contents.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Error detected by Solaris Studio 12.3 code analyzer:
WARNING 1 (MRC): missing null-pointer check after malloc: calloc(((ullong)MaxFD),48) at:
InitializeFD() <app/xscope/fd.c : 107>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
All OS routines take and return ints for file descriptors, so stop
converting back and forth to shorts.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
We still allocate one fdinfo struct for every possible FD up front
instead of resizing as needed, but they're much smaller now that
we just have a pointer to the 32k buffer instead of including it
directly in the fdinfo.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
This adds support for --disable-unix-transport
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Conflicts:
common.c
decode11.c
fd.c
fd.h
print11.c
prtype.c
scope.c
scope.h
server.c
table11.c
x11.h
xscope.man
|
|
|
|
|
|
|
|
Conversion to ANSI C
SysVR4 support
Conversion of networking code to use xtrans
|
|
|