Changeset 228 for branches/samba-3.2.x/source/lib/readline.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/lib/readline.c (modified) (3 diffs)

branches/samba-3.2.x/source/lib/readline.c

@@ -46 +46 @@
 #endif /* HAVE_NEW_LIBREADLINE */
 
+static bool smb_rl_done;
+
+#if HAVE_LIBREADLINE
+/*
+ *  * MacOS/X does not have rl_done in readline.h, but
+ *   * readline.so has it
+ *    */
+extern int rl_done;
+#endif
+
+void smb_readline_done(void)
+{
+        smb_rl_done = true;
+#if HAVE_LIBREADLINE
+        rl_done = 1;
+#endif
+}
+
 /****************************************************************************
  Display the prompt and wait for input. Call callback() regularly
@@ -70 +88 @@
         }
 
-        while (1) {
+        while (!smb_rl_done) {
                 timeout.tv_sec = 5;
                 timeout.tv_usec = 0;
@@ -88 +106 @@
                 }
         }
+        SAFE_FREE(line);
+        return NULL;
 }