view nt/minitar.c @ 4697:0d6d0edf1253

lisp beginning-end-of-defun-function Changelog entry hg diff diff -r ecc468b62551 lisp/ChangeLog --- a/lisp/ChangeLog Mon Sep 21 21:40:35 2009 +0200 +++ b/lisp/ChangeLog Tue Sep 22 21:11:51 2009 +0200 @@ -1,3 +1,12 @@ 2009-09-20 Aidan Kehoe <kehoea@parhasa +2009-09-22 Andreas Roehler <andreas.roehler@online.de> + + * lisp.el (beginning-of-defun-raw): + new variable: beginning-of-defun-function, + beginning-of-defun may call FUNCTION determining start position + * lisp.el (end-of-defun): + new variable: end-of-defun-function, + end-of-defun may call FUNCTION determining the end position + ;;;;;;;;;;;;;;;;;;;;;;;; hg diff -p -r 4695 -r 4696 diff -r fee33ab25966 -r ecc468b62551 lisp/lisp.el --- a/lisp/lisp.el Sun Sep 20 23:50:05 2009 +0100 +++ b/lisp/lisp.el Mon Sep 21 21:40:35 2009 +0200 @@ -155,6 +155,21 @@ Negative arg -N means kill N sexps after (interactive "p") (kill-sexp (- (or arg 1)))) + +;; derived stuff from GNU Emacs +(defvar beginning-of-defun-function nil + "If non-nil, function for `beginning-of-defun-raw' to call. +This is used to find the beginning of the defun instead of using the +normal recipe (see `beginning-of-defun'). Modes can define this +if defining `defun-prompt-regexp' is not sufficient to handle the mode's +needs.") + +(defvar end-of-defun-function nil + "If non-nil, function for `end-of-defun' to call. +This is used to find the end of the defun instead of using the normal +recipe (see `end-of-defun'). Modes can define this if the +normal method is not appropriate.") + (defun beginning-of-defun (&optional arg) "Move backward to the beginning of a defun. With argument, do it that many times. Negative arg -N @@ -175,13 +190,17 @@ This is identical to beginning-of-defun, This is identical to beginning-of-defun, except that point does not move to the beginning of the line when `defun-prompt-regexp' is non-nil." (interactive "p") - (and arg (< arg 0) (not (eobp)) (forward-char 1)) - (and (re-search-backward (if defun-prompt-regexp - (concat "^\\s(\\|" - "\\(" defun-prompt-regexp "\\)\\s(") - "^\\s(") - nil 'move (or arg 1)) - (progn (goto-char (1- (match-end 0)))) t)) + ;; (and arg (< arg 0) (not (eobp)) (forward-char 1)) + (unless arg (setq arg 1)) + (cond + (beginning-of-defun-function + (funcall beginning-of-defun-function arg)) + (t (re-search-backward (if defun-prompt-regexp + (concat "^\\s(\\|" + "\\(" defun-prompt-regexp "\\)\\s(") + "^\\s(") + nil 'move (or arg 1)) + (progn (goto-char (1- (match-end 0)))) t))) ;; XEmacs change (optional buffer parameter) (defun buffer-end (arg &optional buffer) @@ -198,6 +217,10 @@ the open-parenthesis that starts a defun ;; XEmacs change (for zmacs regions) (interactive "_p") (if (or (null arg) (= arg 0)) (setq arg 1)) + (if end-of-defun-function + (if (> arg 0) + (dotimes (i arg) + (funcall end-of-defun-function))) (let ((first t)) (while (and (> arg 0) (< (point) (point-max))) (let ((pos (point))) ; XEmacs -- remove unused npos. @@ -229,7 +252,7 @@ the open-parenthesis that starts a defun (if (looking-at "\\s<\\|\n") (forward-line 1))) (goto-char (point-min))))) - (setq arg (1+ arg))))) + (setq arg (1+ arg)))))) (defun mark-defun () "Put mark at end of this defun, point at beginning.
author Andreas Roehler <andreas.roehler@online.de>
date Tue, 22 Sep 2009 21:14:03 +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;
}