aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstaffcvs <>2008-03-02 10:50:32 +0000
committerstaffcvs <>2008-03-02 10:50:32 +0000
commitf1258ba9a13fd175b0db51aac7717c4f71f557ea (patch)
tree134c305c00a1bafdc395d94fa1965c4eac6805a1
parentef21e0368adf8ae0e557e9c02fe776f69818ace6 (diff)
downloadsympathy-f1258ba9a13fd175b0db51aac7717c4f71f557ea.tar.gz
sympathy-f1258ba9a13fd175b0db51aac7717c4f71f557ea.tar.bz2
sympathy-f1258ba9a13fd175b0db51aac7717c4f71f557ea.zip
*** empty log message ***
-rw-r--r--src/ansi.c7
-rw-r--r--src/cmd.c4
-rw-r--r--src/util.c5
3 files changed, 12 insertions, 4 deletions
diff --git a/src/ansi.c b/src/ansi.c
index 6ca75b7..b9c4984 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.40 2008/03/02 10:50:32 staffcvs
+ * *** empty log message ***
+ *
* Revision 1.39 2008/03/02 10:37:56 james
* *** empty log message ***
*
@@ -673,13 +676,11 @@ ansi_terminal_reset (ANSI * a)
int
ansi_key (ANSI * a, Context * c, int key)
{
-
if (!c->d)
return c->k->key (c->k, c, key);
cmd_show_status (c->d, c);
-
if (c->d->active) {
if (key == CMD_KEY) {
cmd_deactivate (c->d, c);
@@ -690,7 +691,6 @@ ansi_key (ANSI * a, Context * c, int key)
return cmd_activate (c->d, c);
}
-
return c->k->key (c->k, c, key);
}
@@ -909,7 +909,6 @@ ansi_free (ANSI * a)
a->terminal->close (a->terminal);
free (a);
-
}
ANSI *
diff --git a/src/cmd.c b/src/cmd.c
index 4629610..aa1c272 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.10 2008/03/02 10:50:32 staffcvs
+ * *** empty log message ***
+ *
* Revision 1.9 2008/03/02 10:37:56 james
* *** empty log message ***
*
@@ -173,5 +176,6 @@ cmd_new (void)
ret->disconnect = 0;
ret->active = 0;
+ ret->error = 0;
ret->csl[0] = 0;
}
diff --git a/src/util.c b/src/util.c
index 91cb58b..d63c142 100644
--- a/src/util.c
+++ b/src/util.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.8 2008/03/02 10:50:32 staffcvs
+ * *** empty log message ***
+ *
* Revision 1.7 2008/02/27 01:31:14 james
* *** empty log message ***
*
@@ -41,8 +44,10 @@ wrap_read (int fd, void *buf, int len)
int red;
red = read (fd, buf, len);
+#if 0
if (!red)
return -1;
+#endif
if ((red < 0) && (errno == EAGAIN))
red = 0;