Mercurial > hg > xemacs-beta
view netinstall/tar.cc @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:02:24 -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; }