Mercurial > hg > xemacs-beta
view nt/minitar.c @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Mar 2010 05:07:47 -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; }