diff src/md5.c @ 800:a5954632b187

[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents 943eaba38521
children 804517e16990
line wrap: on
line diff
--- a/src/md5.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/md5.c	Sun Mar 31 08:30:17 2002 +0000
@@ -1,7 +1,7 @@
 /* md5.c - Functions to compute MD5 message digest of files or memory blocks
    according to the definition of MD5 in RFC 1321 from April 1992.
    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-   Copyright (C) 2001 Ben Wing.
+   Copyright (C) 2001, 2002 Ben Wing.
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
@@ -515,11 +515,10 @@
   unsigned char thehash[33];
   int i;
 
-  Lisp_Object instream;
-  struct gcpro gcpro1;
-  Lisp_Object raw_instream;
-  struct gcpro ngcpro1;
+  Lisp_Object raw_instream = Qnil, instream = Qnil;
+  struct gcpro gcpro1, gcpro2;
 
+  GCPRO2 (raw_instream, instream);
   /* Set up the input stream.  */
   if (BUFFERP (object))
     {
@@ -530,7 +529,7 @@
       /* Figure out where we need to get info from */
       get_buffer_range_char (b, start, end, &begv, &endv, GB_ALLOW_NIL);
 
-      instream = make_lisp_buffer_input_stream (b, begv, endv, 0);
+      raw_instream = make_lisp_buffer_input_stream (b, begv, endv, 0);
     }
   else
     {
@@ -538,15 +537,15 @@
       CHECK_STRING (object);
       get_string_range_byte (object, start, end, &bstart, &bend,
 			     GB_HISTORICAL_STRING_BEHAVIOR);
-      instream = make_lisp_string_input_stream (object, bstart, bend - bstart);
+      raw_instream = make_lisp_string_input_stream (object, bstart,
+						    bend - bstart);
     }
-  GCPRO1 (instream);
 
   /* Determine the coding and set up the conversion stream.  */
-  coding = md5_coding_system (object, coding, instream, !NILP (noerror));
-  raw_instream = instream;
-  instream = make_coding_input_stream (XLSTREAM (instream), coding, CODING_ENCODE);
-  NGCPRO1 (raw_instream);
+  coding = md5_coding_system (object, coding, raw_instream, !NILP (noerror));
+  Lstream_rewind (XLSTREAM (raw_instream));
+  instream = make_coding_input_stream (XLSTREAM (raw_instream), coding,
+				       CODING_ENCODE, 0);
 
   /* Initialize MD5 context.  */
   md5_init_ctx (&ctx);
@@ -565,7 +564,6 @@
     }
   Lstream_delete (XLSTREAM (instream));
   Lstream_delete (XLSTREAM (raw_instream));
-  NUNGCPRO;
   UNGCPRO;
 
   md5_finish_ctx (&ctx, digest);