git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
um
/
drivers
/
xterm.c
diff --git
a/arch/um/drivers/xterm.c
b/arch/um/drivers/xterm.c
index
93dc191
..
aaa6366
100644
(file)
--- a/
arch/um/drivers/xterm.c
+++ b/
arch/um/drivers/xterm.c
@@
-14,7
+14,6
@@
#include <sys/socket.h>
#include "kern_util.h"
#include "chan_user.h"
#include <sys/socket.h>
#include "kern_util.h"
#include "chan_user.h"
-#include "helper.h"
#include "user_util.h"
#include "user.h"
#include "os.h"
#include "user_util.h"
#include "user.h"
#include "os.h"
@@
-110,13
+109,15
@@
int xterm_open(int input, int output, int primary, void *d,
fd = mkstemp(file);
if(fd < 0){
fd = mkstemp(file);
if(fd < 0){
+ err = -errno;
printk("xterm_open : mkstemp failed, errno = %d\n", errno);
printk("xterm_open : mkstemp failed, errno = %d\n", errno);
- return
(-errno)
;
+ return
err
;
}
if(unlink(file)){
}
if(unlink(file)){
+ err = -errno;
printk("xterm_open : unlink failed, errno = %d\n", errno);
printk("xterm_open : unlink failed, errno = %d\n", errno);
- return
(-errno)
;
+ return
err
;
}
os_close_file(fd);
}
os_close_file(fd);
@@
-193,13
+194,6
@@
static void xterm_free(void *d)
free(d);
}
free(d);
}
-static int xterm_console_write(int fd, const char *buf, int n, void *d)
-{
- struct xterm_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
-}
-
struct chan_ops xterm_ops = {
.type = "xterm",
.init = xterm_init,
struct chan_ops xterm_ops = {
.type = "xterm",
.init = xterm_init,
@@
-207,7
+201,7
@@
struct chan_ops xterm_ops = {
.close = xterm_close,
.read = generic_read,
.write = generic_write,
.close = xterm_close,
.read = generic_read,
.write = generic_write,
- .console_write =
xterm
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = xterm_free,
.winch = 1,
.window_size = generic_window_size,
.free = xterm_free,
.winch = 1,