Mercurial > hg > xemacs-beta
view nt/minitar.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 | b694dfd2f40e |
children |
line wrap: on
line source
/* Minitar: extract .tar.gz files on Win32 platforms. Uses zlib for decompression. This is very simple-minded, it ignores checksums, and any type of file that is not a plain file or a directory. Nonetheless it is useful. Author: Charles G. Waldman (cgw@pgt.com), Aug 4 1998 This file is placed in the public domain; you can do whatever you like with it. There is NO WARRANTY. If it breaks, you get to keep both pieces */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <stdio.h> #include <stdlib.h> #include <errno.h> #include <string.h> #include <io.h> #ifdef WIN32_NATIVE # include <direct.h> /* For mkdir */ #endif #include <zlib.h> static void Usage (char *name) { fprintf (stderr, "Usage: %s file.tar.gz [base-dir]\n", name); fprintf (stderr, "\tExtracts the contents compressed tar file to base-dir\n"); exit (-1); } #define BLOCKSIZE 512 #define MAXNAMELEN 1024 static int octal (char *str) { int ret = -1; sscanf (str, "%o", &ret); return ret; } /* this is like mkdir -p, except if there is no trailing slash, the final component is assumed to be a file, rather than a path component, so it is not created as a directory */ static int makepath (char *path) { char tmp[MAXNAMELEN]; char *cp; for (cp=path; cp; cp = (char*)strchr (cp+1, '/')) { if (!*cp) break; if (*cp != '/') continue; strncpy (tmp, path, cp-path); tmp[cp-path] = '\0'; if (strlen (tmp) == 0) continue; #ifdef WIN32_NATIVE if (mkdir (tmp)) #else if (mkdir (tmp, 0777)) #endif { if (errno == EEXIST) continue; else return -1; } } return 0; } int main (int argc, char **argv) { char fullname[MAXNAMELEN]; char *basedir = "."; char *tarfile; int size; char osize[13]; char name[101]; char magic[7]; char type; gzFile *infile = (gzFile*)0; FILE *outfile = (FILE*)0; char block[BLOCKSIZE]; int nbytes, nread, nwritten; int in_block = 0; int directory = 0; if (argc < 2 || argc > 3) Usage (argv[0]); tarfile = argv[1]; if (argc==3) basedir = argv[2]; if (! (infile = gzopen (tarfile, "rb"))) { fprintf (stderr, "Cannot open %s\n", tarfile); exit (-2); } while (1) { nread = gzread (infile, block, 512); if (!in_block && nread == 0) break; if (nread != BLOCKSIZE) { fprintf (stderr, "Error: incomplete block read. Exiting.\n"); exit (-2); } if (!in_block) { if (block[0]=='\0') /* We're done */ break; strncpy (magic, block+257, 6); magic[6] = '\0'; if (strcmp (magic, "ustar ")) { fprintf (stderr, "Error: incorrect magic number in tar header. Exiting\n"); exit (-2); } strncpy (name, block, 100); name[100] = '\0'; sprintf (fullname, "%s/%s", basedir, name); printf ("%s\n", fullname); type = block[156]; switch (type) { case '0': case '\0': directory = 0; break; case '5': directory = 1; break; default: fprintf (stderr, "Error: unknown type flag %c. Exiting.\n", type); exit (-2); break; } if (directory) { in_block = 0; /* makepath will ignore the final path component, so make sure dirnames have a trailing slash */ if (fullname[strlen (fullname)-1] != '/') strcat (fullname, "/"); if (makepath (fullname)) { fprintf (stderr, "Error: cannot create directory %s. Exiting.\n", fullname); exit (-2); } continue; } else { /*file */ in_block = 1; if (outfile) { if (fclose (outfile)) { fprintf (stderr, "Error: cannot close file %s. Exiting.\n", fullname); exit (-2); } outfile = (FILE*)0; } if (!(outfile = fopen (fullname, "wb"))) { /*try creating the directory, maybe it's not there */ if (makepath (fullname)) { fprintf (stderr, "Error: cannot create file %s. Exiting.\n", fullname); exit (-2); } /* now try again to open the file */ if (!(outfile = fopen (fullname, "wb"))) { fprintf (stderr, "Error: cannot create file %s. Exiting.\n", fullname); exit (-2); } } strncpy (osize, block+124, 12); osize[12] = '\0'; size = octal (osize); if (size<0) { fprintf (stderr, "Error: invalid size in tar header. Exiting.\n"); exit (-2); } if (size==0) /* file of size 0 is done */ in_block = 0; } } else { /* write or continue writing file contents */ nbytes = size>512? 512:size; nwritten = fwrite (block, 1, nbytes, outfile); if (nwritten != nbytes) { fprintf (stderr, "Error: only wrote %d bytes to file %s. Exiting.\n", nwritten, fullname); exit (-2); } size -= nbytes; if (size==0) in_block = 0; } } return 0; }