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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
um
/
drivers
/
xterm.c
diff --git
a/arch/um/drivers/xterm.c
b/arch/um/drivers/xterm.c
index
59c4ba8
..
dccdf3e
100644
(file)
--- a/
arch/um/drivers/xterm.c
+++ b/
arch/um/drivers/xterm.c
@@
-8,7
+8,6
@@
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <fcntl.h>
#include <termios.h>
#include <signal.h>
#include <sched.h>
#include <termios.h>
#include <signal.h>
#include <sched.h>
@@
-36,7
+35,8
@@
void *xterm_init(char *str, int device, struct chan_opts *opts)
{
struct xterm_chan *data;
{
struct xterm_chan *data;
- if((data = malloc(sizeof(*data))) == NULL) return(NULL);
+ data = malloc(sizeof(*data));
+ if(data == NULL) return(NULL);
*data = ((struct xterm_chan) { .pid = -1,
.helper_pid = -1,
.device = device,
*data = ((struct xterm_chan) { .pid = -1,
.helper_pid = -1,
.device = device,
@@
-93,7
+93,7
@@
int xterm_open(int input, int output, int primary, void *d, char **dev_out)
"/usr/lib/uml/port-helper", "-uml-socket",
file, NULL };
"/usr/lib/uml/port-helper", "-uml-socket",
file, NULL };
- if(
access(argv[4], X_OK)
)
+ if(
os_access(argv[4], OS_ACC_X_OK) < 0
)
argv[4] = "port-helper";
fd = mkstemp(file);
argv[4] = "port-helper";
fd = mkstemp(file);
@@
-106,13
+106,13
@@
int xterm_open(int input, int output, int primary, void *d, char **dev_out)
printk("xterm_open : unlink failed, errno = %d\n", errno);
return(-errno);
}
printk("xterm_open : unlink failed, errno = %d\n", errno);
return(-errno);
}
-
clos
e(fd);
+
os_close_fil
e(fd);
- fd =
create_unix_socket(file, sizeof(file)
);
+ fd =
os_create_unix_socket(file, sizeof(file), 1
);
if(fd < 0){
printk("xterm_open : create_unix_socket failed, errno = %d\n",
-fd);
if(fd < 0){
printk("xterm_open : create_unix_socket failed, errno = %d\n",
-fd);
- return(
-
fd);
+ return(fd);
}
sprintf(title, data->title, data->device);
}
sprintf(title, data->title, data->device);
@@
-128,15
+128,16
@@
int xterm_open(int input, int output, int primary, void *d, char **dev_out)
if(data->direct_rcv)
new = os_rcv_fd(fd, &data->helper_pid);
else {
if(data->direct_rcv)
new = os_rcv_fd(fd, &data->helper_pid);
else {
- if((err = os_set_fd_block(fd, 0)) != 0){
+ err = os_set_fd_block(fd, 0);
+ if(err < 0){
printk("xterm_open : failed to set descriptor "
printk("xterm_open : failed to set descriptor "
- "non-blocking, err
no = %d\n",
err);
+ "non-blocking, err
= %d\n", -
err);
return(err);
}
new = xterm_fd(fd, &data->helper_pid);
}
if(new < 0){
return(err);
}
new = xterm_fd(fd, &data->helper_pid);
}
if(new < 0){
- printk("xterm_open : os_rcv_fd failed, err
no
= %d\n", -new);
+ printk("xterm_open : os_rcv_fd failed, err = %d\n", -new);
goto out;
}
goto out;
}
@@
-160,7
+161,7
@@
void xterm_close(int fd, void *d)
if(data->helper_pid != -1)
os_kill_process(data->helper_pid, 0);
data->helper_pid = -1;
if(data->helper_pid != -1)
os_kill_process(data->helper_pid, 0);
data->helper_pid = -1;
-
clos
e(fd);
+
os_close_fil
e(fd);
}
void xterm_free(void *d)
}
void xterm_free(void *d)