Mercurial > hg > xemacs-beta
view netinstall/tar.cc @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 27 Jan 2010 00:35:36 -0600 |
parents | 3d3049ae1304 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* Built-in tar functionality. See tar.h for usage. */ #include <stdio.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include "win32.h" #include <zlib.h> #include "tar.h" #include "mkdir.h" #include "log.h" #include "port.h" #if defined(CYGWIN) || defined(MINGW) #define FACTOR (0x19db1ded53ea710LL) #define NSPERSEC 10000000LL #else __int64 FACTOR=0x19db1ded53ea710L; __int64 NSPERSEC=10000000L; #endif #define SYMLINK_COOKIE "!<symlink>" typedef struct { char name[100]; /* 0 */ char mode[8]; /* 100 */ char uid[8]; /* 108 */ char gid[8]; /* 116 */ char size[12]; /* 124 */ char mtime[12]; /* 136 */ char chksum[8]; /* 148 */ char typeflag; /* 156 */ char linkname[100]; /* 157 */ char magic[6]; /* 257 */ char version[2]; /* 263 */ char uname[32]; /* 265 */ char gname[32]; /* 297 */ char devmajor[8]; /* 329 */ char devminor[8]; /* 337 */ char prefix[155]; /* 345 */ char junk[12]; /* 500 */ } tar_header_type; typedef struct tar_map_result_type_s { struct tar_map_result_type_s *next; char *stored_name; char *mapped_name; } tar_map_result_type; static tar_map_result_type *tar_map_result = 0; static int err; static char file_name[_MAX_PATH+512]; static char have_longname = 0; static int file_length; static tar_header_type tar_header; static char buf[512]; static int _tar_file_size = 0; int _tar_verbose = 0; FILE * _tar_vfile = 0; #define vp if (_tar_verbose) fprintf #define vp2 if (_tar_verbose>1) fprintf static gzFile g = 0; static char * xstrdup (char *c) { char *r = (char *) malloc (strlen (c) + 1); if (!r) exit_setup (1); strcpy (r, c); return r; } int tar_open (char *pathname) { struct stat s; if (_tar_vfile == 0) _tar_vfile = stderr; vp2 (_tar_vfile, "tar: open `%s'\n", pathname); if (stat (pathname, &s) < 0) return 1; _tar_file_size = s.st_size; g = gzopen (pathname, "rb"); if (sizeof (tar_header) != 512) { /* drastic, but important */ fprintf (stderr, "compilation error: tar header struct not 512" " bytes (it's %d)\n", sizeof (tar_header)); exit_setup (1); } err = 0; return g ? 0 : 1; } /* For some reason the cygwin version uses a function that is not in the original source. We duplicate it here - although this does mean revealing some internals. */ extern "C" { z_off_t ZEXPORT tar_gzctell (gzFile file); typedef struct gz_stream { z_stream stream; int z_err; /* error code for last stream operation */ int z_eof; /* set if end of input file */ FILE *file; /* .gz file */ Byte *inbuf; /* input buffer */ Byte *outbuf; /* output buffer */ uLong crc; /* crc32 of uncompressed data */ char *msg; /* error message */ char *path; /* path name for debugging only */ int transparent; /* 1 if input file is not a .gz file */ char mode; /* 'w' or 'r' */ long startpos; /* start of compressed data in file (header skipped) */ } gz_stream; }; z_off_t ZEXPORT tar_gzctell (gzFile file) { gz_stream *s = (gz_stream *)file; return ftell(s->file); } int tar_ftell () { return tar_gzctell (g); } static void skip_file () { while (file_length > 0) { gzread (g, buf, 512); file_length -= 512; } } char * tar_next_file () { int r, n; char *c; r = gzread (g, &tar_header, 512); /* See if we're at end of file */ if (r != 512) return 0; /* See if the header is all zeros (i.e. last block) */ n = 0; for (r = 512/sizeof (int); r; r--) n |= ((int *)&tar_header)[r-1]; if (n == 0) return 0; if (!have_longname && tar_header.typeflag != 'L') { memcpy (file_name, tar_header.name, 100); file_name[100] = 0; } sscanf (tar_header.size, "%o", &file_length); vp2 (_tar_vfile, "%c %9d %s\n", tar_header.typeflag, file_length, file_name); switch (tar_header.typeflag) { case 'L': /* GNU tar long name extension */ if (file_length > _MAX_PATH) { skip_file (); fprintf (stderr, "error: long file name exceeds %d characters\n", _MAX_PATH); err ++; gzread (g, &tar_header, 512); sscanf (tar_header.size, "%o", &file_length); skip_file (); return tar_next_file (); } c = file_name; while (file_length > 0) { int need = file_length > 512 ? 512 : file_length; if (gzread (g, buf, 512) < 512) return 0; memcpy (c, buf, need); c += need; file_length -= need; } *c = 0; have_longname = 1; return tar_next_file (); case '3': /* char */ case '4': /* block */ case '6': /* fifo */ fprintf (stderr, "warning: not extracting special file %s\n", file_name); err ++; return tar_next_file (); case '0': /* regular file */ case 0: /* regular file also */ case '2': /* symbolic link */ case '5': /* directory */ case '7': /* contiguous file */ return file_name; case '1': /* hard link, we just copy */ return file_name; default: fprintf (stderr, "error: unknown (or unsupported) file type `%c'\n", tar_header.typeflag); err ++; skip_file (); return tar_next_file (); } } static void fix_time_stamp (char *path) { int mtime; #if defined(CYGWIN) || defined(MINGW) long long ftimev; #else __int64 ftimev; #endif FILETIME ftime; HANDLE h; sscanf (tar_header.mtime, "%o", &mtime); ftimev = mtime * NSPERSEC + FACTOR; ftime.dwHighDateTime = ftimev >> 32; ftime.dwLowDateTime = ftimev; h = CreateFileA (path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, 0); if (h) { SetFileTime (h, 0, 0, &ftime); CloseHandle (h); } } static FILE * common_fopen (char *path) { FILE *out; out = fopen (path, "wb"); if (!out) { /* maybe we need to create a directory */ if (mkdir_p (0, path)) { skip_file (); return 0; } out = fopen (path, "wb"); } if (!out) { fprintf (stderr, "unable to write to file %s\n", path); perror ("The error was"); skip_file (); return 0; } return out; } static void prepare_for_file (char *path) { DWORD w; mkdir_p (0, path); w = GetFileAttributes (path); if (w != 0xffffffff && w & FILE_ATTRIBUTE_DIRECTORY) { char *tmp = (char *) malloc (strlen (path) + 10); int i = 0; do { i++; sprintf (tmp, "%s.old-%d", path, i); } while (GetFileAttributes (tmp) != 0xffffffff); fprintf (stderr, "warning: moving directory \"%s\" out of the way.\n", path); MoveFile (path, tmp); free (tmp); } DeleteFileA (path); } int tar_read_file (char *path) { FILE *out, *copy; HANDLE h; DWORD w; int got; tar_map_result_type *tmr; switch (tar_header.typeflag) { case '0': /* regular files */ case 0: case '7': vp (_tar_vfile, "F %s\n", path); prepare_for_file (path); out = common_fopen (path); if (!out) return 1; while (file_length > 0) { int put; int want = file_length > 512 ? 512 : file_length; got = gzread (g, buf, 512); if (got < 512) { fprintf (stderr, "tar: unexpected end of file reading %s\n", path); fclose (out); remove (path); return 1; } put = fwrite (buf, 1, want, out); if (put < want) { fprintf (stderr, "tar: out of disk space writing %s\n", path); fclose (out); remove (path); skip_file (); return 1; } file_length -= want; } fclose (out); fix_time_stamp (path); /* we need this to do hard links below */ tmr = (tar_map_result_type *) malloc (sizeof (tar_map_result_type)); tmr->next = tar_map_result; tmr->stored_name = xstrdup (file_name); tmr->mapped_name = xstrdup (path); tar_map_result = tmr; return 0; case '1': /* hard links; we just copy */ for (tmr = tar_map_result; tmr; tmr=tmr->next) if (strcmp (tmr->stored_name, tar_header.linkname) == 0) break; if (!tmr) { fprintf (stderr, "tar: can't find %s to link %s to\n", tar_header.linkname, path); return 1; } vp (_tar_vfile, "H %s <- %s\n", path, tmr->mapped_name); prepare_for_file (path); copy = fopen (tmr->mapped_name, "rb"); if (!copy) { fprintf (stderr, "tar: unable to read %s\n", tmr->mapped_name); return 1; } out = common_fopen (path); if (!out) return 1; while ((got = fread (buf, 1, 512, copy)) > 0) { int put = fwrite (buf, 1, got, out); if (put < got) { fprintf (stderr, "tar: out of disk space writing %s\n", path); fclose (out); fclose (copy); remove (path); return 1; } } fclose (out); fclose (copy); fix_time_stamp (path); return 0; case '5': /* directories */ vp (_tar_vfile, "D %s\n", path); while (path[0] && path[strlen (path)-1] == '/') path[strlen (path) - 1] = 0; return mkdir_p (1, path); case '2': /* symbolic links */ vp (_tar_vfile, "L %s -> %s\n", path, tar_header.linkname); prepare_for_file (path); h = CreateFileA (path, GENERIC_WRITE, 0, 0, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0); if (h == INVALID_HANDLE_VALUE) { fprintf (stderr, "error: unable to create symlink \"%s\" -> \"%s\"\n", path, tar_header.linkname); return 1; } strcpy (buf, SYMLINK_COOKIE); strcat (buf, tar_header.linkname); if (WriteFile (h, buf, strlen (buf) + 1, &w, NULL)) { CloseHandle (h); SetFileAttributesA (path, FILE_ATTRIBUTE_SYSTEM); return 0; } CloseHandle (h); fprintf (stderr, "error: unable to write symlink \"%s\"\n", path); DeleteFileA (path); return 1; } return 0; } int tar_close () { #if 0 while (tar_map_result) { tar_map_result_type *t = tar_map_result->next; free (tar_map_result->stored_name); free (tar_map_result->mapped_name); free (tar_map_result); tar_map_result = t; } #endif tar_map_result = 0; if (gzclose (g)) err ++; return err; /* includes errors for skipped files, etc */ } typedef struct { char *from; int from_len; char *to; int to_len; } map_type; static map_type *map; static int nmaps; int tar_auto (char *pathname, char **maplist) { char *c; int errcount = 0; int i, j; map_type mtemp; char newname[_MAX_PATH+512]; static char twiddles[] = "|\b/\b-\b\\\b"; int t = 0; for (nmaps=0; maplist[nmaps*2]; nmaps++) ; map = (map_type *) malloc ((nmaps+1) * sizeof (map_type)); for (nmaps=0; maplist[nmaps*2]; nmaps++) { map[nmaps].from = maplist[nmaps*2]; map[nmaps].from_len = strlen (maplist[nmaps*2]); map[nmaps].to = maplist[nmaps*2+1]; map[nmaps].to_len = strlen (maplist[nmaps*2+1]); } /* bubble sort - expect the maps to be short */ for (i=0; i<nmaps-1; i++) for (j=i+1; j<nmaps; j++) if (map[i].from_len < map[j].from_len) { mtemp = map[i]; map[i] = map[j]; map[j] = mtemp; } if ((tar_open (pathname))) return 1; while ((c = tar_next_file ())) { int l = strlen (c); for (i=0; i<nmaps; i++) if (l >= map[i].from_len && strncmp (c, map[i].from, map[i].from_len) == 0) { strcpy (newname, map[i].to); strcpy (newname+map[i].to_len, c + map[i].from_len); c = newname; break; } t = (t+2) % 8; fwrite (twiddles+t, 1, 2, stderr); if (tar_read_file (c)) errcount ++; } if (tar_close ()) errcount ++; fwrite (" \b", 1, 2, stderr); vp2 (_tar_vfile, "tar_auto returns %d\n", errcount); return errcount; }