1 files changed, 23 insertions, 32 deletions

diff --git a/src/fileio.c b/src/fileio.c
index a109737240f..38400623793 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2030,9 +2030,9 @@ permissions.  */)
     {
       char buf[MAX_ALLOCA];
       ptrdiff_t n;
-      for (newsize = 0; 0 < (n = emacs_read (ifd, buf, sizeof buf));
+      for (newsize = 0; 0 < (n = emacs_read_quit (ifd, buf, sizeof buf));
            newsize += n)
-        if (emacs_write_sig (ofd, buf, n) != n)
+        if (emacs_write_quit (ofd, buf, n) != n)
           report_file_error ("Write error", newname);
       if (n < 0)
         report_file_error ("Read error", file);
@@ -3396,13 +3396,10 @@ decide_coding_unwind (Lisp_Object unwind_data)
 static Lisp_Object
 read_non_regular (Lisp_Object state)
 {
-  int nbytes;
-
-  maybe_quit ();
-  nbytes = emacs_read (XSAVE_INTEGER (state, 0),
-                       ((char *) BEG_ADDR + PT_BYTE - BEG_BYTE
-                        + XSAVE_INTEGER (state, 1)),
-                       XSAVE_INTEGER (state, 2));
+  int nbytes = emacs_read_quit (XSAVE_INTEGER (state, 0),
+                                ((char *) BEG_ADDR + PT_BYTE - BEG_BYTE
+                                 + XSAVE_INTEGER (state, 1)),
+                                XSAVE_INTEGER (state, 2));
   /* Fast recycle this object for the likely next call.  */
   free_misc (state);
   return make_number (nbytes);
@@ -3746,17 +3743,17 @@ by calling `format-decode', which see.  */)
               int nread;
 
               if (st.st_size <= (1024 * 4))
-                nread = emacs_read (fd, read_buf, 1024 * 4);
+                nread = emacs_read_quit (fd, read_buf, 1024 * 4);
               else
                 {
-                  nread = emacs_read (fd, read_buf, 1024);
+                  nread = emacs_read_quit (fd, read_buf, 1024);
                   if (nread == 1024)
                     {
                       int ntail;
                       if (lseek (fd, - (1024 * 3), SEEK_END) < 0)
                         report_file_error ("Setting file position",
                                            orig_filename);
-                      ntail = emacs_read (fd, read_buf + nread, 1024 * 3);
+                      ntail = emacs_read_quit (fd, read_buf + nread, 1024 * 3);
                       nread = ntail < 0 ? ntail : nread + ntail;
                     }
                 }
@@ -3861,14 +3858,11 @@ by calling `format-decode', which see.  */)
             report_file_error ("Setting file position", orig_filename);
         }
 
-      maybe_quit ();
       /* Count how many chars at the start of the file
          match the text at the beginning of the buffer.  */
-      while (1)
+      while (true)
         {
-          int nread, bufpos;
-
-          nread = emacs_read (fd, read_buf, sizeof read_buf);
+          int nread = emacs_read_quit (fd, read_buf, sizeof read_buf);
           if (nread < 0)
             report_file_error ("Read error", orig_filename);
           else if (nread == 0)
@@ -3890,7 +3884,7 @@ by calling `format-decode', which see.  */)
               break;
             }
 
-          bufpos = 0;
+          int bufpos = 0;
           while (bufpos < nread && same_at_start < ZV_BYTE
                  && FETCH_BYTE (same_at_start) == read_buf[bufpos])
             same_at_start++, bufpos++;
@@ -3910,7 +3904,7 @@ by calling `format-decode', which see.  */)
           del_range_1 (same_at_start, same_at_end, 0, 0);
           goto handled;
         }
-      maybe_quit ();
+
       /* Count how many chars at the end of the file
          match the text at the end of the buffer.  But, if we have
          already found that decoding is necessary, don't waste time.  */
@@ -3932,7 +3926,8 @@ by calling `format-decode', which see.  */)
           total_read = nread = 0;
           while (total_read < trial)
             {
-              nread = emacs_read (fd, read_buf + total_read, trial - total_read);
+              nread = emacs_read_quit (fd, read_buf + total_read,
+                                       trial - total_read);
               if (nread < 0)
                 report_file_error ("Read error", orig_filename);
               else if (nread == 0)
@@ -4058,16 +4053,13 @@ by calling `format-decode', which see.  */)
       inserted = 0;             /* Bytes put into CONVERSION_BUFFER so far.  */
       unprocessed = 0;          /* Bytes not processed in previous loop.  */
 
-      while (1)
+      while (true)
         {
           /* Read at most READ_BUF_SIZE bytes at a time, to allow
              quitting while reading a huge file.  */
 
-          /* Allow quitting out of the actual I/O.  */
-          maybe_quit ();
-          this = emacs_read (fd, read_buf + unprocessed,
-                             READ_BUF_SIZE - unprocessed);
-
+          this = emacs_read_quit (fd, read_buf + unprocessed,
+                                  READ_BUF_SIZE - unprocessed);
           if (this <= 0)
             break;
 
@@ -4281,11 +4273,10 @@ by calling `format-decode', which see.  */)
             /* Allow quitting out of the actual I/O.  We don't make text
                part of the buffer until all the reading is done, so a C-g
                here doesn't do any harm.  */
-            maybe_quit ();
-            this = emacs_read (fd,
-                               ((char *) BEG_ADDR + PT_BYTE - BEG_BYTE
-                                + inserted),
-                               trytry);
+            this = emacs_read_quit (fd,
+                                    ((char *) BEG_ADDR + PT_BYTE - BEG_BYTE
+                                     + inserted),
+                                    trytry);
           }
 
         if (this <= 0)
@@ -5398,7 +5389,7 @@ e_write (int desc, Lisp_Object string, ptrdiff_t start, ptrdiff_t end,
                        : (STRINGP (coding->dst_object)
                           ? SSDATA (coding->dst_object)
                           : (char *) BYTE_POS_ADDR (coding->dst_pos_byte)));
-          coding->produced -= emacs_write_sig (desc, buf, coding->produced);
+          coding->produced -= emacs_write_quit (desc, buf, coding->produced);
 
           if (coding->raw_destination)
             {