10:11 a.m.
Hi
I'm back in business :)
I switched from native Win32 to cygwin because of the non-matching
Win32 permissions.
Cygwin ACL's are sometimes fucked up by inheritance.
So I have several improvements.
Patches inlined because gmail uploader fails on my proxy
diff -u xemacs-21.5.28/lib-src/winclient.c.orig
xemacs-21.5.28/lib-src/winclient.c
--- xemacs-21.5.28/lib-src/winclient.c.orig 2009-06-24 09:30:22.234375000 +0200
+++ xemacs-21.5.28/lib-src/winclient.c 2009-06-24 10:59:52.437500000 +0200
＠＠ -209,8 +209,8 ＠＠
CloseHandle (pi.hThread);
CloseHandle (pi.hProcess);
- /* Try to connect */
- for (n = 0; n < 5; n++)
+ /* Try to connect. Process startup and XEmacs init might be slow */
+ for (n = 0; n < 10; n++)
{
Sleep (CONNECT_DELAY);
＠＠ -408,6 +408,12 ＠＠
/* Retrieve arguments */
while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL)
{
+#ifdef __CYGWIN__
+ /* On cygwin args are already space delimited so pass these args
+ verbatim to XEmacs */
+ fullpath = (char *) xmalloc (len);
+ ret = doFile (hConv, fullpath, arg);
+#else
/* First find the canonical path name */
fullpath = filepart = NULL;
pathlen = GetFullPathName (arg, 0, fullpath, &filepart);
＠＠ -451,7 +457,7 ＠＠
FindClose (hFindFile);
}
-
+#endif
/* Release the path name buffers */
free (fullpath);
free (arg);
diff -u xemacs-21.5.28/lib-src/Makefile.in.in.orig
xemacs-21.5.28/lib-src/Makefile.in.in
--- xemacs-21.5.28/lib-src/Makefile.in.in.orig 2007-05-21
05:50:19.000000000 +0200
+++ xemacs-21.5.28/lib-src/Makefile.in.in 2009-06-24 09:40:30.250000000 +0200
＠＠ -375,7 +375,7 ＠＠
$(CC) $(cflags) ${srcdir}/../nt/minitar.c $(ldflags) -lz -o $＠
winclient: ${srcdir}/winclient.c
- $(CC) $(cflags) ${srcdir}/winclient.c $(ldflags) -o $＠
+ $(CC) $(cflags) -mwindows ${srcdir}/winclient.c $(ldflags) -o $＠
hexl: ${srcdir}/hexl.c
$(CC) $(cflags) ${srcdir}/hexl.c $(ldflags) -o $＠
---------- Forwarded message ----------
From: Reini Urban <rurban(a)x-ray.at>
Date: 2009/6/24
Subject: xemacs winclient improvements
To: The Cygwin Mailing List <cygwin(a)cygwin.com>
Several xemacs ideas:
* I added -mwindows to the winclient linker step which results in a
much improved winclient.
I'll take this patch to xemacs-patches by myself.
* parseCommandLine() does not work on cygwin this way.
It uses the Win32 API to find files, and should be special cased to
use the POSIX API.
I'll discuss this at xemacs-beta
* xemacs-21.5.28-3 uses slow defaults:
Compiling in support for extra debugging code.
Compiling in support for runtime error checking.
WARNING: ---------------------------------------------------------
WARNING: XEmacs will run noticeably more slowly as a result.
WARNING: Error checking is on by default for XEmacs beta releases.
WARNING: ---------------------------------------------------------
hmm. 21.5.28 is stable for me and upstream. maybe remove this.
* build failure on 1.7:
In file included from
/usr/src/xemacs-21.5.28-3/src/xemacs-21.5.28/src/console-msw.h:41,
from
/usr/src/xemacs-21.5.28-3/src/xemacs-21.5.28/src/cmdloop.c:43:
/usr/src/xemacs-21.5.28-3/src/xemacs-21.5.28/src/syswindows.h:500:
error: conflicting types for 'wcstok'
/usr/include/wchar.h:92: error: previous declaration of 'wcstok' was here
make[1]: *** [cmdloop.o] Error 1
This needs a patch upstream. Maybe I'll take it upstream.
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
7:54 a.m.
New subject: xemacs winclient improvements
2009/6/24 Reini Urban <rurban(a)x-ray.at>:
So I have several improvements.
Patches inlined because gmail uploader fails on my proxy
Forget the previous attempt. It double-freed an arg.
This patch works now fine.
2009-06-30 Reini Urban <rurban(a)x-ray.at>
* lib-src/winclient.c: adapt to cygwin paths, add more startup sleep to
let xemacs init the DDE server.
diff -u xemacs-21.5.28/lib-src/winclient.c.orig
xemacs-21.5.28/lib-src/winclient.c
--- xemacs-21.5.28/lib-src/winclient.c.orig 2009-06-24 09:30:22.234375000 +0200
+++ xemacs-21.5.28/lib-src/winclient.c 2009-06-30 08:28:29.046875000 +0200
＠＠ -1,5 +1,6 ＠＠
/* DDE client for XEmacs.
Copyright (C) 2002 Alastair J. Houghton
+ Copyright (C) 2009 Reini Urban
This file is part of XEmacs.
＠＠ -31,6 +32,9 ＠＠
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
+#ifdef __CYGWIN__
+#include <sys/cygwin.h>
+#endif
static void error (const char* s1, const char* s2);
static void fatal (const char *s1, const char *s2);
＠＠ -40,6 +44,8 ＠＠
/* -- Post-Include Defines
-------------------------------------------------- */
/* Timeouts & delays */
+#define STARTUP_DELAY 3000 /* ms */
+#define CONNECT_RETRIES 10
#define CONNECT_DELAY 500 /* ms */
#define TRANSACTION_TIMEOUT 5000 /* ms */
#define MAX_INPUT_IDLE_WAIT INFINITE /* ms */
＠＠ -205,12 +211,15 ＠＠
/* Wait for the process to enter an idle state */
WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT);
+ /* Wait longer to let the process init the GUI and initialize
the DDE server */
+ Sleep (STARTUP_DELAY);
+
/* Close the handles */
CloseHandle (pi.hThread);
CloseHandle (pi.hProcess);
- /* Try to connect */
- for (n = 0; n < 5; n++)
+ /* Try to connect. Process startup and XEmacs init might be slow */
+ for (n = 0; n < CONNECT_RETRIES; n++)
{
Sleep (CONNECT_DELAY);
＠＠ -272,6 +281,24 ＠＠
char *buf = NULL;
unsigned len;
+ /* On Cygwin convert the path - first part - back to POSIX */
+#ifdef __CYGWIN__
+ int err;
+ int pathlen;
+ char *fullpath;
+
+ pathlen = strlen(lpszFileName1) + 260 + 1001;
+ fullpath = (char *) xmalloc (pathlen);
+ err = cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_RELATIVE,
+ lpszFileName1, fullpath, pathlen);
+# ifdef DEBUG
+ fprintf(stderr, "DEBUG doFile(hConv, \"%s\", \"%s\")\n",
lpszFileName1, lpszFileName2);
+ fprintf(stderr, "DEBUG W2P \"%s\" => \"%s\"
err=%d\n",
lpszFileName1, fullpath, err);
+# endif
+ if (!err)
+ strcpy(lpszFileName1, fullpath);
+#endif
+
/* Calculate the buffer length */
len = strlen (lpszFileName1) + strlen (lpszFileName2)
+ strlen (COMMAND_FORMAT);
＠＠ -296,6 +323,13 ＠＠
DdeClientTransaction (buf, len, hConv, NULL,
0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL);
+#ifdef __CYGWIN__
+# ifdef DEBUG
+ fprintf(stderr, "DEBUG DDE => %s\n", buf);
+# endif
+ if (!err)
+ free (fullpath);
+#endif
free (buf);
return 0;
＠＠ -404,13 +438,20 ＠＠
int ret = 0;
HANDLE hFindFile = NULL;
WIN32_FIND_DATA wfd;
+#ifdef __CYGWIN__
+ int err;
+#endif
/* Retrieve arguments */
while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL)
{
/* First find the canonical path name */
fullpath = filepart = NULL;
+#ifdef __CYGWIN__
+ pathlen = len + 260 + 1001;
+#else
pathlen = GetFullPathName (arg, 0, fullpath, &filepart);
+#endif
fullpath = (char *) xmalloc (pathlen);
＠＠ -425,6 +466,17 ＠＠
break;
}
+#ifdef __CYGWIN__
+ err = cygwin_conv_path(CCP_POSIX_TO_WIN_A | CCP_RELATIVE, arg,
fullpath, pathlen);
+# ifdef DEBUG
+ fprintf(stderr, "DEBUG P2W \"%s\" => \"%s\"
err=%d\n", arg,
fullpath, err);
+# endif
+ if (err)
+ ret = doFile (hConv, "", arg);
+ else
+ arg = fullpath;
+#endif
+
GetFullPathName (arg, pathlen, fullpath, &filepart);
/* Find the first matching file */
＠＠ -454,7 +506,10 ＠＠
/* Release the path name buffers */
free (fullpath);
- free (arg);
+#ifdef __CYGWIN__
+ if (err)
+ free (arg);
+#endif
if (ret)
break;
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
4:06 p.m.
New subject: xemacs winclient improvements
Hi, Reini -
Thanks for sending this along. I had the start of a similar patch in
my workspace, but yours goes further.
Sorry this has taken awhile for my feedback. I have a couple of comments:
1. Please explain the '260 + 1001' values in your patch. In cygwin
1.7, PATH_MAX is 4096, shouldn't you use that?
On Tue, Jun 30, 2009 at 2:54 AM, Reini Urban<rurban(a)x-ray.at> wrote:
/* Find the first matching file */
＠＠ -454,7 +506,10 ＠＠
/* Release the path name buffers */
free (fullpath);
- free (arg);
+#ifdef __CYGWIN__
+ if (err)
+ free (arg);
+#endif
if (ret)
break;
2. There was an unconditional
free (arg);
there. Did you mean to remove it?
- Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
6:32 p.m.
New subject: xemacs winclient improvements
2009/7/8 Vin Shelton <ethersoft(a)gmail.com>:
Hi, Reini -
Thanks for sending this along. I had the start of a similar patch in
my workspace, but yours goes further.
Sorry this has taken awhile for my feedback. I have a couple of comments:
1. Please explain the '260 + 1001' values in your patch. In cygwin
1.7, PATH_MAX is 4096, shouldn't you use that?
4096 can also be used.
I just took this arbitrarily looking logic 260 + 1001 from the cygwin
sources itself
to precalculate the expanded length.
On Tue, Jun 30, 2009 at 2:54 AM, Reini Urban<rurban(a)x-ray.at>
wrote:
> /* Find the first matching file */
> ＠＠ -454,7 +506,10 ＠＠
>
> /* Release the path name buffers */
> free (fullpath);
> - free (arg);
> +#ifdef __CYGWIN__
> + if (err)
> + free (arg);
> +#endif
>
> if (ret)
> break;
>
2. There was an unconditional
free (arg);
there. Did you mean to remove it?
This last
- free (arg);
+#ifdef __CYGWIN__
+ if (err)
+ free (arg);
+#endif
was causing me headaches and crashes. arg is already freed, because
arg = fullpath; for cygwin only.
Just in the err case arg is a single unfreed pointer.
Maybe it should be documented in the source also.
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
9:26 a.m.
New subject: xemacs winclient improvements
I had to revise my patch again. The old version forgot a / with files
in a root drive. (C:, D:, ...)
2009-07-27 Reini Urban <rurban(a)x-ray.at>
* lib-src/winclient.c: Support cygwin paths. Add longer STARTUP_DELAY
and CONNECT_RETRIES due to long GUI and DDE initialization on cygwin.
2009/7/9 Reini Urban <rurban(a)x-ray.at>:
2009/7/8 Vin Shelton <ethersoft(a)gmail.com>:
> Thanks for sending this along. I had the start of a similar patch in
> my workspace, but yours goes further.
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
10:03 a.m.
New subject: xemacs winclient improvements
Attached is the 3rd version of my winclient patch.
This version correctly resolves a xemacs symlink and properly converts
the dde path to windows.
I just used /usr/bin/which and /usr/bin/cygpath which is in the cygwin
base install.
2009/7/27 Reini Urban <rurban(a)x-ray.at>:
I had to revise my patch again. The old version forgot a / with
files
in a root drive. (C:, D:, ...)
2009-07-27 Reini Urban <rurban(a)x-ray.at>
* lib-src/winclient.c: Support cygwin paths. Add longer STARTUP_DELAY
and CONNECT_RETRIES due to long GUI and DDE initialization on cygwin.
2009/7/9 Reini Urban <rurban(a)x-ray.at>:
> 2009/7/8 Vin Shelton <ethersoft(a)gmail.com>:
>> Thanks for sending this along. I had the start of a similar patch in
>> my workspace, but yours goes further.
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/mailman/listinfo/xemacs-beta
5244
days inactive
5669
days old
5 comments
2 participants
participants (2)
-
Reini Urban -
Vin Shelton