Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0ca43699
Commit
0ca43699
authored
Feb 13, 2012
by
Andreas Schwab
Browse files
* gnutls.c (emacs_gnutls_write): Fix last change.
parent
5f0af64f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
14 deletions
+21
-14
src/ChangeLog
src/ChangeLog
+4
-0
src/gnutls.c
src/gnutls.c
+17
-14
No files found.
src/ChangeLog
View file @
0ca43699
2012-02-13 Andreas Schwab <schwab@linux-m68k.org>
* gnutls.c (emacs_gnutls_write): Fix last change.
2012-02-13 Lars Ingebrigtsen <larsi@gnus.org>
* gnutls.c (emacs_gnutls_write): Set errno appropriately for
...
...
src/gnutls.c
View file @
0ca43699
...
...
@@ -345,15 +345,16 @@ emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte)
EMACS_INT
bytes_written
;
gnutls_session_t
state
=
proc
->
gnutls_state
;
if
(
proc
->
gnutls_initstage
!=
GNUTLS_STAGE_READY
)
{
if
(
proc
->
gnutls_initstage
!=
GNUTLS_STAGE_READY
)
{
#ifdef EWOULDBLOCK
errno
=
EWOULDBLOCK
;
errno
=
EWOULDBLOCK
;
#endif
#ifdef EAGAIN
errno
=
EAGAIN
;
errno
=
EAGAIN
;
#endif
return
0
;
}
return
0
;
}
bytes_written
=
0
;
...
...
@@ -365,20 +366,22 @@ emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT nbyte)
{
if
(
rtnval
==
GNUTLS_E_INTERRUPTED
)
continue
;
else
{
/* If we get EAGAIN, then set errno appropriately so that
send_process retries the correct way instead of
erroring out. */
if
(
rtnval
==
EAGAIN
)
{
else
{
/* If we get GNUTLS_E_AGAIN, then set errno
appropriately so that send_process retries the
correct way instead of erroring out. */
if
(
rtnval
==
GNUTLS_E_AGAIN
)
{
#ifdef EWOULDBLOCK
errno
=
EWOULDBLOCK
;
errno
=
EWOULDBLOCK
;
#endif
#ifdef EAGAIN
errno
=
EAGAIN
;
errno
=
EAGAIN
;
#endif
}
break
;
}
break
;
}
}
buf
+=
rtnval
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment