xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 280:7df0dd720c89 r21-0b38

Import from CVS: tag r21-0b38

author	cvs
date	Mon, 13 Aug 2007 10:32:22 +0200
parents	90d73dddcdc4
children	558f606b08ae

comparison

equal deleted inserted replaced

-:c20b2fb5bb0a
+:7df0dd720c89
 Lisp_Object Qcar_less_than_car;
 Lisp_Object Qcompute_buffer_file_truename;
+EXFUN (Frunning_temacs_p, 0);
 /* signal a file error when errno contains a meaningful value. */
 DOESNT_RETURN
 report_file_error (CONST char *string, Lisp_Object data)
 {
 return Qnil;
 }
 static Lisp_Object
-close_stream_unwind (Lisp_Object stream)
+delete_stream_unwind (Lisp_Object stream)
 {
-Lstream_close (XLSTREAM (stream));
+Lstream_delete (XLSTREAM (stream));
 return Qnil;
 }
 /* Restore point, having saved it as a marker.  */
 this by initializing count to a random value, and incrementing it
 afterwards.  */
 if (!count_initialized_p)
 {
 count = (unsigned)time (NULL);
-count_initialized_p = 1;
+/* Dumping temacs with a non-zero count_initialized_p wouldn't
+make much sense.  */
+if (NILP (Frunning_temacs_p ()))
+	count_initialized_p = 1;
 }
 while (1)
 {
 struct stat ignored;
-unsigned num = count++;
+unsigned num = count;
 p[0] = tbl[num & 63], num >>= 6;
 p[1] = tbl[num & 63], num >>= 6;
 p[2] = tbl[num & 63], num >>= 6;
+/* Poor man's congruential RN generator.  Replace with ++count
+for debugging.  */
+count += 25229;
+count %= 225307;
 if (stat ((CONST char *) data, &ignored) < 0)
 	{
 	  /* We want to return only if errno is ENOENT.  */
 	  if (errno == ENOENT)
 	  else
 	    /* The error here is dubious, but there is little else we
 	       can do.  The alternatives are to return nil, which is
 	       as bad as (and in many cases worse than) throwing the
 	       error, or to ignore the error, which will likely result
-	       in looping through 262144 stat's, which is not only
+	       in looping through 225307 stat's, which is not only
 	       dog-slow, but also useless since it will fallback to
 	       the errow below, anyway.  */
 	    report_file_error ("Cannot create temporary name for prefix",
 			       list1 (prefix));
 	  /* not reached */
 	}
 }
 signal_simple_error ("Cannot create temporary name for prefix", prefix);
 RETURN_NOT_REACHED (Qnil);
 }
 DEFUN ("expand-file-name", Fexpand_file_name, 1, 2, 0, /*
 Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
 (does not start with slash); if DEFAULT-DIRECTORY is nil or missing,
 /* Stack sizes > 2**16 is a good way to elicit compiler bugs */
 /* #define READ_BUF_SIZE (2 << 16) */
 #define READ_BUF_SIZE (1 << 15)
-DEFUN ("insert-file-contents-internal", Finsert_file_contents_internal, 1, 7, 0, /*
+DEFUN ("insert-file-contents-internal", Finsert_file_contents_internal,
+1, 7, 0, /*
 Insert contents of file FILENAME after point; no coding-system frobbing.
 This function is identical to `insert-file-contents' except for the
 handling of the CODESYS and USED-CODESYS arguments under
 XEmacs/Mule. (When Mule support is not present, both functions are
 identical and ignore the CODESYS and USED-CODESYS arguments.)
 (XLSTREAM (stream), Fget_coding_system (codesys));
 Lstream_set_character_mode (XLSTREAM (stream));
 Lstream_set_buffering (XLSTREAM (stream), LSTREAM_BLOCKN_BUFFERED, 65536);
 #endif /* FILE_CODING */
-record_unwind_protect (close_stream_unwind, stream);
+record_unwind_protect (delete_stream_unwind, stream);
 /* No need to limit the amount of stuff we attempt to read. (It would
 be incorrect, anyway, when Mule is enabled.) Instead, the limiting
 occurs inside of the filedesc stream. */
 while (1)
 (This has supposedly been fixed in Sunos 4,
 but who knows about all the other machines with NFS?)  */
 /* On VMS and APOLLO, must do the stat after the close
 since closing changes the modtime.  */
-#if 1 /* !defined (VMS) && !defined (APOLLO) */
+/* As it does on Windows too - kkm */
+#if !defined (WINDOWSNT) /* !defined (VMS) && !defined (APOLLO) */
 fstat (desc, &st);
 #endif
 /* NFS can report a write failure now.  */
 if (close (desc) < 0)
 as necessary). */
 XCAR (desc_locative) = Qnil;
 unbind_to (speccount, Qnil);
 }
+#if defined (WINDOWSNT) /* defined (VMS) || defined (APOLLO) */
-#if 0 /* defined (VMS) || defined (APOLLO) */
 stat ((char *) XSTRING_DATA (fn), &st);
 #endif
 #ifdef CLASH_DETECTION
 if (!auto_saving)
 DEFUN ("car-less-than-car", Fcar_less_than_car, 2, 2, 0, /*
 Return t if (car A) is numerically less than (car B).
 */
 (a, b))
 {
-return Flss (Fcar (a), Fcar (b));
+return arithcompare (Fcar (a), Fcar (b), arith_less);
 }
 /* Heh heh heh, let's define this too, just to aggravate the person who
 wrote the above comment. */
 DEFUN ("cdr-less-than-cdr", Fcdr_less_than_cdr, 2, 2, 0, /*
 Return t if (cdr A) is numerically less than (cdr B).
 */
 (a, b))
 {
-return Flss (Fcdr (a), Fcdr (b));
+return arithcompare (Fcdr (a), Fcdr (b), arith_less);
 }
 /* Build the complete list of annotations appropriate for writing out
 the text between START and END, by calling all the functions in
 write-region-annotate-functions and merging the lists they return.

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 280:7df0dd720c89 r21-0b38