callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ack, fix a small logic bug.

Browse Source 
svn path=/trunk/; revision=15131
This commit is contained in:
Jeffrey Stedfast
2001-12-17 19:50:35 +00:00
parent 9ed571f9de
commit 1b8e8b861e
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
composer/e-msg-composer.c
View File

@ -674,38 +674,33 @@ read_file_content (int fd)
char *body, buf[4096]; char *body, buf[4096];
struct timeval tv; struct timeval tv;
fd_set rdset; fd_set rdset;
int retval;
ssize_t n; ssize_t n;
int flags;
g_return_val_if_fail (fd > 0, NULL); g_return_val_if_fail (fd > 0, NULL);
contents = g_byte_array_new (); contents = g_byte_array_new ();
flags = fcntl (fd, F_GETFL);
fcntl (fd, F_SETFL, flags | O_NONBLOCK);
FD_ZERO (&rdset); FD_ZERO (&rdset);
FD_SET (fd, &rdset); FD_SET (fd, &rdset);
do { tv.tv_sec = 0;
tv.tv_sec = 0; tv.tv_usec = 10;
tv.tv_usec = 10;
retval = select (fd + 1, &rdset, NULL, NULL, &tv);
n = -1; if (retval) {
select (fd + 1, &rdset, NULL, NULL, &tv); n = 0;
if (FD_ISSET (fd, &rdset)) { while (n >= 0 || errno == EINTR) {
n = read (fd, buf, 4096); n = read (fd, buf, sizeof (buf));
if (n > 0) if (n > 0)
g_byte_array_append (contents, buf, n); g_byte_array_append (contents, buf, n);
} }
} while (n != -1); }
fcntl (fd, F_SETFL, flags);
g_byte_array_append (contents, "", 1); g_byte_array_append (contents, "", 1);
body = (contents->len == 1) ? NULL : (char *) contents->data; body = (contents->len == 1) ? NULL : (char *) contents->data;
g_byte_array_free (contents, body != NULL); g_byte_array_free (contents, body == NULL);
return body; return body;
} }