Mercurial > hg > xemacs-beta
annotate lib-src/cvtmail.c @ 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 | 023b83f4e54b |
| children | cd167465bf69 061f4f90f874 |
| rev | line source |
|---|---|
| 428 | 1 /* Copyright (C) 1985, 1993, 1994 Free Software Foundation |
| 613 | 2 This file is part of XEmacs. |
| 428 | 3 |
| 613 | 4 XEmacs is free software; you can redistribute it and/or modify |
| 428 | 5 it under the terms of the GNU General Public License as published by |
| 6 the Free Software Foundation; either version 2, or (at your option) | |
| 7 any later version. | |
| 8 | |
| 613 | 9 XEmacs is distributed in the hope that it will be useful, |
| 428 | 10 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 12 GNU General Public License for more details. | |
| 13 | |
| 14 You should have received a copy of the GNU General Public License | |
| 613 | 15 along with XEmacs; see the file COPYING. If not, write to |
| 428 | 16 the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 17 Boston, MA 02111-1307, USA. */ | |
| 18 | |
| 19 /* Synched up with: FSF 19.28. */ | |
| 20 | |
| 21 /* cvtmail: | |
| 22 * Program to convert oldstyle goslings emacs mail directories into | |
| 23 * gnu-rmail format. Program expects a directory called Messages to | |
| 24 * exist in your home directory, containing individual mail messages in | |
| 25 * separate files in the standard gosling emacs mail reader format. | |
| 26 * | |
| 442 | 27 * Program takes one argument: an output file. This file will contain |
| 428 | 28 * all the messages in Messages directory, in berkeley mail format. |
| 29 * If no output file is mentioned, messages are put in ~/OMAIL. | |
| 30 * | |
| 31 * In order to get rmail to read the messages, the resulting file must | |
| 32 * be mv'ed to ~/mbox, and then have rmail invoked on them. | |
| 442 | 33 * |
| 428 | 34 * Author: Larry Kolodney, 1985 |
| 35 */ | |
| 36 | |
| 37 | |
| 438 | 38 #include <config.h> |
| 428 | 39 |
| 40 #include <stdio.h> | |
| 41 #include <string.h> | |
| 438 | 42 #include <stdlib.h> |
| 428 | 43 |
| 440 | 44 static void *xmalloc (size_t); |
| 45 static void *xrealloc (void *, size_t); | |
| 428 | 46 static void skip_to_lf (FILE *stream); |
| 442 | 47 static void fatal (const char *s1, const char *s2); |
| 48 static void error (const char *s1, const char *s2); | |
| 428 | 49 |
| 50 int | |
| 51 main (int argc, char *argv[]) | |
| 52 { | |
| 53 char *hd; | |
| 54 char *md; | |
| 55 char *mdd; | |
| 56 char *mfile; | |
| 57 char *cf; | |
| 58 int cflen; | |
| 59 FILE *mddf; | |
| 60 FILE *mfilef; | |
| 61 FILE *cff; | |
| 62 char pre[10]; | |
| 63 char name[14]; | |
| 64 int c; | |
| 65 | |
| 438 | 66 hd = getenv ("HOME"); |
| 428 | 67 |
| 68 md = (char *) xmalloc (strlen (hd) + 10); | |
| 69 strcpy (md, hd); | |
| 70 strcat (md, "/Messages"); | |
| 71 | |
| 72 mdd = (char *) xmalloc (strlen (md) + 11); | |
| 73 strcpy (mdd, md); | |
| 74 strcat (mdd, "/Directory"); | |
| 75 | |
| 76 cflen = 100; | |
| 77 cf = (char *) xmalloc (cflen); | |
| 78 | |
| 79 mddf = fopen (mdd, "r"); | |
| 80 if (argc > 1) | |
| 81 mfilef = fopen (argv[1], "w"); | |
| 82 else | |
| 83 { | |
| 84 mfile = (char *) xmalloc (strlen (hd) + 7); | |
| 85 strcpy (mfile, hd); | |
| 86 strcat (mfile, "/OMAIL"); | |
| 87 mfilef = fopen (mfile, "w"); | |
| 88 } | |
| 89 skip_to_lf (mddf); | |
| 90 while (fscanf (mddf, "%4c%14[0123456789]", pre, name) != EOF) | |
| 91 { | |
| 92 int comp_len = strlen (md) + strlen (name) + 2; | |
| 93 if (cflen < comp_len) | |
| 94 { | |
| 95 cflen = strlen (md) + strlen (name) + 2; | |
| 96 cf = (char *) xrealloc (cf, cflen); | |
| 97 } | |
| 98 strcpy (cf, md); | |
| 99 strcat (cf,"/"); | |
| 100 strcat (cf, name); | |
| 101 cff = fopen (cf, "r"); | |
| 102 while ((c = getc(cff)) != EOF) | |
| 103 putc (c, mfilef); | |
| 104 putc ('\n', mfilef); | |
| 105 skip_to_lf (mddf); | |
| 106 fclose (cff); | |
| 107 } | |
| 108 fclose (mddf); | |
| 442 | 109 fclose (mfilef); |
| 428 | 110 return 0; |
| 111 } | |
| 112 | |
| 113 static void | |
| 440 | 114 skip_to_lf (FILE *stream) |
| 428 | 115 { |
| 116 register int c; | |
| 117 while ((c = getc(stream)) != '\n') | |
| 118 ; | |
| 119 } | |
| 120 | |
| 121 static void * | |
| 440 | 122 xmalloc (size_t size) |
| 428 | 123 { |
| 440 | 124 void *result = malloc (size); |
| 428 | 125 if (!result) |
| 126 fatal ("virtual memory exhausted", 0); | |
| 127 return result; | |
| 128 } | |
| 129 | |
| 130 static void * | |
| 440 | 131 xrealloc (void *ptr, size_t size) |
| 428 | 132 { |
| 440 | 133 void *result = realloc (ptr, size); |
| 428 | 134 if (!result) |
| 135 fatal ("virtual memory exhausted", 0); | |
| 136 return result; | |
| 137 } | |
| 138 | |
| 139 /* Print error message and exit. */ | |
| 140 | |
| 141 static void | |
| 442 | 142 fatal (const char *s1, const char *s2) |
| 428 | 143 { |
| 144 error (s1, s2); | |
| 145 exit (1); | |
| 146 } | |
| 147 | |
| 148 static void | |
| 442 | 149 error (const char *s1, const char *s2) |
| 428 | 150 { |
| 151 fprintf (stderr, "cvtmail: "); | |
| 152 fprintf (stderr, s1, s2); | |
| 153 fprintf (stderr, "\n"); | |
| 154 } |