Minor simplification in mutt_socket_readln_d

diff --git a/ChangeLog b/ChangeLog
index 4c3329ddb1940a9fb283e96eb190edd32ffc9258..8873bc3217af64bccaafa5c280c62b54b9ba4168 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-10-07 15:27 -0700  Brendan Cully  <brendan@kublai.com>  (d13106731007)
+
+       * mutt_idna.c, mutt_idna.h: Build no-op versions of new IDN functions
+       if IDN is unavailable. Closes #3122, #3123.
+
+2008-10-01 09:33 -0700  Brendan Cully  <brendan@kublai.com>  (13a831a945be)
+
+       * configure.ac: Clean up autoconf header cache engine selection.
+
+       Any explicit --with-$engine will force that engine to be used or
+       make configure fail if the engine is unavailable.
+
 2008-09-29 14:31 -0700  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (ec96c56be182)
 
        * mutt_socket.c: Simplify host resolution code slightly.

diff --git a/mutt_socket.c b/mutt_socket.c
index 4d9f499d467256842bc834dc4390f8bc6d13a7b1..8a8874c452a78007312a7c580e477e656e3ab561 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -205,9 +205,8 @@ int mutt_socket_readln_d (char* buf, size_t buflen, CONNECTION* conn, int dbg)
 
   /* strip \r from \r\n termination */
   if (i && buf[i-1] == '\r')
-    buf[--i] = '\0';
-  else
-    buf[i] = '\0';
+    i--;
+  buf[i] = '\0';
 
   dprint (dbg, (debugfile, "%d< %s\n", conn->fd, buf));