xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 183:e121b013d1f0 r20-3b18

Import from CVS: tag r20-3b18

author	cvs
date	Mon, 13 Aug 2007 09:54:23 +0200
parents	8eaf7971accc
children	3d6bfa290dbd

comparison

equal deleted inserted replaced

-:f07455f06202
+:e121b013d1f0
 #ifdef HPUX
 #include <netio.h>
 #ifdef HPUX_PRE_8_0
 #include <errnet.h>
 #endif
-#endif
+#endif /* HPUX */
 /* Nonzero during writing of auto-save files */
 static int auto_saving;
 /* Set by auto_save_1 to mode of original file so Fwrite_region_internal
 	  /* Problem when expanding "~\" if HOME is not on current drive.
 	     Ulrich Leodolter, Wed Jan 11 10:20:35 1995 */
 	  if (newdir[1] == ':')
 	    drive = newdir[0];
 	  dostounix_filename (newdir);
-#endif
+#endif /* DOS_NT */
 	  nm++;
 #ifdef VMS
 	  nm++;			/* Don't leave the slash in nm.  */
 #endif /* VMS */
 	}
 	      || stricmp (suffix, ".exe") == 0
 	      || stricmp (suffix, ".bat") == 0)
 	  || (st.st_mode & S_IFMT) == S_IFDIR);
 #else /* not DOS_NT */
 #ifdef HAVE_EACCESS
-return (eaccess (filename, 1) >= 0);
+return eaccess (filename, 1) >= 0;
 #else
 /* Access isn't quite right because it uses the real uid
 and we really want to test with the effective uid.
 But Unix doesn't give us a right way to do it.  */
-return (access (filename, 1) >= 0);
+return access (filename, 1) >= 0;
-#endif
+#endif /* HAVE_EACCESS */
 #endif /* not DOS_NT */
 }
 /* Return nonzero if file FILENAME exists and can be written.  */
 	  return Fsignal (Qfile_error,
 			  list2 (build_translated_string("not a regular file"),
 				 filename));
 	}
 }
-#endif
+#endif /* S_IFREG */
 if (!NILP (beg))
 CHECK_INT (beg);
 else
 beg = Qzero;
 #ifdef MULE
 stream = make_decoding_input_stream
 (XLSTREAM (stream), Fget_coding_system (codesys));
 Lstream_set_character_mode (XLSTREAM (stream));
 Lstream_set_buffering (XLSTREAM (stream), LSTREAM_BLOCKN_BUFFERED, 65536);
-#endif
+#endif /* MULE */
 record_unwind_protect (close_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
 if (!NILP (used_codesys))
 {
 	Fset (used_codesys,
 	      XCODING_SYSTEM_NAME (decoding_stream_coding_system (XLSTREAM (stream))));
 }
-#endif
+#endif /* MULE */
 NUNGCPRO;
 }
 #if 0
 /* XXXX Why the #### ? Bogus anyway. If they are there, display em! */
 {
 	buffer_do_msdos_crlf_to_lf (buf, ####);
 }
 }
 #endif
-#endif
+#endif /* 0 */
 /* Close the file/stream */
 unbind_to (speccount, Qnil);
 if (saverrno != 0)
 #if 0
 #ifdef DOS_NT
 int buffer_file_type
 = NILP (current_buffer->buffer_file_type) ? O_TEXT : O_BINARY;
 #endif /* DOS_NT */
-#endif
+#endif /* 0 */
 #ifdef MULE
 codesys = Fget_coding_system (codesys);
 #endif /* MULE */
 			 try to truncate and rewrite existing version if any.
 		       */
 		      vms_truncate (fn_data);
 		      desc = open (fn_data, O_RDWR, 0);
 		    }
-#endif
+#endif /* 0 */
 		}
 	    }
 	  UNGCPRO;
 	}
 	UNGCPRO;
 * Yech!
 */
 you lose -- fix this
 if (GPT > BUF_BEG (current_buffer) && *GPT_ADDR[-1] != '\n')
 move_gap (find_next_newline (current_buffer, GPT, 1));
-#endif
+#endif /* VMS */
 failure = 0;
 /* Note: I tried increasing the buffering size, along with
 various other tricks, but nothing seemed to make much of
 #ifdef MULE
 outstream =
 make_encoding_output_stream ( XLSTREAM (outstream), codesys);
 Lstream_set_buffering (XLSTREAM (outstream),
 			   LSTREAM_BLOCKN_BUFFERED, 65536);
-#endif
+#endif /* MULE */
 if (STRINGP (start))
 {
 	instream = make_lisp_string_input_stream (start, 0, -1);
 	start1 = 0;
 }
 	&& errno != EINTR)
 {
 	failure = 1;
 	save_errno = errno;
 }
-#endif
+#endif /* HAVE_FSYNC */
 /* Spurious "file has changed on disk" warnings have been
 observed on Suns as well.
 It seems that `close' can change the modtime, under nfs.
 	{
 	  start = make_int (BUF_BEGV (current_buffer));
 	  end = make_int (BUF_ZV (current_buffer));
 	  annotations = Qnil;
 	}
-(void) Flength (res);     /* Check basic validity of return value */
+Flength (res);     /* Check basic validity of return value */
 annotations = merge (annotations, res, Qcar_less_than_car);
 p = Fcdr (p);
 }
 /* Now do the same for annotation functions implied by the file-format */
 	{
 	  start = make_int (BUF_BEGV (current_buffer));
 	  end = make_int (BUF_ZV (current_buffer));
 	  annotations = Qnil;
 	}
-(void) Flength (res);
+Flength (res);
 annotations = merge (annotations, res, Qcar_less_than_car);
 p = Fcdr (p);
 }
 UNGCPRO;
 return annotations;
 		return -1;
 	      pos++;
 	    }
 	}
 else
-#endif
+#endif /* MULE */
 	{
 	  while (pos != nextpos)
 	    {
 	      /* Otherwise there is no point to that.  Just go in batches. */
 	      int chunk = min (nextpos - pos, A_WRITE_BATCH_SIZE);
 rounded_size = XSTRING_LENGTH (string) + extra;
 encrypted_string = alloca (rounded_size + 1);
 memcpy (encrypted_string, XSTRING_DATA (string), XSTRING_LENGTH (string));
 memset (encrypted_string + rounded_size - extra, 0, extra + 1);
-if (XSTRING_LENGTH (key) > CRYPT_KEY_SIZE)
+key_size = min (CRYPT_KEY_SIZE, XSTRING_LENGTH (key))
-key_size = CRYPT_KEY_SIZE;
-else
-key_size = XSTRING_LENGTH (key);
 raw_key = alloca (CRYPT_KEY_SIZE + 1);
 memcpy (raw_key, XSTRING_DATA (key), key_size);
 memset (raw_key + key_size, 0, (CRYPT_KEY_SIZE + 1) - key_size);
-(void) ecb_crypt (raw_key, encrypted_string, rounded_size,
+ecb_crypt (raw_key, encrypted_string, rounded_size,
-		    DES_ENCRYPT | DES_SW);
+	     DES_ENCRYPT | DES_SW);
 return make_string (encrypted_string, rounded_size);
 }
 DEFUN ("decrypt-string", Fdecrypt_string, 2, 2, 0, /*
 Decrypt STRING using KEY.
 string_size = XSTRING_LENGTH (string) + 1;
 decrypted_string = alloca (string_size);
 memcpy (decrypted_string, XSTRING_DATA (string), string_size);
 decrypted_string[string_size - 1] = '\0';
-if (XSTRING_LENGTH (key) > CRYPT_KEY_SIZE)
+key_size = min (CRYPT_KEY_SIZE, XSTRING_LENGTH (key))
-key_size = CRYPT_KEY_SIZE;
-else
-key_size = XSTRING_LENGTH (key);
 raw_key = alloca (CRYPT_KEY_SIZE + 1);
 memcpy (raw_key, XSTRING_DATA (key), key_size);
 memset (raw_key + key_size, 0, (CRYPT_KEY_SIZE + 1) - key_size);
-(void) ecb_crypt (raw_key, decrypted_string, string_size,
+ecb_crypt (raw_key, decrypted_string, string_size, D | DES_SW);
-		    DES_DECRYPT | DES_SW);
 return make_string (decrypted_string, string_size - 1);
 }
-#endif
+#endif /* 0 */
 DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime, 1, 1, 0, /*
 Return t if last mod time of BUF's visited file matches what BUF records.
 This means that the file has not been changed since it was visited or saved.
 Vafter_insert_file_functions = Qnil;
 DEFVAR_LISP ("write-region-annotate-functions",
 	       &Vwrite_region_annotate_functions /*
 A list of functions to be called at the start of `write-region'.
-Each is passed two arguments, START and END as for `write-region'.
+Each is passed two arguments, START and END, as for `write-region'.
 It should return a list of pairs (POSITION . STRING) of strings to be
 effectively inserted at the specified positions of the file being written
 \(1 means to insert before the first byte written).  The POSITIONs must be
 sorted into increasing order.  If there are several functions in the list,
 the several lists are merged destructively.

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 183:e121b013d1f0 r20-3b18