Mercurial > hg > xemacs-beta
view nt/minitar.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
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; }