X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b1f367f797aa19047904e73a67e52f391c720e0d..3616c8b26bfaf024d803371b85bee571cd6f061f:/src/fileio.c diff --git a/src/fileio.c b/src/fileio.c index c67bea79bd..110977b3a6 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -145,9 +145,9 @@ Lisp_Object Qfile_name_history; static Lisp_Object Qcar_less_than_car; static Lisp_Object Fmake_symbolic_link (Lisp_Object, Lisp_Object, Lisp_Object); -static int a_write (int, Lisp_Object, EMACS_INT, EMACS_INT, +static int a_write (int, Lisp_Object, ptrdiff_t, ptrdiff_t, Lisp_Object *, struct coding_system *); -static int e_write (int, Lisp_Object, EMACS_INT, EMACS_INT, +static int e_write (int, Lisp_Object, ptrdiff_t, ptrdiff_t, struct coding_system *); @@ -257,7 +257,7 @@ use the standard functions without calling themselves recursively. */) { /* This function must not munge the match data. */ Lisp_Object chain, inhibited_handlers, result; - int pos = -1; + ptrdiff_t pos = -1; result = Qnil; CHECK_STRING (filename); @@ -275,7 +275,7 @@ use the standard functions without calling themselves recursively. */) if (CONSP (elt)) { Lisp_Object string = XCAR (elt); - EMACS_INT match_pos; + ptrdiff_t match_pos; Lisp_Object handler = XCDR (elt); Lisp_Object operations = Qnil; @@ -1472,7 +1472,7 @@ search_embedded_absfilename (char *nm, char *endp) if ((0 || IS_DIRECTORY_SEP (p[-1])) && file_name_absolute_p (p) -#if defined (WINDOWSNT) || defined(CYGWIN) +#if defined (WINDOWSNT) || defined (CYGWIN) /* // at start of file name is meaningful in Apollo, WindowsNT and Cygwin systems. */ && !(IS_DIRECTORY_SEP (p[0]) && p - 1 == nm) @@ -1813,12 +1813,12 @@ on the system, we copy the SELinux context of FILE to NEWNAME. */) (Lisp_Object file, Lisp_Object newname, Lisp_Object ok_if_already_exists, Lisp_Object keep_time, Lisp_Object preserve_uid_gid, Lisp_Object preserve_selinux_context) { int ifd, ofd; - EMACS_INT n; + int n; char buf[16 * 1024]; struct stat st, out_st; Lisp_Object handler; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; - int count = SPECPDL_INDEX (); + ptrdiff_t count = SPECPDL_INDEX (); int input_file_statable_p; Lisp_Object encoded_file, encoded_newname; #if HAVE_LIBSELINUX @@ -1937,10 +1937,19 @@ on the system, we copy the SELinux context of FILE to NEWNAME. */) | (NILP (ok_if_already_exists) ? O_EXCL : 0), S_IREAD | S_IWRITE); #else /* not MSDOS */ - ofd = emacs_open (SSDATA (encoded_newname), - O_WRONLY | O_TRUNC | O_CREAT - | (NILP (ok_if_already_exists) ? O_EXCL : 0), - 0666); + { + int new_mask = 0666; + if (input_file_statable_p) + { + if (!NILP (preserve_uid_gid)) + new_mask = 0600; + new_mask &= st.st_mode; + } + ofd = emacs_open (SSDATA (encoded_newname), + (O_WRONLY | O_TRUNC | O_CREAT + | (NILP (ok_if_already_exists) ? O_EXCL : 0)), + new_mask); + } #endif /* not MSDOS */ if (ofd < 0) report_file_error ("Opening output file", Fcons (newname, Qnil)); @@ -1959,9 +1968,21 @@ on the system, we copy the SELinux context of FILE to NEWNAME. */) owner and group. */ if (input_file_statable_p) { + int mode_mask = 07777; if (!NILP (preserve_uid_gid)) - fchown (ofd, st.st_uid, st.st_gid); - if (fchmod (ofd, st.st_mode & 07777) != 0) + { + /* Attempt to change owner and group. If that doesn't work + attempt to change just the group, as that is sometimes allowed. + Adjust the mode mask to eliminate setuid or setgid bits + that are inappropriate if the owner and group are wrong. */ + if (fchown (ofd, st.st_uid, st.st_gid) != 0) + { + mode_mask &= ~06000; + if (fchown (ofd, -1, st.st_gid) == 0) + mode_mask |= 02000; + } + } + if (fchmod (ofd, st.st_mode & mode_mask) != 0) report_file_error ("Doing chmod", Fcons (newname, Qnil)); } #endif /* not MSDOS */ @@ -2189,7 +2210,7 @@ This is what happens in interactive use with M-x. */) { if (errno == EXDEV) { - int count; + ptrdiff_t count; symlink_target = Ffile_symlink_p (file); if (! NILP (symlink_target)) Fmake_symbolic_link (symlink_target, newname, @@ -2476,7 +2497,7 @@ See also `file-exists-p' and `file-attributes'. */) absname = ENCODE_FILE (absname); -#if defined(DOS_NT) || defined(macintosh) +#if defined (DOS_NT) || defined (macintosh) /* Under MS-DOS, Windows, and Macintosh, open does not work for directories. */ if (access (SDATA (absname), 0) == 0) @@ -2761,7 +2782,7 @@ if file does not exist, is not accessible, or SELinux is disabled */) } #endif - return Flist (sizeof(values) / sizeof(values[0]), values); + return Flist (sizeof (values) / sizeof (values[0]), values); } DEFUN ("set-file-selinux-context", Fset_file_selinux_context, @@ -2832,7 +2853,7 @@ is disabled. */) context_free (parsed_con); } else - report_file_error("Doing lgetfilecon", Fcons (absname, Qnil)); + report_file_error ("Doing lgetfilecon", Fcons (absname, Qnil)); if (con) freecon (con); @@ -2891,7 +2912,7 @@ symbolic notation, like the `chmod' command from GNU Coreutils. */) encoded_absname = ENCODE_FILE (absname); - if (chmod (SSDATA (encoded_absname), XINT (mode)) < 0) + if (chmod (SSDATA (encoded_absname), XINT (mode) & 07777) < 0) report_file_error ("Doing chmod", Fcons (absname, Qnil)); return Qnil; @@ -3034,6 +3055,8 @@ otherwise, if FILE2 does not exist, the answer is t. */) #ifndef READ_BUF_SIZE #define READ_BUF_SIZE (64 << 10) #endif +/* Some buffer offsets are stored in 'int' variables. */ +verify (READ_BUF_SIZE <= INT_MAX); /* This function is called after Lisp functions to decide a coding system are called, or when they cause an error. Before they are @@ -3078,8 +3101,8 @@ decide_coding_unwind (Lisp_Object unwind_data) /* Used to pass values from insert-file-contents to read_non_regular. */ static int non_regular_fd; -static EMACS_INT non_regular_inserted; -static EMACS_INT non_regular_nbytes; +static ptrdiff_t non_regular_inserted; +static int non_regular_nbytes; /* Read from a non-regular file. @@ -3090,7 +3113,7 @@ static EMACS_INT non_regular_nbytes; static Lisp_Object read_non_regular (Lisp_Object ignore) { - EMACS_INT nbytes; + int nbytes; immediate_quit = 1; QUIT; @@ -3155,16 +3178,18 @@ variable `last-coding-system-used' to the coding system actually used. */) { struct stat st; register int fd; - EMACS_INT inserted = 0; + ptrdiff_t inserted = 0; int nochange = 0; - register EMACS_INT how_much; - register EMACS_INT unprocessed; - int count = SPECPDL_INDEX (); + register ptrdiff_t how_much; + off_t beg_offset, end_offset; + register int unprocessed; + ptrdiff_t count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; Lisp_Object handler, val, insval, orig_filename, old_undo; Lisp_Object p; - EMACS_INT total = 0; + ptrdiff_t total = 0; int not_regular = 0; + int save_errno = 0; char read_buf[READ_BUF_SIZE]; struct coding_system coding; char buffer[1 << 14]; @@ -3203,7 +3228,8 @@ variable `last-coding-system-used' to the coding system actually used. */) { val = call6 (handler, Qinsert_file_contents, filename, visit, beg, end, replace); - if (CONSP (val) && CONSP (XCDR (val))) + if (CONSP (val) && CONSP (XCDR (val)) + && RANGED_INTEGERP (0, XCAR (XCDR (val)), ZV - PT)) inserted = XINT (XCAR (XCDR (val))); goto handled; } @@ -3228,9 +3254,11 @@ variable `last-coding-system-used' to the coding system actually used. */) #endif /* WINDOWSNT */ { badopen: + save_errno = errno; if (NILP (visit)) report_file_error ("Opening input file", Fcons (orig_filename, Qnil)); st.st_mtime = -1; + st.st_size = -1; how_much = 0; if (!NILP (Vcoding_system_for_read)) Fset (Qbuffer_file_coding_system, Vcoding_system_for_read); @@ -3263,15 +3291,6 @@ variable `last-coding-system-used' to the coding system actually used. */) record_unwind_protect (close_file_unwind, make_number (fd)); - /* Check whether the size is too large or negative, which can happen on a - platform that allows file sizes greater than the maximum off_t value. */ - if (! not_regular - && ! (0 <= st.st_size && st.st_size <= BUF_BYTES_MAX)) - buffer_overflow (); - - /* Prevent redisplay optimizations. */ - current_buffer->clip_changed = 1; - if (!NILP (visit)) { if (!NILP (beg) || !NILP (end)) @@ -3281,26 +3300,64 @@ variable `last-coding-system-used' to the coding system actually used. */) } if (!NILP (beg)) - CHECK_NUMBER (beg); + { + if (! (RANGED_INTEGERP (0, beg, TYPE_MAXIMUM (off_t)))) + wrong_type_argument (intern ("file-offset"), beg); + beg_offset = XFASTINT (beg); + } else - XSETFASTINT (beg, 0); + beg_offset = 0; if (!NILP (end)) - CHECK_NUMBER (end); + { + if (! (RANGED_INTEGERP (0, end, TYPE_MAXIMUM (off_t)))) + wrong_type_argument (intern ("file-offset"), end); + end_offset = XFASTINT (end); + } else { - if (! not_regular) + if (not_regular) + end_offset = TYPE_MAXIMUM (off_t); + else { - XSETINT (end, st.st_size); + end_offset = st.st_size; + + /* A negative size can happen on a platform that allows file + sizes greater than the maximum off_t value. */ + if (end_offset < 0) + buffer_overflow (); /* The file size returned from stat may be zero, but data may be readable nonetheless, for example when this is a file in the /proc filesystem. */ - if (st.st_size == 0) - XSETINT (end, READ_BUF_SIZE); + if (end_offset == 0) + end_offset = READ_BUF_SIZE; } } + /* Check now whether the buffer will become too large, + in the likely case where the file's length is not changing. + This saves a lot of needless work before a buffer overflow. */ + if (! not_regular) + { + /* The likely offset where we will stop reading. We could read + more (or less), if the file grows (or shrinks) as we read it. */ + off_t likely_end = min (end_offset, st.st_size); + + if (beg_offset < likely_end) + { + ptrdiff_t buf_bytes = + Z_BYTE - (!NILP (replace) ? ZV_BYTE - BEGV_BYTE : 0); + ptrdiff_t buf_growth_max = BUF_BYTES_MAX - buf_bytes; + off_t likely_growth = likely_end - beg_offset; + if (buf_growth_max < likely_growth) + buffer_overflow (); + } + } + + /* Prevent redisplay optimizations. */ + current_buffer->clip_changed = 1; + if (EQ (Vcoding_system_for_read, Qauto_save_coding)) { coding_system = coding_inherit_eol_type (Qutf_8_emacs, Qunix); @@ -3326,7 +3383,7 @@ variable `last-coding-system-used' to the coding system actually used. */) We assume that the 1K-byte and 3K-byte for heading and tailing respectively are sufficient for this purpose. */ - EMACS_INT nread; + int nread; if (st.st_size <= (1024 * 4)) nread = emacs_read (fd, read_buf, 1024 * 4); @@ -3436,17 +3493,17 @@ variable `last-coding-system-used' to the coding system actually used. */) /* same_at_start and same_at_end count bytes, because file access counts bytes and BEG and END count bytes. */ - EMACS_INT same_at_start = BEGV_BYTE; - EMACS_INT same_at_end = ZV_BYTE; - EMACS_INT overlap; + ptrdiff_t same_at_start = BEGV_BYTE; + ptrdiff_t same_at_end = ZV_BYTE; + ptrdiff_t overlap; /* There is still a possibility we will find the need to do code conversion. If that happens, we set this variable to 1 to give up on handling REPLACE in the optimized way. */ int giveup_match_end = 0; - if (XINT (beg) != 0) + if (beg_offset != 0) { - if (emacs_lseek (fd, XINT (beg), SEEK_SET) < 0) + if (lseek (fd, beg_offset, SEEK_SET) < 0) report_file_error ("Setting file position", Fcons (orig_filename, Qnil)); } @@ -3457,7 +3514,7 @@ variable `last-coding-system-used' to the coding system actually used. */) match the text at the beginning of the buffer. */ while (1) { - EMACS_INT nread, bufpos; + int nread, bufpos; nread = emacs_read (fd, buffer, sizeof buffer); if (nread < 0) @@ -3494,7 +3551,7 @@ variable `last-coding-system-used' to the coding system actually used. */) immediate_quit = 0; /* If the file matches the buffer completely, there's no need to replace anything. */ - if (same_at_start - BEGV_BYTE == XINT (end)) + if (same_at_start - BEGV_BYTE == end_offset - beg_offset) { emacs_close (fd); specpdl_ptr--; @@ -3509,16 +3566,17 @@ variable `last-coding-system-used' to the coding system actually used. */) already found that decoding is necessary, don't waste time. */ while (!giveup_match_end) { - EMACS_INT total_read, nread, bufpos, curpos, trial; + int total_read, nread, bufpos, trial; + off_t curpos; /* At what file position are we now scanning? */ - curpos = XINT (end) - (ZV_BYTE - same_at_end); + curpos = end_offset - (ZV_BYTE - same_at_end); /* If the entire file matches the buffer tail, stop the scan. */ if (curpos == 0) break; /* How much can we scan in the next step? */ trial = min (curpos, sizeof buffer); - if (emacs_lseek (fd, curpos - trial, SEEK_SET) < 0) + if (lseek (fd, curpos - trial, SEEK_SET) < 0) report_file_error ("Setting file position", Fcons (orig_filename, Qnil)); @@ -3565,7 +3623,7 @@ variable `last-coding-system-used' to the coding system actually used. */) if (! giveup_match_end) { - EMACS_INT temp; + ptrdiff_t temp; /* We win! We can handle REPLACE the optimized way. */ @@ -3585,13 +3643,14 @@ variable `last-coding-system-used' to the coding system actually used. */) /* Don't try to reuse the same piece of text twice. */ overlap = (same_at_start - BEGV_BYTE - - (same_at_end + st.st_size - ZV)); + - (same_at_end + + (! NILP (end) ? end_offset : st.st_size) - ZV_BYTE)); if (overlap > 0) same_at_end += overlap; /* Arrange to read only the nonmatching middle part of the file. */ - XSETFASTINT (beg, XINT (beg) + (same_at_start - BEGV_BYTE)); - XSETFASTINT (end, XINT (end) - (ZV_BYTE - same_at_end)); + beg_offset += same_at_start - BEGV_BYTE; + end_offset -= ZV_BYTE - same_at_end; del_range_byte (same_at_start, same_at_end, 0); /* Insert from the file at the proper position. */ @@ -3618,16 +3677,16 @@ variable `last-coding-system-used' to the coding system actually used. */) in a more optimized way. */ if (!NILP (replace) && ! replace_handled && BEGV < ZV) { - EMACS_INT same_at_start = BEGV_BYTE; - EMACS_INT same_at_end = ZV_BYTE; - EMACS_INT same_at_start_charpos; - EMACS_INT inserted_chars; - EMACS_INT overlap; - EMACS_INT bufpos; + ptrdiff_t same_at_start = BEGV_BYTE; + ptrdiff_t same_at_end = ZV_BYTE; + ptrdiff_t same_at_start_charpos; + ptrdiff_t inserted_chars; + ptrdiff_t overlap; + ptrdiff_t bufpos; unsigned char *decoded; - EMACS_INT temp; - EMACS_INT this = 0; - int this_count = SPECPDL_INDEX (); + ptrdiff_t temp; + ptrdiff_t this = 0; + ptrdiff_t this_count = SPECPDL_INDEX (); int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); Lisp_Object conversion_buffer; @@ -3636,7 +3695,7 @@ variable `last-coding-system-used' to the coding system actually used. */) /* First read the whole file, performing code conversion into CONVERSION_BUFFER. */ - if (emacs_lseek (fd, XINT (beg), SEEK_SET) < 0) + if (lseek (fd, beg_offset, SEEK_SET) < 0) report_file_error ("Setting file position", Fcons (orig_filename, Qnil)); @@ -3651,8 +3710,7 @@ variable `last-coding-system-used' to the coding system actually used. */) /* We read one bunch by one (READ_BUF_SIZE bytes) to allow quitting while reading a huge while. */ /* try is reserved in some compilers (Microsoft C) */ - EMACS_INT trytry = min (total - how_much, - READ_BUF_SIZE - unprocessed); + int trytry = min (total - how_much, READ_BUF_SIZE - unprocessed); /* Allow quitting out of the actual I/O. */ immediate_quit = 1; @@ -3803,7 +3861,7 @@ variable `last-coding-system-used' to the coding system actually used. */) } if (! not_regular) - total = XINT (end) - XINT (beg); + total = end_offset - beg_offset; else /* For a special file, all we can do is guess. */ total = READ_BUF_SIZE; @@ -3824,9 +3882,9 @@ variable `last-coding-system-used' to the coding system actually used. */) if (GAP_SIZE < total) make_gap (total - GAP_SIZE); - if (XINT (beg) != 0 || !NILP (replace)) + if (beg_offset != 0 || !NILP (replace)) { - if (emacs_lseek (fd, XINT (beg), SEEK_SET) < 0) + if (lseek (fd, beg_offset, SEEK_SET) < 0) report_file_error ("Setting file position", Fcons (orig_filename, Qnil)); } @@ -3843,13 +3901,13 @@ variable `last-coding-system-used' to the coding system actually used. */) /* Here, we don't do code conversion in the loop. It is done by decode_coding_gap after all data are read into the buffer. */ { - EMACS_INT gap_size = GAP_SIZE; + ptrdiff_t gap_size = GAP_SIZE; while (how_much < total) { /* try is reserved in some compilers (Microsoft C) */ - EMACS_INT trytry = min (total - how_much, READ_BUF_SIZE); - EMACS_INT this; + int trytry = min (total - how_much, READ_BUF_SIZE); + ptrdiff_t this; if (not_regular) { @@ -3968,7 +4026,7 @@ variable `last-coding-system-used' to the coding system actually used. */) care of marker adjustment. By this way, we can run Lisp program safely before decoding the inserted text. */ Lisp_Object unwind_data; - int count1 = SPECPDL_INDEX (); + ptrdiff_t count1 = SPECPDL_INDEX (); unwind_data = Fcons (BVAR (current_buffer, enable_multibyte_characters), Fcons (BVAR (current_buffer, undo_list), @@ -4089,7 +4147,8 @@ variable `last-coding-system-used' to the coding system actually used. */) visit); if (! NILP (insval)) { - CHECK_NUMBER (insval); + if (! RANGED_INTEGERP (0, insval, ZV - PT)) + wrong_type_argument (intern ("inserted-chars"), insval); inserted = XFASTINT (insval); } } @@ -4098,8 +4157,8 @@ variable `last-coding-system-used' to the coding system actually used. */) if (inserted > 0) { /* Don't run point motion or modification hooks when decoding. */ - int count1 = SPECPDL_INDEX (); - EMACS_INT old_inserted = inserted; + ptrdiff_t count1 = SPECPDL_INDEX (); + ptrdiff_t old_inserted = inserted; specbind (Qinhibit_point_motion_hooks, Qt); specbind (Qinhibit_modification_hooks, Qt); @@ -4111,7 +4170,8 @@ variable `last-coding-system-used' to the coding system actually used. */) { insval = call3 (Qformat_decode, Qnil, make_number (inserted), visit); - CHECK_NUMBER (insval); + if (! RANGED_INTEGERP (0, insval, ZV - PT)) + wrong_type_argument (intern ("inserted-chars"), insval); inserted = XFASTINT (insval); } else @@ -4125,15 +4185,16 @@ variable `last-coding-system-used' to the coding system actually used. */) Hence we temporarily save `point' and `inserted' here and restore `point' iff format-decode did not insert or delete any text. Otherwise we leave `point' at point-min. */ - EMACS_INT opoint = PT; - EMACS_INT opoint_byte = PT_BYTE; - EMACS_INT oinserted = ZV - BEGV; - int ochars_modiff = CHARS_MODIFF; + ptrdiff_t opoint = PT; + ptrdiff_t opoint_byte = PT_BYTE; + ptrdiff_t oinserted = ZV - BEGV; + EMACS_INT ochars_modiff = CHARS_MODIFF; TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); insval = call3 (Qformat_decode, Qnil, make_number (oinserted), visit); - CHECK_NUMBER (insval); + if (! RANGED_INTEGERP (0, insval, ZV - PT)) + wrong_type_argument (intern ("inserted-chars"), insval); if (ochars_modiff == CHARS_MODIFF) /* format_decode didn't modify buffer's characters => move point back to position before inserted text and leave @@ -4155,7 +4216,8 @@ variable `last-coding-system-used' to the coding system actually used. */) insval = call1 (XCAR (p), make_number (inserted)); if (!NILP (insval)) { - CHECK_NUMBER (insval); + if (! RANGED_INTEGERP (0, insval, ZV - PT)) + wrong_type_argument (intern ("inserted-chars"), insval); inserted = XFASTINT (insval); } } @@ -4163,16 +4225,17 @@ variable `last-coding-system-used' to the coding system actually used. */) { /* For the rationale of this see the comment on format-decode above. */ - EMACS_INT opoint = PT; - EMACS_INT opoint_byte = PT_BYTE; - EMACS_INT oinserted = ZV - BEGV; - int ochars_modiff = CHARS_MODIFF; + ptrdiff_t opoint = PT; + ptrdiff_t opoint_byte = PT_BYTE; + ptrdiff_t oinserted = ZV - BEGV; + EMACS_INT ochars_modiff = CHARS_MODIFF; TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); insval = call1 (XCAR (p), make_number (oinserted)); if (!NILP (insval)) { - CHECK_NUMBER (insval); + if (! RANGED_INTEGERP (0, insval, ZV - PT)) + wrong_type_argument (intern ("inserted-chars"), insval); if (ochars_modiff == CHARS_MODIFF) /* after_insert_file_functions didn't modify buffer's characters => move point back to @@ -4227,6 +4290,7 @@ variable `last-coding-system-used' to the coding system actually used. */) && current_buffer->modtime == -1) { /* If visiting nonexistent file, return nil. */ + errno = save_errno; report_file_error ("Opening input file", Fcons (orig_filename, Qnil)); } @@ -4404,7 +4468,7 @@ This calls `write-region-annotate-functions' at the start, and int save_errno = 0; const char *fn; struct stat st; - int count = SPECPDL_INDEX (); + ptrdiff_t count = SPECPDL_INDEX (); int count1; Lisp_Object handler; Lisp_Object visit_file; @@ -4555,7 +4619,7 @@ This calls `write-region-annotate-functions' at the start, and if (!NILP (append) && !NILP (Ffile_regular_p (filename))) { - long ret; + off_t ret; if (NUMBERP (append)) ret = emacs_lseek (desc, XINT (append), SEEK_CUR); @@ -4564,7 +4628,9 @@ This calls `write-region-annotate-functions' at the start, and if (ret < 0) { #ifdef CLASH_DETECTION + save_errno = errno; if (!auto_saving) unlock_file (lockname); + errno = save_errno; #endif /* CLASH_DETECTION */ UNGCPRO; report_file_error ("Lseek error", Fcons (filename, Qnil)); @@ -4802,13 +4868,13 @@ build_annotations (Lisp_Object start, Lisp_Object end) The return value is negative in case of system call failure. */ static int -a_write (int desc, Lisp_Object string, EMACS_INT pos, - register EMACS_INT nchars, Lisp_Object *annot, +a_write (int desc, Lisp_Object string, ptrdiff_t pos, + register ptrdiff_t nchars, Lisp_Object *annot, struct coding_system *coding) { Lisp_Object tem; - EMACS_INT nextpos; - EMACS_INT lastpos = pos + nchars; + ptrdiff_t nextpos; + ptrdiff_t lastpos = pos + nchars; while (NILP (*annot) || CONSP (*annot)) { @@ -4848,7 +4914,7 @@ a_write (int desc, Lisp_Object string, EMACS_INT pos, are indexes to the string STRING. */ static int -e_write (int desc, Lisp_Object string, EMACS_INT start, EMACS_INT end, +e_write (int desc, Lisp_Object string, ptrdiff_t start, ptrdiff_t end, struct coding_system *coding) { if (STRINGP (string)) @@ -4880,8 +4946,8 @@ e_write (int desc, Lisp_Object string, EMACS_INT start, EMACS_INT end, } else { - EMACS_INT start_byte = CHAR_TO_BYTE (start); - EMACS_INT end_byte = CHAR_TO_BYTE (end); + ptrdiff_t start_byte = CHAR_TO_BYTE (start); + ptrdiff_t end_byte = CHAR_TO_BYTE (end); coding->src_multibyte = (end - start) < (end_byte - start_byte); if (CODING_REQUIRE_ENCODING (coding)) @@ -4991,9 +5057,10 @@ Next attempt to save will certainly not complain of a discrepancy. */) DEFUN ("visited-file-modtime", Fvisited_file_modtime, Svisited_file_modtime, 0, 0, 0, doc: /* Return the current buffer's recorded visited file modification time. -The value is a list of the form (HIGH LOW), like the time values -that `file-attributes' returns. If the current buffer has no recorded -file modification time, this function returns 0. +The value is a list of the form (HIGH LOW), like the time values that +`file-attributes' returns. If the current buffer has no recorded file +modification time, this function returns 0. If the visited file +doesn't exist, HIGH will be -1. See Info node `(elisp)Modification Time' for more details. */) (void) { @@ -5093,11 +5160,11 @@ auto_save_1 (void) { if (stat (SSDATA (BVAR (current_buffer, filename)), &st) >= 0) /* But make sure we can overwrite it later! */ - auto_save_mode_bits = st.st_mode | 0600; + auto_save_mode_bits = (st.st_mode | 0600) & 0777; else if ((modes = Ffile_modes (BVAR (current_buffer, filename)), INTEGERP (modes))) /* Remote files don't cooperate with stat. */ - auto_save_mode_bits = XINT (modes) | 0600; + auto_save_mode_bits = (XINT (modes) | 0600) & 0777; } return @@ -5164,7 +5231,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) int do_handled_files; Lisp_Object oquit; FILE *stream = NULL; - int count = SPECPDL_INDEX (); + ptrdiff_t count = SPECPDL_INDEX (); int orig_minibuffer_auto_raise = minibuffer_auto_raise; int old_message_p = 0; struct gcpro gcpro1, gcpro2; @@ -5284,7 +5351,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer. */) EMACS_GET_TIME (before_time); /* If we had a failure, don't try again for 20 minutes. */ - if (b->auto_save_failure_time >= 0 + if (b->auto_save_failure_time > 0 && EMACS_SECS (before_time) - b->auto_save_failure_time < 1200) continue; @@ -5363,7 +5430,7 @@ No auto-save file will be written until the buffer changes again. */) they're not autosaved. */ BUF_AUTOSAVE_MODIFF (current_buffer) = MODIFF; XSETFASTINT (BVAR (current_buffer, save_length), Z - BEG); - current_buffer->auto_save_failure_time = -1; + current_buffer->auto_save_failure_time = 0; return Qnil; } @@ -5372,7 +5439,7 @@ DEFUN ("clear-buffer-auto-save-failure", Fclear_buffer_auto_save_failure, doc: /* Clear any record of a recent auto-save failure in the current buffer. */) (void) { - current_buffer->auto_save_failure_time = -1; + current_buffer->auto_save_failure_time = 0; return Qnil; }