comparison src/search.c @ 2439:b6c62e4abf59

Put interrupt input blocking in a separate file from xterm.h. This isn't specific to X, and it allows us to avoid #including xterm.h in files that don't really have anything to do with X. * blockinput.h: New file. * xterm.h (BLOCK_INPUT, UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT, UNBLOCK_INPUT_RESIGNAL): These are now in blockinput.h. (x_input_blocked, x_pending_input): Deleted; there are analogs in blockinput.h called interrupt_input_blocked and interrupt_input_pending. * keyboard.c (interrupt_input_blocked, interrupt_input_pending): New variables, used by the macros in blockinput.h. * xterm.c: #include blockinput.h. (x_input_blocked, x_pending_input): Deleted. (XTread_socket): Test and set interrupt_input_blocked and interrupt_input_pending instead of the old variables. * alloc.c, xfaces.c, xfns.c, xmenu.c, xselect.c, keymap.c: #include blockinput.h. * eval.c: #include blockinput.h instead of xterm.h. * keyboard.c: #include blockinput.h. (input_poll_signal): Just test interrupt_input_blocked, instead of testing HAVE_X_WINDOWS and x_input_blocked. Block the processing of interrupt input while we're manipulating the malloc heap. * alloc.c: (xfree): New function, to make it easy to free things safely. (xmalloc, xrealloc): Block X input while doing the deed. (VALIDATE_LISP_STORAGE, gc_sweep, compact_strings): Use xfree instead of free. (uninterrupt_malloc): New function, to install input-blocking hooks into the GNU malloc routines. * emacs.c [not SYSTEM_MALLOC] (main): Call uninterrupt_malloc on startup. * alloc.c: (make_interval, make_float, Fcons, Fmake_vector, Fmake_symbol, Fmake_marker, make_uninit_string, Fgarbage_collect): Use xmalloc instead of malloc; don't bother to check if out of memory here. (Fgarbage_collect): Call xrealloc instead of realloc. * buffer.c: Use xmalloc and xfree instead of malloc and free; don't bother to check if out of memory here. (Fget_buffer_create): Put BLOCK_INPUT/UNBLOCK_INPUT pair around calls to ralloc routines. * insdel.c: Same. * lisp.h (xfree): New extern declaration. * xfaces.c (xfree): Don't #define this to be free; use the definition in alloc.c. * dispnew.c, doc.c, doprnt.c, fileio.c, lread.c, term.c, xfns.c, xmenu.c, xterm.c: Use xfree instead of free. * hftctl.c: Use xfree and xmalloc instead of free and malloc. * keymap.c (current_minor_maps): BLOCK_INPUT while calling realloc and malloc. * search.c: Since the regexp routines can malloc, BLOCK_INPUT while runing them. #include blockinput.h. * sysdep.c: #include blockinput.h. Call xfree and xmalloc instead of free and malloc. BLOCK_INPUT around routines which we know will call malloc. ymakefile (keyboard.o, keymap.o, search.o, sysdep.o, xfaces.o, xfns.o, xmenu.o, xterm.o, xselect.o, alloc.o, eval.o): Note that these depend on blockinput.h.

2438:b513de4de386

#include "config.h"
#include "lisp.h"
#include "syntax.h"
#include "buffer.h"
#include "commands.h"

#include <sys/types.h>
#include "regex.h"

#define max(a, b) ((a) > (b) ? (a) : (b))

      && translate == bufp->translate)
    return;

  last_regexp = Qnil;
  bufp->translate = translate;
  val = re_compile_pattern ((char *) XSTRING (pattern)->data,
			    XSTRING (pattern)->size,
			    bufp);
  if (val)
    {
      dummy = build_string (val);
      while (1)
	Fsignal (Qinvalid_regexp, Fcons (dummy, Qnil));

  last_regexp = pattern;

  /* Advise the searching functions about the space we have allocated
     for register data.  */
  if (regp)
    re_set_registers (bufp, regp, regp->num_regs, regp->start, regp->end);

  return;
}

/* Error condition used for failing searches */

    {
      s1 = ZV - BEGV;
      s2 = 0;
    }
  
  i = re_match_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
		  point - BEGV, &search_regs,
		  ZV - BEGV);
  if (i == -2)
    matcher_overflow ();

  val = (0 <= i ? Qt : Qnil);
  for (i = 0; i < search_regs.num_regs; i++)

    }

  compile_pattern (regexp, &searchbuf, &search_regs,
		   !NILP (current_buffer->case_fold_search) ? DOWNCASE_TABLE : 0);
  immediate_quit = 1;
  val = re_search (&searchbuf, (char *) XSTRING (string)->data,
		   XSTRING (string)->size, s, XSTRING (string)->size - s,
		   &search_regs);
  immediate_quit = 0;
  last_thing_searched = Qt;
  if (val == -2)
    matcher_overflow ();
  if (val < 0) return Qnil;

{
  int val;

  compile_pattern (regexp, &searchbuf, 0, 0);
  immediate_quit = 1;
  val = re_search (&searchbuf, (char *) XSTRING (string)->data,
		   XSTRING (string)->size, 0, XSTRING (string)->size,
		   0);
  immediate_quit = 0;
  return val;
}

/* Search for COUNT instances of the character TARGET, starting at START.

	  s1 = ZV - BEGV;
	  s2 = 0;
	}
      while (n < 0)
	{
	  int val = re_search_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
				 pos - BEGV, lim - pos, &search_regs,
				 /* Don't allow match past current point */
				 pos - BEGV);
	  if (val == -2)
	    matcher_overflow ();
	  if (val >= 0)
	    {
	      j = BEGV;

	    }
	  n++;
	}
      while (n > 0)
	{
	  int val = re_search_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
				 pos - BEGV, lim - pos, &search_regs,
				 lim - BEGV);
	  if (val == -2)
	    matcher_overflow ();
	  if (val >= 0)
	    {
	      j = BEGV;

			  starts =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  ends =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  re_set_registers (&searchbuf,
					    &search_regs,
					    2, starts, ends);
			}

		      search_regs.start[0]
			= pos + cursor - p2 + ((direction > 0)
					       ? 1 - len : 0);

			  starts =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  ends =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  re_set_registers (&searchbuf,
					    &search_regs,
					    2, starts, ends);
			}

		      search_regs.start[0]
			= pos + ((direction > 0) ? 1 - len : 0);
		      search_regs.end[0] = len + search_regs.start[0];

	    search_regs.end
	      = (regoff_t *) xrealloc (search_regs.end,
				       length * sizeof (regoff_t));
	  }

	re_set_registers (&searchbuf, &search_regs, length,
			  search_regs.start, search_regs.end);
      }
  }

  for (i = 0; i < search_regs.num_regs; i++)
    {

2439:b6c62e4abf59

#include "config.h"
#include "lisp.h"
#include "syntax.h"
#include "buffer.h"
#include "commands.h"
#include "blockinput.h"

#include <sys/types.h>
#include "regex.h"

#define max(a, b) ((a) > (b) ? (a) : (b))

      && translate == bufp->translate)
    return;

  last_regexp = Qnil;
  bufp->translate = translate;
  BLOCK_INPUT;
  val = re_compile_pattern ((char *) XSTRING (pattern)->data,
			    XSTRING (pattern)->size,
			    bufp);
  UNBLOCK_INPUT;
  if (val)
    {
      dummy = build_string (val);
      while (1)
	Fsignal (Qinvalid_regexp, Fcons (dummy, Qnil));

  last_regexp = pattern;

  /* Advise the searching functions about the space we have allocated
     for register data.  */
  BLOCK_INPUT;
  if (regp)
    re_set_registers (bufp, regp, regp->num_regs, regp->start, regp->end);
  UNBLOCK_INPUT;

  return;
}

/* Error condition used for failing searches */

    {
      s1 = ZV - BEGV;
      s2 = 0;
    }
  
  BLOCK_INPUT;
  i = re_match_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
		  point - BEGV, &search_regs,
		  ZV - BEGV);
  UNBLOCK_INPUT;
  if (i == -2)
    matcher_overflow ();

  val = (0 <= i ? Qt : Qnil);
  for (i = 0; i < search_regs.num_regs; i++)

    }

  compile_pattern (regexp, &searchbuf, &search_regs,
		   !NILP (current_buffer->case_fold_search) ? DOWNCASE_TABLE : 0);
  immediate_quit = 1;
  BLOCK_INPUT;
  val = re_search (&searchbuf, (char *) XSTRING (string)->data,
		   XSTRING (string)->size, s, XSTRING (string)->size - s,
		   &search_regs);
  UNBLOCK_INPUT;
  immediate_quit = 0;
  last_thing_searched = Qt;
  if (val == -2)
    matcher_overflow ();
  if (val < 0) return Qnil;

{
  int val;

  compile_pattern (regexp, &searchbuf, 0, 0);
  immediate_quit = 1;
  BLOCK_INPUT;
  val = re_search (&searchbuf, (char *) XSTRING (string)->data,
		   XSTRING (string)->size, 0, XSTRING (string)->size,
		   0);
  UNBLOCK_INPUT;
  immediate_quit = 0;
  return val;
}

/* Search for COUNT instances of the character TARGET, starting at START.

	  s1 = ZV - BEGV;
	  s2 = 0;
	}
      while (n < 0)
	{
	  BLOCK_INPUT;
	  int val = re_search_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
				 pos - BEGV, lim - pos, &search_regs,
				 /* Don't allow match past current point */
				 pos - BEGV);
	  UNBLOCK_INPUT;
	  if (val == -2)
	    matcher_overflow ();
	  if (val >= 0)
	    {
	      j = BEGV;

	    }
	  n++;
	}
      while (n > 0)
	{
	  BLOCK_INPUT;
	  int val = re_search_2 (&searchbuf, (char *) p1, s1, (char *) p2, s2,
				 pos - BEGV, lim - pos, &search_regs,
				 lim - BEGV);
	  UNBLOCK_INPUT;
	  if (val == -2)
	    matcher_overflow ();
	  if (val >= 0)
	    {
	      j = BEGV;

			  starts =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  ends =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  BLOCK_INPUT;
			  re_set_registers (&searchbuf,
					    &search_regs,
					    2, starts, ends);
			  UNBLOCK_INPUT;
			}

		      search_regs.start[0]
			= pos + cursor - p2 + ((direction > 0)
					       ? 1 - len : 0);

			  starts =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  ends =
			    (regoff_t *) xmalloc (2 * sizeof (regoff_t));
			  BLOCK_INPUT;
			  re_set_registers (&searchbuf,
					    &search_regs,
					    2, starts, ends);
			  UNBLOCK_INPUT;
			}

		      search_regs.start[0]
			= pos + ((direction > 0) ? 1 - len : 0);
		      search_regs.end[0] = len + search_regs.start[0];

	    search_regs.end
	      = (regoff_t *) xrealloc (search_regs.end,
				       length * sizeof (regoff_t));
	  }

	BLOCK_INPUT;
	re_set_registers (&searchbuf, &search_regs, length,
			  search_regs.start, search_regs.end);
	UNBLOCK_INPUT;
      }
  }

  for (i = 0; i < search_regs.num_regs; i++)
    {