[vttest/el6/master] New patch from dkutalek at redhat.com (also sent upstream), update to new version

Adam Miller maxamillion at fedoraproject.org
Tue Apr 5 15:47:45 UTC 2011


commit 4d5c521ed3fb704c929a63eeeaeee64bd333fd63
Author: Adam Miller <maxamillion at fedoraproject.org>
Date:   Tue Apr 5 10:47:03 2011 -0500

    New patch from dkutalek at redhat.com (also sent upstream), update to new version

 .gitignore             |    1 +
 20100830_unix_io.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 sources                |    2 +-
 3 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f0473c..6ccdd54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vttest-20071216.tgz
+/vttest-20100830.tgz
diff --git a/20100830_unix_io.patch b/20100830_unix_io.patch
new file mode 100644
index 0000000..d0a5fbc
--- /dev/null
+++ b/20100830_unix_io.patch
@@ -0,0 +1,44 @@
+--- ./unix_io.c.orig    2011-03-29 06:17:19.000000000 -0400
++++ ./unix_io.c 2011-03-29 06:27:52.000000000 -0400
+@@ -34,6 +34,7 @@
+ {
+   int lval;
+   int ch = '\0';
++  char one_byte = '\0';
+
+   fflush(stdout);
+   lval = last_char;
+@@ -43,8 +44,10 @@
+   signal(SIGALRM, give_up);
+   alarm(60);    /* timeout after 1 minute, in case user's keyboard is hung */
+ #endif
+-  if (read(0, &ch, (size_t) 1) < 0)
++  if (read(0, &one_byte, (size_t) 1) < 0)
+     ch = EOF;
++  else
++    ch = (int) one_byte;
+ #ifdef HAVE_ALARM
+   alarm(0);
+ #endif
+@@ -204,15 +207,19 @@
+ readnl(void)
+ {
+   int ch = '\0';
++  char one_byte = '\0';
+
+   fflush(stdout);
+   brkrd = FALSE;
+   reading = TRUE;
+   do {
+-    if (read(0, &ch, (size_t) 1) < 0) {
++    if (read(0, &one_byte, (size_t) 1) < 0) {
+       ch = EOF;
+       break;
+     }
++    else {
++      ch = (int) one_byte;
++    }
+   } while (ch != '\n' && !brkrd);
+   if (brkrd)
+     give_up(SIGTERM);
+
diff --git a/sources b/sources
index 284f89b..f46882b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-490cebc85e531c833dcf14c32790184b  vttest-20071216.tgz
+17c5e669699b489a97510536df878de1  vttest-20100830.tgz


More information about the scm-commits mailing list