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
/
pty.c
diff --git
a/arch/um/drivers/pty.c
b/arch/um/drivers/pty.c
index
0274053
..
bfa08d8
100644
(file)
--- a/
arch/um/drivers/pty.c
+++ b/
arch/um/drivers/pty.c
@@
-7,12
+7,12
@@
#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 "chan_user.h"
#include "user.h"
#include "user_util.h"
#include "kern_util.h"
#include <termios.h>
#include "chan_user.h"
#include "user.h"
#include "user_util.h"
#include "kern_util.h"
+#include "os.h"
struct pty_chan {
void (*announce)(char *dev_name, int dev);
struct pty_chan {
void (*announce)(char *dev_name, int dev);
@@
-26,7
+26,8
@@
void *pty_chan_init(char *str, int device, struct chan_opts *opts)
{
struct pty_chan *data;
{
struct pty_chan *data;
- if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
+ data = um_kmalloc(sizeof(*data));
+ if(data == NULL) return(NULL);
*data = ((struct pty_chan) { .announce = opts->announce,
.dev = device,
.raw = opts->raw });
*data = ((struct pty_chan) { .announce = opts->announce,
.dev = device,
.raw = opts->raw });
@@
-39,7
+40,8
@@
int pts_open(int input, int output, int primary, void *d, char **dev_out)
char *dev;
int fd;
char *dev;
int fd;
- if((fd = get_pty()) < 0){
+ fd = get_pty();
+ if(fd < 0){
printk("open_pts : Failed to open pts\n");
return(-errno);
}
printk("open_pts : Failed to open pts\n");
return(-errno);
}
@@
-57,29
+59,27
@@
int pts_open(int input, int output, int primary, void *d, char **dev_out)
int getmaster(char *line)
{
int getmaster(char *line)
{
- struct stat stb;
char *pty, *bank, *cp;
char *pty, *bank, *cp;
- int master;
+ int master
, err
;
pty = &line[strlen("/dev/ptyp")];
for (bank = "pqrs"; *bank; bank++) {
line[strlen("/dev/pty")] = *bank;
*pty = '0';
pty = &line[strlen("/dev/ptyp")];
for (bank = "pqrs"; *bank; bank++) {
line[strlen("/dev/pty")] = *bank;
*pty = '0';
- if (
stat(line, &stb
) < 0)
+ if (
os_stat_file(line, NULL
) < 0)
break;
for (cp = "0123456789abcdef"; *cp; cp++) {
*pty = *cp;
break;
for (cp = "0123456789abcdef"; *cp; cp++) {
*pty = *cp;
- master = o
pen(line, O_RDWR
);
+ master = o
s_open_file(line, of_rdwr(OPENFLAGS()), 0
);
if (master >= 0) {
char *tp = &line[strlen("/dev/")];
if (master >= 0) {
char *tp = &line[strlen("/dev/")];
- int ok;
/* verify slave side is usable */
*tp = 't';
/* verify slave side is usable */
*tp = 't';
-
ok = access(line, R_OK|W_OK) == 0
;
+
err = os_access(line, OS_ACC_RW_OK)
;
*tp = 'p';
*tp = 'p';
- if
(ok
) return(master);
- (void)
clos
e(master);
+ if
(err == 0
) return(master);
+ (void)
os_close_fil
e(master);
}
}
}
}
}
}