Mercurial > emacs
annotate nt/runemacs.c @ 26088:b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
* Makefile.in (emacs): Set the LC_ALL environment variable to "C"
when dumping, so that the dumped Emacs doesn't have stray locale info.
(dired.o): Depend on systime.h.
(editfns.o): Depend on coding.h.
* alloc.c, buffer.c, callproc.c, ccl.c, charset.c, coding.c, data.c,
dispnew.c, editfns.c, emacs.c, filelock.c, floatfns.c, hftctl.c,
keyboard.c, process.c, sysdep.c, unexelf.c, unexhp9k800.c,
unexsunos4.c, vmsfns.c, vmsgmalloc.c, w32faces.c, w32menu.c, w32term.c,
w32xfns.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Include <config.h> before any system include files.
* alloc.c, buffer.c, ccl.c, data.c, editfns.c, emacs.c, eval.c,
fileio.c, filelock.c, frame.c, insdel.c, keymap.c, lread.c,
m/alpha.h, print.c, search.c, sysdep.c, xdisp.c, xfaces.c, xfns.c,
xmenu.c, xterm.c:
Do not include <stdlib.h>, as <config.h> does this now.
* callproc.c (Fcall_process):
Synchronize messages locale before invoking strerror.
Decode resulting string with locale-coding-system.
* coding.c (Vlocale_coding_system): New var.
(syms_of_coding): Adjust to above change.
(emacs_strerror): New function.
* coding.h (emacs_strerror, Vlocale_coding_system): New decls.
* config.in (HAVE_STDIO_EXT_H, HAVE_TM_GMTOFF, HAVE___FPENDING,
HAVE_FTELLO, HAVE_GETLOADAVG, HAVE_MBLEN, HAVE_MBRLEN,
HAVE_STRSIGNAL): New macros.
(BITS_PER_LONG): Default to 64 if _LP64 is defined.
<stdlib.h>: Include if HAVE_STDLIB_H is defined and NOT_C_CODE isn't.
* dired.c: Include "systime.h".
(Ffile_attributes): Do not cast s.st_size to int; this loses
information if int is 32 bits but st_size and EMACS_INT are larger.
Treat large device numbers like large inode numbers.
* dispnew.c (PENDING_OUTPUT_COUNT): Use __fpending if available.
* editfns.c: Include coding.h.
(emacs_strftime): Remove decl.
(emacs_strftimeu): New decl.
(emacs_memftimeu): Renamed from emacs_memftime; new arg UT.
Use emacs_strftimeu instead of emacs_strftime.
(Fformat_time_string): Convert format string using
Vlocale_coding_system, and convert result back. Synchronize time
locale before invoking lower level function. Invoke
emacs_memftimeu, passing ut, instead of emacs_memftime.
* emacs.c: Include <locale.h> if HAVE_SETLOCALE is defined.
(Vmessages_locale, Vprevious_messages_locale, Vtime_locale,
Vprevious_time_locale): New variables.
(main): Invoke setlocale early, so that initial error messages are
localized properly. But skip locale-setting if LC_ALL is "C".
Fix up locale when it's safe to do so.
(fixup_locale): Moved here from xterm.c.
(synchronize_locale, synchronize_time_locale,
synchronize_messages_locale): New functions.
(syms_of_emacs): Accommodate above changes.
* fileio.c (report_file_error): Convert strerror output according
to Vlocale_coding_system.
(Finsert_file_contents): Check for arithmetic overflow in
computations that depend on file size. Report IO errors
with emacs_strerror, not strerror.
* fns.c (Fgethash): Declare dflt parameter.
* gmalloc.c: Do not define const to nothing if HAVE_CONFIG_H
is defined; that's config.h's job.
* lisp.h (EMACS_INT, BITS_PER_EMACS_INT, EMACS_UINT): If _LP64,
default these values to long, BITS_PER_LONG, and unsigned long.
(VALBITS, MARKBIT, XINT): Do not assume 32-bit EMACS_INT.
(PNTR_COMPARISON_TYPE): Default to EMACS_UINT, not to unsigned int.
(code_convert_string_norecord, fixup_locale,
synchronize_messages_locale, synchronize_time_locale,
emacs_open, emacs_close, emacs_read, emacs_write): New decls.
All Emacs callers of open, close, read, write changed to use
emacs_open, emacs_close, emacs_read, emacs_write.
* lread.c (file_offset, file_tell): New macros. All uses of ftell
changed to file_tell.
(saved_doc_string_position, prev_saved_doc_string_position): Now
of type file_offset.
(init_lread): Do not fix locale here; fixup_locale now does this.
* m/amdahl.h, s/usg5-4.h:
(NSIG): Remove.
(NSIG_MINIMUM): New macro.
* m/cydra5.h, m/dpx2.h, m/mips.h, m/pfa50.h, m/sps7.h, m/stride.h,
m/ustation.h, s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h,
s/umips.h, s/usg5-4.h:
(SIGIO): Do not undef.
(BROKEN_SIGIO): New macro.
* m/ustation.h:
(SIGTSTP): Do not undef.
(BROKEN_SIGTSTP): New macro.
* s/gnu-linux.h:
(SIGPOLL, SIGURG): Do not undef.
(BROKEN_SIGPOLL, BROKEN_SIGURG): New macros.
* s/ptx4.h:
(SIGINFO): Do not undef.
(BROKEN_SIGINFO): New macros.
* m/delta.h, s/ptx.h, s/template.h: Doc fix.
* mktime.c, strftime.c: Update to glibc 2.1.2 version, with
some Emacs-related changes merged.
* print.c (float_to_string): Prepend "-" to representation of a
NaN if the NaN is negative.
* process.c (sys_siglist): Omit if HAVE_STRSIGNAL.
(wait_reading_process_input): Use emacs_strerror, not strerror.
* process.c (status_message, sigchld_handler): Synchronize locale,
then use strsignal istead of sys_siglist.
* w32proc.c (sys_wait): Likewise.
* s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h,
s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h,
s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h,
s/usg5-2.h, s/usg5-3.h, s/xenix.h:
(open, close, read, write, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove.
* s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros.
* sysdep.c (sys_read, sys_write, read, write, sys_close, close,
sys_open, open): Remove.
(emacs_open, emacs_close, emacs_read, emacs_write): Always define;
the old INTERRUPTIBLE_OPEN, INTERRUPTIBLE_CLOSE, and INTERRUPTIBLE_IO
macros are no longer used.
(emacs_open): Renamed from sys_open. Merge BSD4_1 version.
(emacs_close): Renamed from sys_close.
(emacs_read): Renamed from sys_read.
(emacs_write): Renamed from sys_write.
(sys_siglist): Do not declare if HAVE_STRSIGNAL.
(dup2): Do not print error on failure; the real dup2 doesn't.
(strsignal): New function, defined if !HAVE_STRSIGNAL.
* syssignal.h (SIGINFO): Undef if defined and if BROKEN_SIGINFO
is defined.
(SIGIO, SIGPOLL, SIGTSTP, SIGURG): Likewise.
(NSIG): If less than NSIG_MINIMUM, define to NSIG_MINIMUM.
(strsignal): Declare if !HAVE_STRSIGNAL.
* unexelf.c (ElfBitsW, ELFSIZE, ElfExpandBitsW): New macros.
(ElfW): Define in terms of ElfExpandBitsW.
* w32proc.c (sys_siglist): Remove decl.
* xdisp.c (decode_mode_spec): 3rd arg is int, not char, to comply
with ANSI C.
(display_string): Declare face_string_pos arg.
* xfns.c (Fx_show_tip): Declare timeout param.
* xterm.c: No need to include locale.h.
(x_alloc_lighter_color, x_setup_relief_color):
Pass arg as double, not float, for compatibility with ANSI C.
(fixup_locale): Move to emacs.c.
(x_term_init): Do not setlocale or fixup locale; the main program
does this now.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Tue, 19 Oct 1999 07:25:11 +0000 |
parents | 2cc3642eb734 |
children | 6d99fe7bc313 |
rev | line source |
---|---|
15139 | 1 /* |
2 Simple program to start Emacs with its console window hidden. | |
3 | |
4 This program is provided purely for convenience, since most users will | |
5 use Emacs in windowing (GUI) mode, and will not want to have an extra | |
6 console window lying around. */ | |
7 | |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
8 /* |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
9 You may want to define this if you want to be able to install updated |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
10 emacs binaries even when other users are using the current version. |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
11 The problem with some file servers (notably Novell) is that an open |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
12 file cannot be overwritten, deleted, or even renamed. So if someone |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
13 is running emacs.exe already, you cannot install a newer version. |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
14 By defining CHOOSE_NEWEST_EXE, you can name your new emacs.exe |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
15 something else which matches "emacs*.exe", and runemacs will |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
16 automatically select the newest emacs executeable in the bin directory. |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
17 (So you'll probably be able to delete the old version some hours/days |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
18 later). |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
19 */ |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
20 |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
21 /* #define CHOOSE_NEWEST_EXE */ |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
22 |
15139 | 23 #define WIN32 |
24 | |
25 #include <windows.h> | |
26 #include <string.h> | |
27 #include <malloc.h> | |
28 | |
29 int WINAPI | |
30 WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) | |
31 { | |
32 STARTUPINFO start; | |
33 SECURITY_ATTRIBUTES sec_attrs; | |
34 SECURITY_DESCRIPTOR sec_desc; | |
35 PROCESS_INFORMATION child; | |
36 int wait_for_child = FALSE; | |
19720
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
37 DWORD priority_class = NORMAL_PRIORITY_CLASS; |
15139 | 38 DWORD ret_code = 0; |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
39 char *new_cmdline; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
40 char *p; |
15139 | 41 char modname[MAX_PATH]; |
42 | |
43 if (!GetModuleFileName (NULL, modname, MAX_PATH)) | |
44 goto error; | |
45 if ((p = strrchr (modname, '\\')) == NULL) | |
46 goto error; | |
47 *p = 0; | |
48 | |
49 new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 1); | |
50 strcpy (new_cmdline, modname); | |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
51 |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
52 #ifdef CHOOSE_NEWEST_EXE |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
53 { |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
54 /* Silly hack to allow new versions to be installed on |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
55 server even when current version is in use. */ |
15139 | 56 |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
57 char * best_name = alloca (MAX_PATH + 1); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
58 FILETIME best_time = {0,0}; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
59 WIN32_FIND_DATA wfd; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
60 HANDLE fh; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
61 p = new_cmdline + strlen (new_cmdline); |
15848
e57e9c5f699d
(WinMain): Put a space between the binary and its args.
Richard M. Stallman <rms@gnu.org>
parents:
15320
diff
changeset
|
62 strcpy (p, "\\emacs*.exe "); |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
63 fh = FindFirstFile (new_cmdline, &wfd); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
64 if (fh == INVALID_HANDLE_VALUE) |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
65 goto error; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
66 do |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
67 { |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
68 if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
69 || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
70 && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime)) |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
71 { |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
72 best_time = wfd.ftLastWriteTime; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
73 strcpy (best_name, wfd.cFileName); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
74 } |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
75 } |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
76 while (FindNextFile (fh, &wfd)); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
77 FindClose (fh); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
78 *p++ = '\\'; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
79 strcpy (p, best_name); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
80 strcat (p, " "); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
81 } |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
82 #else |
15848
e57e9c5f699d
(WinMain): Put a space between the binary and its args.
Richard M. Stallman <rms@gnu.org>
parents:
15320
diff
changeset
|
83 strcat (new_cmdline, "\\emacs.exe "); |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
84 #endif |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
85 |
19720
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
86 /* Append original arguments if any; first look for arguments we |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
87 recognise (-wait, -high, and -low), and apply them ourselves. */ |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
88 while (cmdline[0] == '-' || cmdline[0] == '/') |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
89 { |
19720
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
90 if (strncmp (cmdline+1, "wait", 4) == 0) |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
91 { |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
92 wait_for_child = TRUE; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
93 cmdline += 5; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
94 } |
19720
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
95 else if (strncmp (cmdline+1, "high", 4) == 0) |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
96 { |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
97 priority_class = HIGH_PRIORITY_CLASS; |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
98 cmdline += 5; |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
99 } |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
100 else if (strncmp (cmdline+1, "low", 3) == 0) |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
101 { |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
102 priority_class = IDLE_PRIORITY_CLASS; |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
103 cmdline += 4; |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
104 } |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
105 else |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
106 break; |
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
107 } |
15139 | 108 strcat (new_cmdline, cmdline); |
109 | |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
110 /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */ |
15139 | 111 if ((p = strrchr (modname, '\\')) && stricmp (p, "\\bin") == 0) |
15320
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
112 { |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
113 *p = 0; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
114 for (p = modname; *p; p++) |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
115 if (*p == '\\') *p = '/'; |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
116 SetEnvironmentVariable ("emacs_dir", modname); |
b76f57d4320b
(CHOOSE_NEWEST_EXE): New parameter macro.
Richard M. Stallman <rms@gnu.org>
parents:
15139
diff
changeset
|
117 } |
15139 | 118 |
119 memset (&start, 0, sizeof (start)); | |
120 start.cb = sizeof (start); | |
121 start.dwFlags = STARTF_USESHOWWINDOW; | |
122 start.wShowWindow = SW_HIDE; | |
123 | |
124 sec_attrs.nLength = sizeof (sec_attrs); | |
125 sec_attrs.lpSecurityDescriptor = NULL; | |
126 sec_attrs.bInheritHandle = FALSE; | |
127 | |
19720
8d429173786f
(WinMain): Allow Emacs process to be started with
Geoff Voelker <voelker@cs.washington.edu>
parents:
15848
diff
changeset
|
128 if (CreateProcess (NULL, new_cmdline, &sec_attrs, NULL, TRUE, priority_class, |
24193
2cc3642eb734
(WinMain): Pass explicit environment block to
Andrew Innes <andrewi@gnu.org>
parents:
19720
diff
changeset
|
129 GetEnvironmentStrings (), NULL, &start, &child)) |
15139 | 130 { |
131 if (wait_for_child) | |
132 { | |
133 WaitForSingleObject (child.hProcess, INFINITE); | |
134 GetExitCodeProcess (child.hProcess, &ret_code); | |
135 } | |
136 CloseHandle (child.hThread); | |
137 CloseHandle (child.hProcess); | |
138 } | |
139 else | |
140 goto error; | |
141 return (int) ret_code; | |
142 | |
143 error: | |
144 MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP); | |
145 return 1; | |
146 } |