debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI/insert: split copy_fd

Browse source 
This helps maintainability and enables code-reuse of our home-brewed
buffered-write code.

This commit is mostly code movement.
This commit is contained in:
David Bremner 2022-02-13 10:48:47 -04:00
parent 4a380371e7
commit 329bb4ddf4
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
notmuch-insert.c
View file

@ -241,6 +241,26 @@ maildir_mktemp (const void *ctx, const char *maildir, bool world_readable, char
return fd; return fd;
} }
static bool
write_buf (const char *buf, int fdout, ssize_t remain)
{
const char *p = buf;
do {
ssize_t written = write (fdout, p, remain);
if (written < 0 && errno == EINTR)
continue;
if (written <= 0) {
fprintf (stderr, "Error: writing to temporary file: %s",
strerror (errno));
return false;
}
p += written;
remain -= written;
} while (remain > 0);
return true;
}
/* /*
* Copy fdin to fdout, return true on success, and false on errors and * Copy fdin to fdout, return true on success, and false on errors and
* empty input. * empty input.
@ -253,7 +273,6 @@ copy_fd (int fdout, int fdin)
while (! interrupted) { while (! interrupted) {
ssize_t remain; ssize_t remain;
char buf[4096]; char buf[4096];
char *p;
remain = read (fdin, buf, sizeof (buf)); remain = read (fdin, buf, sizeof (buf));
if (remain == 0) if (remain == 0)
@ -265,21 +284,9 @@ copy_fd (int fdout, int fdin)
strerror (errno)); strerror (errno));
return false; return false;
} }
if (! write_buf (buf, fdout, remain))
p = buf; return false;
do { empty = false;
ssize_t written = write (fdout, p, remain);
if (written < 0 && errno == EINTR)
continue;
if (written <= 0) {
fprintf (stderr, "Error: writing to temporary file: %s",
strerror (errno));
return false;
}
p += written;
remain -= written;
empty = false;
} while (remain > 0);
} }
return (! interrupted && ! empty); return (! interrupted && ! empty);