annotate lib-src/i.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents abe6d1db359e
children 01c57eb70ae9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
1 /* I-connector utility
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
2 Copyright (C) 2000 Kirill M. Katsnelson
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
3 Copyright (C) 2002 Ben Wing.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
4
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
5 This file is part of XEmacs.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
6
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
7 XEmacs is free software; you can redistribute it and/or modify it
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
10 later version.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
11
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
15 for more details.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
16
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
18 along with XEmacs; see the file COPYING. If not, write to
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
20 Boston, MA 02111-1307, USA. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
21
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
22 /* When run with an argument, i treats it as a command line, and pipes
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
23 command stdin, stdout and stderr to its own respective streams. How
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
24 silly it should sound, but windowed program in Win32 cannot do output
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
25 to the console from which it has been started, and should be run using
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
26 this utility.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
27
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
28 This utility is for running [tx]emacs as part of make process so that
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
29 its output goes to the same console as the rest of the make output
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
30 does. It can be used also when xemacs should be run as a batch
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
31 command ina script, especially when its standart output should be
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
32 obtained programmatically. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
33
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
34 #include <windows.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
35 #include <stdio.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
36 #include <string.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
37 #include <tchar.h>
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
38
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
39 typedef struct
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
40 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
41 HANDLE source;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
42 HANDLE drain;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
43 } I_connector;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
44
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
45 /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
46 * Make new handle as that pointed to by PH but
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
47 * inheritable, substitute PH with it, and close the
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
48 * original one
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
49 */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
50 static void
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
51 make_inheritable (HANDLE* ph)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
52 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
53 HANDLE htmp;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
54 DuplicateHandle (GetCurrentProcess(), *ph, GetCurrentProcess(), &htmp,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
55 0, TRUE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
56 *ph = htmp;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
57 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
58
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
59 /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
60 * Worker thread proc. Reads source, pumps into drain,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
61 * till either clogs.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
62 */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
63 static DWORD CALLBACK
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
64 pump (LPVOID pv_i)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
65 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
66 I_connector* pi = (I_connector*) pv_i;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
67 BYTE buffer [256];
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
68 DWORD really_read, unused;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
69
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
70 while (ReadFile (pi->source, buffer, sizeof (buffer), &really_read, NULL) &&
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
71 WriteFile (pi->drain, buffer, really_read, &unused, NULL))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
72 ;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
73
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
74 return 0;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
75 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
76
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
77 /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
78 * Launch a pump for the given I-connector
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
79 */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
80 static void
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
81 start_pump (I_connector* pi)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
82 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
83 DWORD unused;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
84 HANDLE h_thread = CreateThread (NULL, 0, pump, (void*)pi, 0, &unused);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
85 CloseHandle (h_thread);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
86 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
87
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
88 static HANDLE external_event;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
89
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
90 static BOOL
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
91 ctrl_c_handler (unsigned long type)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
92 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
93 SetEvent (external_event);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
94 return FALSE;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
95 }
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
96
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
97 /* Skip over the executable name in the given command line. Correctly
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
98 handles quotes in the name. Return NULL upon error. If
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
99 REQUIRE_FOLLOWING is non-zero, it's an error if no argument follows the
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
100 executable name. */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
101
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
102 static LPTSTR
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
103 skip_executable_name (LPTSTR cl, int require_following)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
104 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
105 int ix;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
106
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
107 while (1)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
108 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
109 ix = _tcscspn (cl, _T(" \t\""));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
110 if (cl[ix] == '\"')
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
111 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
112 cl = _tcschr (cl + ix + 1, '\"');
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
113 if (cl == NULL)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
114 return NULL; /* Unmatched quote */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
115 cl++;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
116 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
117 else
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
118 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
119 cl += ix;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
120 cl += _tcsspn (cl, _T(" \t"));
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
121 if (!require_following)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
122 return cl;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
123 return *cl ? cl : NULL;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
124 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
125 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
126 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
127
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
128 /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
129 * Brew coffee and bring snickers
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
130 */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
131 void
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
132 usage (void)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
133 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
134 fprintf (stderr,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
135 "\n"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
136 "usage: i command\n"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
137 "i executes the command and reroutes its standard handles to the calling\n"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
138 "console. Good for seeing output of GUI programs that use standard output."
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
139 "\n");
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
140 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
141
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
142 int
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
143 main (void)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
144 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
145 STARTUPINFO si;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
146 PROCESS_INFORMATION pi;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
147 I_connector I_in, I_out, I_err;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
148 DWORD exit_code;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
149 LPTSTR command = skip_executable_name (GetCommandLine (), 1);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
150
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
151 if (command == NULL)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
152 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
153 usage ();
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
154 return 1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
155 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
156
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
157 ZeroMemory (&si, sizeof (si));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
158 si.dwFlags = STARTF_USESTDHANDLES;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
159
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
160 I_in.source = GetStdHandle (STD_INPUT_HANDLE);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
161 CreatePipe (&si.hStdInput, &I_in.drain, NULL, 0);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
162 make_inheritable (&si.hStdInput);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
163
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
164 I_out.drain = GetStdHandle (STD_OUTPUT_HANDLE);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
165 CreatePipe (&I_out.source, &si.hStdOutput, NULL, 0);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
166 make_inheritable (&si.hStdOutput);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
167
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
168 I_err.drain = GetStdHandle (STD_ERROR_HANDLE);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
169 CreatePipe (&I_err.source, &si.hStdError, NULL, 0);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
170 make_inheritable (&si.hStdError);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
171
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
172 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
173 SECURITY_ATTRIBUTES sa;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
174 LPTSTR new_command =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
175 (LPTSTR) malloc (666 + sizeof (TCHAR) * _tcslen (command));
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
176 LPTSTR past_exe;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
177
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
178 if (!new_command)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
179 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
180 _ftprintf (stderr, _T ("Out of memory when launching `%s'\n"),
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
181 command);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
182 return 2;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
183 }
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
184
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
185 past_exe = skip_executable_name (command, 0);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
186 if (!past_exe)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
187 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
188 usage ();
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
189 return 1;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
190 }
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
191
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
192 /* Since XEmacs isn't a console application, it can't easily be
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
193 terminated using ^C. Therefore, we set up a communication path with
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
194 it so that when a ^C is sent to us (using GenerateConsoleCtrlEvent),
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
195 we in turn signals it to commit suicide. (This is cleaner than using
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
196 TerminateProcess()). This makes (e.g.) the "Stop Build" command
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
197 from VC++ correctly terminate XEmacs.
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
198
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
199 #### This will cause problems if i.exe is used for commands other
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
200 than XEmacs. We need to make behavior this a command-line
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
201 option. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
202
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
203 /* Create the event as inheritable so that we can use it to communicate
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
204 with the child process */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
205 sa.nLength = sizeof (sa);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
206 sa.bInheritHandle = TRUE;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
207 sa.lpSecurityDescriptor = NULL;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
208 external_event = CreateEvent (&sa, FALSE, FALSE, NULL);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
209 if (!external_event)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
210 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
211 _ftprintf (stderr, _T ("Error %d creating signal event for `%s'\n"),
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
212 GetLastError (), command);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
213 return 2;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
214 }
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
215
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
216 SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
217 _tcsncpy (new_command, command, past_exe - command);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
218 _stprintf (new_command + (past_exe - command),
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
219 /* start with space in case no args past command name */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
220 " -mswindows-termination-handle %d ", (long) external_event);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
221 _tcscat (new_command, past_exe);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
222
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
223 if (CreateProcess (NULL, new_command, NULL, NULL, TRUE, 0,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
224 NULL, NULL, &si, &pi) == 0)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
225 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
226 _ftprintf (stderr, _T("Error %d launching `%s'\n"),
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
227 GetLastError (), command);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
228 return 2;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
229 }
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
230
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
231 CloseHandle (pi.hThread);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
232 }
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 442
diff changeset
233
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
234
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
235 /* Start pump in each I-connector */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
236 start_pump (&I_in);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
237 start_pump (&I_out);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
238 start_pump (&I_err);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
239
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
240 /* Wait for the process to complete */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
241 WaitForSingleObject (pi.hProcess, INFINITE);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
242 GetExitCodeProcess (pi.hProcess, &exit_code);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
243 CloseHandle (pi.hProcess);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
244
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
245 /* Make pump threads eventually die out. Looks rude, I agree */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
246 CloseHandle (GetStdHandle (STD_INPUT_HANDLE));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
247 CloseHandle (GetStdHandle (STD_OUTPUT_HANDLE));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
248 CloseHandle (GetStdHandle (STD_ERROR_HANDLE));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
249
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
250 return exit_code;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents:
diff changeset
251 }