Mercurial > hg > xemacs-beta
view lib-src/winclient.c @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 61aff09a7589 |
children | 422b4b4fb2a6 |
line wrap: on
line source
/* DDE client for XEmacs. Copyright (C) 2002 Alastair J. Houghton This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* -- Includes -------------------------------------------------------------- */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <windows.h> #include <ddeml.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <errno.h> 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_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" /* -- Constants ------------------------------------------------------------- */ /* -- Global Variables ------------------------------------------------------ */ HINSTANCE hInstance; DWORD idInst = 0; /* -- Function Declarations ------------------------------------------------- */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2); int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow); static HCONV openConversation (void); static void closeConversation (HCONV hConv); static int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2); static int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine); /* -- Function Definitions -------------------------------------------------- */ /* * Name : ddeCallback * Function: Gets called by DDEML. * */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2) { return (HDDEDATA) NULL; } /* * Name : WinMain * Function: The program's entry point function. * */ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow) { HCONV hConv; int ret = 0; UINT uiRet; /* Initialise the DDEML library */ uiRet = DdeInitialize (&idInst, (PFNCALLBACK) ddeCallback, APPCMD_CLIENTONLY |CBF_FAIL_ALLSVRXACTIONS, 0); if (uiRet != DMLERR_NO_ERROR) { MessageBox (NULL, "Could not initialise DDE management library.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Open a conversation */ hConv = openConversation (); if (hConv) { /* OK. Next, we need to parse the command line. */ ret = parseCommandLine (hConv, lpCmdLine); /* Close the conversation */ closeConversation (hConv); } DdeUninitialize (idInst); return ret; } /* * Name : openConversation * Function: Start a conversation. * */ static HCONV openConversation (void) { HSZ hszService = NULL, hszTopic = NULL; HCONV hConv = NULL; /* Get the application (service) name */ hszService = DdeCreateStringHandle (idInst, SERVICE_NAME, CP_WINANSI); if (!hszService) { 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 (!hszTopic) { MessageBox (NULL, "Could not create string handle for topic.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Try to connect */ hConv = DdeConnect (idInst, hszService, hszTopic, NULL); 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, NULL, NULL, &sti, &pi)) { MessageBox (NULL, "Could not start process.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Wait for the process to enter an idle state */ 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; } if (!hConv) { /* Still couldn't connect. */ MessageBox (NULL, "Could not connect to DDE server.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } } /* Release the string handles */ DdeFreeStringHandle (idInst, hszService); DdeFreeStringHandle (idInst, hszTopic); return hConv; error: if (hConv) DdeDisconnect (hConv); if (hszService) DdeFreeStringHandle (idInst, hszService); if (hszTopic) DdeFreeStringHandle (idInst, hszTopic); return NULL; } /* * Name : closeConversation * Function: Close a conversation. * */ static void closeConversation (HCONV hConv) { /* Shut down */ DdeDisconnect (hConv); } /* * Name : doFile * Function: Process a file. * */ 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) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); 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 * Function: Retrieve the next command line argument. * */ static char * getNextArg (const char **ptr, unsigned *len) { int in_quotes = 0, quit = 0, all_in_quotes = 0; const char *p = *ptr, *start; char *buf = NULL; unsigned length = 0; /* Skip whitespace */ while (*p && isspace (*p)) 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 '"': in_quotes = 1 - in_quotes; p++; break; case '\\': if (!in_quotes) all_in_quotes = 0; p++; if (!*p) break; p++; break; default: if (isspace (*p) && !in_quotes) quit = 1; else if (!in_quotes) all_in_quotes = 0; if (!quit) p++; } } /* Work out the length */ length = p - start; /* Strip quotes if the argument is completely quoted */ 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; *len = length; return buf; } /* * Name : parseCommandLine * Function: Process the command line. This program accepts a list of strings * : (which may contain wildcards) representing filenames. * */ int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine) { char *fullpath, *filepart; char *arg; unsigned len, pathlen; int ret = 0; HANDLE hFindFile = NULL; WIN32_FIND_DATA wfd; /* Retrieve arguments */ while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL) { /* 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); /* Find the first matching file */ hFindFile = FindFirstFile (arg, &wfd); if (hFindFile == INVALID_HANDLE_VALUE) ret = doFile (hConv, fullpath, ""); else { /* Chop off the file part from the full path name */ if (filepart) *filepart = '\0'; /* For each matching file */ do { /* Process it */ ret = doFile (hConv, fullpath, wfd.cFileName); if (ret) break; } while (FindNextFile (hFindFile, &wfd)); FindClose (hFindFile); } /* Release the path name buffers */ free (fullpath); free (arg); if (ret) break; } return ret; } static void fatal (const char *s1, const char *s2) { error (s1, s2); exit (1); } /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void error (const char* s1, const char* s2) { fprintf (stderr, "winclient: "); fprintf (stderr, s1, s2); fprintf (stderr, "\n"); } /* Like malloc but get fatal error if memory is exhausted. */ static void * xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *) 0); return result; }