xemacs-beta: lib-src/winclient.c comparison

comparison lib-src/winclient.c @ 5030:422b4b4fb2a6

Winclient updates

author	Vin Shelton <acs@xemacs.org>
date	Thu, 11 Feb 2010 19:33:50 -0500
parents	61aff09a7589
children	308d34e9f07d

comparison

equal deleted inserted replaced

-:acf7d1bc0490
+:422b4b4fb2a6
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#ifdef __CYGWIN__
+#include <stdlib.h>
+#include <unistd.h>
+#endif
 static void error (const char* s1, const char* s2);
 static void fatal (const char *s1, const char *s2);
 static void * xmalloc (size_t size);
 static char * getNextArg (const char **ptr, unsigned *len);
 /* -- Post-Include Defines -------------------------------------------------- */
 /* Timeouts & delays */
-#define CONNECT_RETRIES		10
+#define CONNECT_RETRIES		20
 #define CONNECT_DELAY		500		/* ms */
 #define TRANSACTION_TIMEOUT	5000		/* ms */
 #define MAX_INPUT_IDLE_WAIT     INFINITE	/* ms */
 /* DDE Strings */
 #define SERVICE_NAME	"XEmacs"
 #define TOPIC_NAME	"System"
 #define COMMAND_FORMAT	"[open(\"%s%s\")]"
 /* XEmacs program name */
-#define PROGRAM_TO_RUN	"xemacs.exe"
+#define GENERIC_PROGRAM		EMACS_PROGNAME ".exe"
+#define VERSIONED_PROGRAM	EMACS_PROGNAME "-" EMACS_VERSION ".exe"
 /* -- Constants ------------------------------------------------------------- */
 /* -- Global Variables ------------------------------------------------------ */
 	 int       nCmdShow)
 {
 HCONV hConv;
 int   ret = 0;
 UINT  uiRet;
 /* Initialise the DDEML library */
 uiRet = DdeInitialize (&idInst,
 			 (PFNCALLBACK) ddeCallback,
 			 APPCMD_CLIENTONLY
 			 |CBF_FAIL_ALLSVRXACTIONS,
 ret = parseCommandLine (hConv, lpCmdLine);
 /* Close the conversation */
 closeConversation (hConv);
 }
 DdeUninitialize (idInst);
 return ret;
 }
 MessageBox (NULL, "Could not create string handle for service.",
 		  "winclient", MB_ICONEXCLAMATION | MB_OK);
 goto error;
 }
 /* Get the topic name */
 hszTopic = DdeCreateStringHandle (idInst,
 				    TOPIC_NAME,
 				    CP_WINANSI);
 if (!hConv)
 {
 STARTUPINFO         sti;
 PROCESS_INFORMATION pi;
 int                 n;
 /* Try to start the program */
 ZeroMemory (&sti, sizeof (sti));
 sti.cb = sizeof (sti);
-if (!CreateProcess (NULL, PROGRAM_TO_RUN, NULL, NULL, FALSE, 0,
+if (!CreateProcess (NULL, GENERIC_PROGRAM, NULL, NULL, FALSE, 0,
+			  NULL, NULL, &sti, &pi) &&
+	  !CreateProcess (NULL, VERSIONED_PROGRAM, NULL, NULL, FALSE, 0,
 			  NULL, NULL, &sti, &pi))
 	{
 	  MessageBox (NULL, "Could not start process.",
 		      "winclient", MB_ICONEXCLAMATION | MB_OK);
 WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT);
 /* Close the handles */
 CloseHandle (pi.hThread);
 CloseHandle (pi.hProcess);
 /* Try to connect */
 for (n = 0; n < CONNECT_RETRIES; n++)
 	{
 	  Sleep (CONNECT_DELAY);
 	  hConv = DdeConnect (idInst, hszService, hszTopic, NULL);
 	  if (hConv)
 	    break;
 	}
 /* Release the string handles */
 DdeFreeStringHandle (idInst, hszService);
 DdeFreeStringHandle (idInst, hszTopic);
 return hConv;
 error:
 if (hConv)
 DdeDisconnect (hConv);
 if (hszService)
 DdeFreeStringHandle (idInst, hszService);
 int
 doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2)
 {
 char            *buf = NULL;
 unsigned        len;
 /* Calculate the buffer length */
 len = strlen (lpszFileName1) + strlen (lpszFileName2)
 + strlen (COMMAND_FORMAT);
 /* Allocate a buffer */
 buf = (char *) xmalloc (len);
 if (!buf)
 {
 return 1;
 }
 /* Build the command */
 len = wsprintf (buf, COMMAND_FORMAT, lpszFileName1, lpszFileName2);
 len++;
 /* OK. We're connected. Send the message. */
 DdeClientTransaction (buf, len, hConv, NULL,
 			0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL);
 free (buf);
 return 0;
 }
 /*
 * Name    : getNextArg
 p++;
 /* If this is the end, return NULL */
 if (!*p)
 return NULL;
 /* Remember where we are */
 start = p;
 /* Find the next whitespace character outside quotes */
 if (*p == '"')
 all_in_quotes = 1;
 while (*p && !quit)
 {
 switch (*p)
 	{
 	case '"':
 	  break;
 	case '\\':
 	  if (!in_quotes)
 	    all_in_quotes = 0;
 	  p++;
 	  if (!*p)
 	    break;
 if (all_in_quotes)
 {
 start++;
 length -= 2;
 }
 /* Copy */
 buf = (char *) xmalloc (length + 1);
 if (!buf)
 return NULL;
 strncpy (buf, start, length);
 buf[length] = '\0';
 /* Return the pointer and length */
 *ptr = p;
 WIN32_FIND_DATA wfd;
 /* Retrieve arguments */
 while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL)
 {
+fullpath = NULL;
+#ifdef __CYGWIN__
+/* If the filename is not an absolute path,
+	 add the current directory to the pathname */
+if (*arg != '/')
+	{
+	  len = pathconf(".", _PC_PATH_MAX);
+	  fullpath = (char *) xmalloc (len+1);
+	  if (!fullpath)
+	    {
+		MessageBox (NULL, "Not enough memory.", "winclient",
+			    MB_ICONEXCLAMATION | MB_OK);
+		ret = 1;
+		break;
+	    }
+	  if (!getcwd(fullpath, (size_t)len))
+	    {
+	      MessageBox (NULL, "Could not retrieve current directory.",
+			  "winclient", MB_ICONEXCLAMATION | MB_OK);
+	      ret = 1;
+	      break;
+	    }
+/* Append trailing slash */
+	  strcat(fullpath, "/");
+	  ret = doFile (hConv, fullpath, arg);
+	}
+else
+	{
+	  /* The arg has already been expanded, so pass it as it is */
+	  ret = doFile (hConv, "", arg);
+	}
+#else
 /* First find the canonical path name */
 fullpath = filepart = NULL;
 pathlen = GetFullPathName (arg, 0, fullpath, &filepart);
 fullpath = (char *) xmalloc (pathlen);
 if (!fullpath)
 	{
 	  MessageBox (NULL, "Not enough memory.", "winclient",
 		      MB_ICONEXCLAMATION | MB_OK);
 	  ret = 1;
-	  free (arg);
 	  break;
 	}
 GetFullPathName (arg, pathlen, fullpath, &filepart);
 	    }
 	  while (FindNextFile (hFindFile, &wfd));
 	  FindClose (hFindFile);
 	}
+#endif
 /* Release the path name buffers */
-free (fullpath);
+if (fullpath)
+	free (fullpath);
 free (arg);
 if (ret)
 	break;
 }

Mercurial > hg > xemacs-beta

comparison lib-src/winclient.c @ 5030:422b4b4fb2a6