sparc32: pass -m32 when building vmlinux.lds

[linux-2.6-omap-h63xx.git] / arch / um / drivers / pty.c

diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index df4976c9eef223df0f94ca1a27c5aec800b08467..1113911dcb2bfb70696785ac194089705c9c8693 100644 (file)
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -1,19 +1,21 @@
-/* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+/*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <string.h>
 #include <termios.h>
+#include <sys/stat.h>
 #include "chan_user.h"
-#include "user.h"
-#include "kern_util.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "um_malloc.h"
+#include "user.h"
 
 struct pty_chan {
        void (*announce)(char *dev_name, int dev);
@@ -27,12 +29,14 @@ static void *pty_chan_init(char *str, int device, const struct chan_opts *opts)
 {
        struct pty_chan *data;
 
-       data = um_kmalloc(sizeof(*data));
-       if(data == NULL) return(NULL);
-       *data = ((struct pty_chan) { .announce          = opts->announce, 
+       data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
+       if (data == NULL)
+               return NULL;
+
+       *data = ((struct pty_chan) { .announce          = opts->announce,
                                     .dev               = device,
                                     .raw               = opts->raw });
-       return(data);
+       return data;
 }
 
 static int pts_open(int input, int output, int primary, void *d,
@@ -43,31 +47,39 @@ static int pts_open(int input, int output, int primary, void *d,
        int fd, err;
 
        fd = get_pty();
-       if(fd < 0){
+       if (fd < 0) {
                err = -errno;
-               printk("open_pts : Failed to open pts\n");
+               printk(UM_KERN_ERR "open_pts : Failed to open pts\n");
                return err;
        }
-       if(data->raw){
+
+       if (data->raw) {
                CATCH_EINTR(err = tcgetattr(fd, &data->tt));
-               if(err)
-                       return(err);
+               if (err)
+                       goto out_close;
 
                err = raw(fd);
-               if(err)
-                       return(err);
+               if (err)
+                       goto out_close;
        }
 
        dev = ptsname(fd);
        sprintf(data->dev_name, "%s", dev);
        *dev_out = data->dev_name;
+
        if (data->announce)
                (*data->announce)(dev, data->dev);
-       return(fd);
+
+       return fd;
+
+out_close:
+       close(fd);
+       return err;
 }
 
 static int getmaster(char *line)
 {
+       struct stat buf;
        char *pty, *bank, *cp;
        int master, err;
 
@@ -75,24 +87,29 @@ static int getmaster(char *line)
        for (bank = "pqrs"; *bank; bank++) {
                line[strlen("/dev/pty")] = *bank;
                *pty = '0';
-               if (os_stat_file(line, NULL) < 0)
+               /* Did we hit the end ? */
+               if ((stat(line, &buf) < 0) && (errno == ENOENT))
                        break;
+
                for (cp = "0123456789abcdef"; *cp; cp++) {
                        *pty = *cp;
-                       master = os_open_file(line, of_rdwr(OPENFLAGS()), 0);
+                       master = open(line, O_RDWR);
                        if (master >= 0) {
                                char *tp = &line[strlen("/dev/")];
 
                                /* verify slave side is usable */
                                *tp = 't';
-                               err = os_access(line, OS_ACC_RW_OK);
+                               err = access(line, R_OK | W_OK);
                                *tp = 'p';
-                               if(err == 0) return(master);
-                               (void) os_close_file(master);
+                               if (!err)
+                                       return master;
+                               close(master);
                        }
                }
        }
-       return(-1);
+
+       printk(UM_KERN_ERR "getmaster - no usable host pty devices\n");
+       return -ENOENT;
 }
 
 static int pty_open(int input, int output, int primary, void *d,
@@ -103,20 +120,24 @@ static int pty_open(int input, int output, int primary, void *d,
        char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
 
        fd = getmaster(dev);
-       if(fd < 0)
-               return(-errno);
+       if (fd < 0)
+               return fd;
 
-       if(data->raw){
+       if (data->raw) {
                err = raw(fd);
-               if(err)
-                       return(err);
+               if (err) {
+                       close(fd);
+                       return err;
+               }
        }
-       
-       if(data->announce) (*data->announce)(dev, data->dev);
+
+       if (data->announce)
+               (*data->announce)(dev, data->dev);
 
        sprintf(data->dev_name, "%s", dev);
        *dev_out = data->dev_name;
-       return(fd);
+
+       return fd;
 }
 
 const struct chan_ops pty_ops = {
@@ -144,14 +165,3 @@ const struct chan_ops pts_ops = {
        .free           = generic_free,
        .winch          = 0,
 };
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */