Changeset 249

Timestamp:

04/30/08 11:40:51 (7 months ago)

Author:

conrad

Message:

When stdout is a tty, use stderr to ensure there is a newline before
the shell prompt.

(Modified) patch from Yair K.:

If the used selection does not end with a newline, then:

A) If 'xsel -o' than the command prompt may overwrite the last line (depends

on $PS1, shell, etc. but I think quite likely to happen)

B) 'xsel -a -o -i' doesn't display the last line (on Linux at least). The

last line will still exist after appending, but it isn't displayed. This is
(I suspect) because stdout is line-buffered, so stdout isn't flushed yet.

Files:

• xsel/trunk/xsel.c (modified) (2 diffs)

xsel/trunk/xsel.c

@@ -2159 +2159 @@
-    /* Get the current selection */
-    old_sel = get_selection_text (selection);
-
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -2169 +2178 @@
-  }
-  else if (do_input || !dont_input) {
+    if ((do_output || !dont_output) && isatty(1)) fflush (stdout);
-    if (do_append) {
-      if (!old_sel) old_sel = get_selection_text (selection);