Mercurial > hg > xemacs-beta
annotate netinstall/postinstall.cc @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Feb 2010 20:51:18 -0600 |
| parents | 3d3049ae1304 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* The purpose of this file is to run all the post-install scripts | |
| 17 in their various forms. */ | |
| 18 | |
| 19 #include "win32.h" | |
| 20 | |
| 21 #include <io.h> | |
| 22 #include <stdio.h> | |
| 23 #include <stdlib.h> | |
| 24 #ifndef WIN32_NATIVE | |
| 25 #include <unistd.h> | |
| 26 #endif | |
| 27 | |
| 28 #include "state.h" | |
| 29 #include "dialog.h" | |
| 30 #include "find.h" | |
| 31 #include "concat.h" | |
| 32 #include "regedit.h" | |
| 33 #include "reginfo.h" | |
| 34 #include "resource.h" | |
| 35 #include "port.h" | |
| 36 | |
| 37 static char *sh = 0; | |
| 38 static char *cmd = 0; | |
| 39 static OSVERSIONINFO verinfo; | |
| 40 | |
| 41 static void | |
| 42 run (char *shscript, char *args, char *file) | |
| 43 { | |
| 44 BOOL b; | |
| 45 char cmdline [_MAX_PATH]; | |
| 46 STARTUPINFO si; | |
| 47 PROCESS_INFORMATION pi; | |
| 48 | |
| 49 sprintf (cmdline, "%s %s %s", shscript, args, file); | |
| 50 memset (&pi, 0, sizeof (pi)); | |
| 51 memset (&si, 0, sizeof (si)); | |
| 52 si.cb = sizeof (si); | |
| 53 si.lpTitle = "XEmacs Setup Post-Install Script"; | |
| 54 si.dwFlags = STARTF_USEPOSITION; | |
| 55 | |
| 56 b = CreateProcess (0, cmdline, 0, 0, 0, | |
| 57 CREATE_NEW_CONSOLE, 0, root_dir, &si, &pi); | |
| 58 | |
| 59 if (b) | |
| 60 WaitForSingleObject (pi.hProcess, INFINITE); | |
| 61 } | |
| 62 | |
| 63 static void | |
| 64 each (char *fname, unsigned int size) | |
| 65 { | |
| 66 char *ext = strrchr (fname, '.'); | |
| 67 if (!ext) | |
| 68 return; | |
| 69 | |
| 70 if (sh && strcmp (ext, ".sh") == 0) | |
| 71 { | |
| 72 char *f2 = concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, 0); | |
| 73 run (sh, "-c", f2); | |
| 74 free (f2); | |
| 75 } | |
| 76 else if (cmd && strcmp (ext, ".bat") == 0) | |
| 77 { | |
| 78 char *f2 = backslash (concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", | |
| 79 fname, 0)); | |
| 80 run (cmd, "/c", f2); | |
| 81 free (f2); | |
| 82 } | |
| 83 else | |
| 84 return; | |
| 85 | |
| 86 rename (concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, 0), | |
| 87 concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, ".done", 0)); | |
| 88 } | |
| 89 | |
| 90 static char *shells [] = { | |
| 91 "/bin/sh.exe", | |
| 92 "/usr/bin/sh.exe", | |
| 93 "/bin/bash.exe", | |
| 94 "/usr/bin/bash.exe", | |
| 95 0 | |
| 96 }; | |
| 97 | |
| 98 void | |
| 99 do_postinstall (HINSTANCE h) | |
| 100 { | |
| 101 int issystem; | |
| 102 next_dialog = 0; | |
| 103 char* cygroot = find_cygwin_root (&issystem); | |
| 104 int i; | |
| 452 | 105 |
| 106 sh = 0; | |
| 107 | |
| 108 if (cygroot) | |
| 448 | 109 { |
| 452 | 110 for (i=0; shells[i]; i++) |
| 111 { | |
| 112 sh = backslash (concat (cygroot, shells[i], 0)); | |
| 113 if (_access (sh, 0) == 0) | |
| 114 break; | |
| 115 free (sh); | |
| 116 sh = 0; | |
| 117 } | |
| 448 | 118 } |
| 119 | |
| 120 char old_path[_MAX_PATH]; | |
| 121 GetEnvironmentVariable ("PATH", old_path, sizeof (old_path)); | |
| 122 #if 0 | |
| 123 SetEnvironmentVariable ("PATH", | |
| 124 backslash (concat (root_dir, "/bin;", | |
| 125 root_dir, "/usr/bin;", | |
| 126 old_path, 0))); | |
| 127 | |
| 128 SetEnvironmentVariable ("CYGWINROOT", root_dir); | |
| 129 #endif | |
| 130 SetCurrentDirectory (root_dir); | |
| 131 | |
| 132 verinfo.dwOSVersionInfoSize = sizeof (verinfo); | |
| 133 GetVersionEx (&verinfo); | |
| 134 | |
| 135 switch (verinfo.dwPlatformId) | |
| 136 { | |
| 137 case VER_PLATFORM_WIN32_NT: | |
| 138 cmd = "cmd.exe"; | |
| 139 break; | |
| 140 case VER_PLATFORM_WIN32_WINDOWS: | |
| 141 cmd = "command.com"; | |
| 142 break; | |
| 143 default: | |
| 144 cmd = "command.com"; | |
| 145 break; | |
| 146 } | |
| 147 | |
| 148 find (concat (root_dir, XEMACS_SETUP_DIR, "postinstall", 0), each); | |
| 149 } |