Skip to content

L
linux
Commit 355d95a1 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

tty_ioctl: drag screaming into compliance with the coding style 

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37bdfb07
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 182 deletions
drivers/char/tty_ioctl.c
View file @ 355d95a1
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* Locking: none * Locking: none
*/ */
void tty_wait_until_sent(struct tty_struct * tty, long timeout) void tty_wait_until_sent(struct tty_struct *tty, long timeout)
{ {
#ifdef TTY_DEBUG_WAIT_UNTIL_SENT #ifdef TTY_DEBUG_WAIT_UNTIL_SENT
char buf[64]; char buf[64];
...@@ -67,7 +67,6 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout) ...@@ -67,7 +67,6 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout)
if (tty->driver->wait_until_sent) if (tty->driver->wait_until_sent)
tty->driver->wait_until_sent(tty, timeout); tty->driver->wait_until_sent(tty, timeout);
} }
EXPORT_SYMBOL(tty_wait_until_sent); EXPORT_SYMBOL(tty_wait_until_sent);
static void unset_locked_termios(struct ktermios *termios, static void unset_locked_termios(struct ktermios *termios,
...@@ -76,7 +75,7 @@ static void unset_locked_termios(struct ktermios *termios, ...@@ -76,7 +75,7 @@ static void unset_locked_termios(struct ktermios *termios,
{ {
int i; int i;
#define NOSET_MASK(x,y,z) (x = ((x) & ~(z)) | ((y) & (z))) #define NOSET_MASK(x, y, z) (x = ((x) & ~(z)) | ((y) & (z)))
if (!locked) { if (!locked) {
printk(KERN_WARNING "Warning?!? termios_locked is NULL.\n"); printk(KERN_WARNING "Warning?!? termios_locked is NULL.\n");
...@@ -88,7 +87,7 @@ static void unset_locked_termios(struct ktermios *termios, ...@@ -88,7 +87,7 @@ static void unset_locked_termios(struct ktermios *termios,
NOSET_MASK(termios->c_cflag, old->c_cflag, locked->c_cflag); NOSET_MASK(termios->c_cflag, old->c_cflag, locked->c_cflag);
NOSET_MASK(termios->c_lflag, old->c_lflag, locked->c_lflag); NOSET_MASK(termios->c_lflag, old->c_lflag, locked->c_lflag);
termios->c_line = locked->c_line ? old->c_line : termios->c_line; termios->c_line = locked->c_line ? old->c_line : termios->c_line;
for (i=0; i < NCCS; i++) for (i = 0; i < NCCS; i++)
termios->c_cc[i] = locked->c_cc[i] ? termios->c_cc[i] = locked->c_cc[i] ?
old->c_cc[i] : termios->c_cc[i]; old->c_cc[i] : termios->c_cc[i];
/* FIXME: What should we do for i/ospeed */ /* FIXME: What should we do for i/ospeed */
...@@ -163,7 +162,6 @@ speed_t tty_termios_baud_rate(struct ktermios *termios) ...@@ -163,7 +162,6 @@ speed_t tty_termios_baud_rate(struct ktermios *termios)
} }
return baud_table[cbaud]; return baud_table[cbaud];
} }
EXPORT_SYMBOL(tty_termios_baud_rate); EXPORT_SYMBOL(tty_termios_baud_rate);
/** /**
...@@ -203,7 +201,6 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios) ...@@ -203,7 +201,6 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios)
return tty_termios_baud_rate(termios); return tty_termios_baud_rate(termios);
#endif #endif
} }
EXPORT_SYMBOL(tty_termios_input_baud_rate); EXPORT_SYMBOL(tty_termios_input_baud_rate);
/** /**
...@@ -338,7 +335,6 @@ speed_t tty_get_baud_rate(struct tty_struct *tty) ...@@ -338,7 +335,6 @@ speed_t tty_get_baud_rate(struct tty_struct *tty)
return baud; return baud;
} }
EXPORT_SYMBOL(tty_get_baud_rate); EXPORT_SYMBOL(tty_get_baud_rate);
/** /**
...@@ -361,7 +357,6 @@ void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old) ...@@ -361,7 +357,6 @@ void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old)
new->c_ispeed = old->c_ispeed; new->c_ispeed = old->c_ispeed;
new->c_ospeed = old->c_ospeed; new->c_ospeed = old->c_ospeed;
} }
EXPORT_SYMBOL(tty_termios_copy_hw); EXPORT_SYMBOL(tty_termios_copy_hw);
/** /**
...@@ -395,7 +390,7 @@ EXPORT_SYMBOL(tty_termios_hw_change); ...@@ -395,7 +390,7 @@ EXPORT_SYMBOL(tty_termios_hw_change);
* Locking: termios_sem * Locking: termios_sem
*/ */
static void change_termios(struct tty_struct * tty, struct ktermios * new_termios) static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
{ {
int canon_change; int canon_change;
struct ktermios old_termios = *tty->termios; struct ktermios old_termios = *tty->termios;
...@@ -470,7 +465,7 @@ static void change_termios(struct tty_struct * tty, struct ktermios * new_termio ...@@ -470,7 +465,7 @@ static void change_termios(struct tty_struct * tty, struct ktermios * new_termio
* Called functions take ldisc and termios_sem locks * Called functions take ldisc and termios_sem locks
*/ */
static int set_termios(struct tty_struct * tty, void __user *arg, int opt) static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
{ {
struct ktermios tmp_termios; struct ktermios tmp_termios;
struct tty_ldisc *ld; struct tty_ldisc *ld;
...@@ -501,8 +496,8 @@ static int set_termios(struct tty_struct * tty, void __user *arg, int opt) ...@@ -501,8 +496,8 @@ static int set_termios(struct tty_struct * tty, void __user *arg, int opt)
return -EFAULT; return -EFAULT;
#endif #endif
/* If old style Bfoo values are used then load c_ispeed/c_ospeed with the real speed /* If old style Bfoo values are used then load c_ispeed/c_ospeed
so its unconditionally usable */ * with the real speed so its unconditionally usable */
tmp_termios.c_ispeed = tty_termios_input_baud_rate(&tmp_termios); tmp_termios.c_ispeed = tty_termios_input_baud_rate(&tmp_termios);
tmp_termios.c_ospeed = tty_termios_baud_rate(&tmp_termios); tmp_termios.c_ospeed = tty_termios_baud_rate(&tmp_termios);
...@@ -529,14 +524,14 @@ static int set_termios(struct tty_struct * tty, void __user *arg, int opt) ...@@ -529,14 +524,14 @@ static int set_termios(struct tty_struct * tty, void __user *arg, int opt)
return 0; return 0;
} }
static int get_termio(struct tty_struct * tty, struct termio __user * termio) static int get_termio(struct tty_struct *tty, struct termio __user *termio)
{ {
if (kernel_termios_to_user_termio(termio, tty->termios)) if (kernel_termios_to_user_termio(termio, tty->termios))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
static unsigned long inq_canon(struct tty_struct * tty) static unsigned long inq_canon(struct tty_struct *tty)
{ {
int nr, head, tail; int nr, head, tail;
...@@ -561,7 +556,7 @@ static unsigned long inq_canon(struct tty_struct * tty) ...@@ -561,7 +556,7 @@ static unsigned long inq_canon(struct tty_struct * tty)
* *
* The "sg_flags" translation is a joke.. * The "sg_flags" translation is a joke..
*/ */
static int get_sgflags(struct tty_struct * tty) static int get_sgflags(struct tty_struct *tty)
{ {
int flags = 0; int flags = 0;
...@@ -579,7 +574,7 @@ static int get_sgflags(struct tty_struct * tty) ...@@ -579,7 +574,7 @@ static int get_sgflags(struct tty_struct * tty)
return flags; return flags;
} }
static int get_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb) static int get_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
{ {
struct sgttyb tmp; struct sgttyb tmp;
...@@ -594,7 +589,7 @@ static int get_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb) ...@@ -594,7 +589,7 @@ static int get_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb)
return copy_to_user(sgttyb, &tmp, sizeof(tmp)) ? -EFAULT : 0; return copy_to_user(sgttyb, &tmp, sizeof(tmp)) ? -EFAULT : 0;
} }
static void set_sgflags(struct ktermios * termios, int flags) static void set_sgflags(struct ktermios *termios, int flags)
{ {
termios->c_iflag = ICRNL | IXON; termios->c_iflag = ICRNL | IXON;
termios->c_oflag = 0; termios->c_oflag = 0;
...@@ -631,7 +626,7 @@ static void set_sgflags(struct ktermios * termios, int flags) ...@@ -631,7 +626,7 @@ static void set_sgflags(struct ktermios * termios, int flags)
* Locking: termios_sem * Locking: termios_sem
*/ */
static int set_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb) static int set_sgttyb(struct tty_struct *tty, struct sgttyb __user *sgttyb)
{ {
int retval; int retval;
struct sgttyb tmp; struct sgttyb tmp;
...@@ -651,7 +646,8 @@ static int set_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb) ...@@ -651,7 +646,8 @@ static int set_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb)
set_sgflags(&termios, tmp.sg_flags); set_sgflags(&termios, tmp.sg_flags);
/* Try and encode into Bfoo format */ /* Try and encode into Bfoo format */
#ifdef BOTHER #ifdef BOTHER
tty_termios_encode_baud_rate(&termios, termios.c_ispeed, termios.c_ospeed); tty_termios_encode_baud_rate(&termios, termios.c_ispeed,
termios.c_ospeed);
#endif #endif
mutex_unlock(&tty->termios_mutex); mutex_unlock(&tty->termios_mutex);
change_termios(tty, &termios); change_termios(tty, &termios);
...@@ -660,7 +656,7 @@ static int set_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb) ...@@ -660,7 +656,7 @@ static int set_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb)
#endif #endif
#ifdef TIOCGETC #ifdef TIOCGETC
static int get_tchars(struct tty_struct * tty, struct tchars __user * tchars) static int get_tchars(struct tty_struct *tty, struct tchars __user *tchars)
{ {
struct tchars tmp; struct tchars tmp;
...@@ -673,7 +669,7 @@ static int get_tchars(struct tty_struct * tty, struct tchars __user * tchars) ...@@ -673,7 +669,7 @@ static int get_tchars(struct tty_struct * tty, struct tchars __user * tchars)
return copy_to_user(tchars, &tmp, sizeof(tmp)) ? -EFAULT : 0; return copy_to_user(tchars, &tmp, sizeof(tmp)) ? -EFAULT : 0;
} }
static int set_tchars(struct tty_struct * tty, struct tchars __user * tchars) static int set_tchars(struct tty_struct *tty, struct tchars __user *tchars)
{ {
struct tchars tmp; struct tchars tmp;
...@@ -690,20 +686,22 @@ static int set_tchars(struct tty_struct * tty, struct tchars __user * tchars) ...@@ -690,20 +686,22 @@ static int set_tchars(struct tty_struct * tty, struct tchars __user * tchars)
#endif #endif
#ifdef TIOCGLTC #ifdef TIOCGLTC
static int get_ltchars(struct tty_struct * tty, struct ltchars __user * ltchars) static int get_ltchars(struct tty_struct *tty, struct ltchars __user *ltchars)
{ {
struct ltchars tmp; struct ltchars tmp;
tmp.t_suspc = tty->termios->c_cc[VSUSP]; tmp.t_suspc = tty->termios->c_cc[VSUSP];
tmp.t_dsuspc = tty->termios->c_cc[VSUSP]; /* what is dsuspc anyway? */ /* what is dsuspc anyway? */
tmp.t_dsuspc = tty->termios->c_cc[VSUSP];
tmp.t_rprntc = tty->termios->c_cc[VREPRINT]; tmp.t_rprntc = tty->termios->c_cc[VREPRINT];
tmp.t_flushc = tty->termios->c_cc[VEOL2]; /* what is flushc anyway? */ /* what is flushc anyway? */
tmp.t_flushc = tty->termios->c_cc[VEOL2];
tmp.t_werasc = tty->termios->c_cc[VWERASE]; tmp.t_werasc = tty->termios->c_cc[VWERASE];
tmp.t_lnextc = tty->termios->c_cc[VLNEXT]; tmp.t_lnextc = tty->termios->c_cc[VLNEXT];
return copy_to_user(ltchars, &tmp, sizeof(tmp)) ? -EFAULT : 0; return copy_to_user(ltchars, &tmp, sizeof(tmp)) ? -EFAULT : 0;
} }
static int set_ltchars(struct tty_struct * tty, struct ltchars __user * ltchars) static int set_ltchars(struct tty_struct *tty, struct ltchars __user *ltchars)
{ {
struct ltchars tmp; struct ltchars tmp;
...@@ -711,9 +709,11 @@ static int set_ltchars(struct tty_struct * tty, struct ltchars __user * ltchars) ...@@ -711,9 +709,11 @@ static int set_ltchars(struct tty_struct * tty, struct ltchars __user * ltchars)
return -EFAULT; return -EFAULT;
tty->termios->c_cc[VSUSP] = tmp.t_suspc; tty->termios->c_cc[VSUSP] = tmp.t_suspc;
tty->termios->c_cc[VEOL2] = tmp.t_dsuspc; /* what is dsuspc anyway? */ /* what is dsuspc anyway? */
tty->termios->c_cc[VEOL2] = tmp.t_dsuspc;
tty->termios->c_cc[VREPRINT] = tmp.t_rprntc; tty->termios->c_cc[VREPRINT] = tmp.t_rprntc;
tty->termios->c_cc[VEOL2] = tmp.t_flushc; /* what is flushc anyway? */ /* what is flushc anyway? */
tty->termios->c_cc[VEOL2] = tmp.t_flushc;
tty->termios->c_cc[VWERASE] = tmp.t_werasc; tty->termios->c_cc[VWERASE] = tmp.t_werasc;
tty->termios->c_cc[VLNEXT] = tmp.t_lnextc; tty->termios->c_cc[VLNEXT] = tmp.t_lnextc;
return 0; return 0;
...@@ -761,10 +761,10 @@ static int send_prio_char(struct tty_struct *tty, char ch) ...@@ -761,10 +761,10 @@ static int send_prio_char(struct tty_struct *tty, char ch)
* consistent mode setting. * consistent mode setting.
*/ */
int tty_mode_ioctl(struct tty_struct * tty, struct file *file, int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct tty_struct * real_tty; struct tty_struct *real_tty;
void __user *p = (void __user *)arg; void __user *p = (void __user *)arg;
if (tty->driver->type == TTY_DRIVER_TYPE_PTY && if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
...@@ -833,11 +833,11 @@ int tty_mode_ioctl(struct tty_struct * tty, struct file *file, ...@@ -833,11 +833,11 @@ int tty_mode_ioctl(struct tty_struct * tty, struct file *file,
if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios_locked)) if (kernel_termios_to_user_termios((struct termios __user *)arg, real_tty->termios_locked))
return -EFAULT; return -EFAULT;
return 0; return 0;
case TIOCSLCKTRMIOS: case TIOCSLCKTRMIOS:
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
if (user_termios_to_kernel_termios(real_tty->termios_locked, (struct termios __user *) arg)) if (user_termios_to_kernel_termios(real_tty->termios_locked,
(struct termios __user *) arg))
return -EFAULT; return -EFAULT;
return 0; return 0;
#else #else
...@@ -845,16 +845,17 @@ int tty_mode_ioctl(struct tty_struct * tty, struct file *file, ...@@ -845,16 +845,17 @@ int tty_mode_ioctl(struct tty_struct * tty, struct file *file,
if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios_locked)) if (kernel_termios_to_user_termios_1((struct termios __user *)arg, real_tty->termios_locked))
return -EFAULT; return -EFAULT;
return 0; return 0;
case TIOCSLCKTRMIOS: case TIOCSLCKTRMIOS:
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
if (user_termios_to_kernel_termios_1(real_tty->termios_locked, (struct termios __user *) arg)) if (user_termios_to_kernel_termios_1(real_tty->termios_locked,
(struct termios __user *) arg))
return -EFAULT; return -EFAULT;
return 0; return 0;
#endif #endif
case TIOCGSOFTCAR: case TIOCGSOFTCAR:
return put_user(C_CLOCAL(tty) ? 1 : 0, (int __user *)arg); return put_user(C_CLOCAL(tty) ? 1 : 0,
(int __user *)arg);
case TIOCSSOFTCAR: case TIOCSSOFTCAR:
if (get_user(arg, (unsigned int __user *) arg)) if (get_user(arg, (unsigned int __user *) arg))
return -EFAULT; return -EFAULT;
...@@ -868,7 +869,6 @@ int tty_mode_ioctl(struct tty_struct * tty, struct file *file, ...@@ -868,7 +869,6 @@ int tty_mode_ioctl(struct tty_struct * tty, struct file *file,
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
} }
EXPORT_SYMBOL_GPL(tty_mode_ioctl); EXPORT_SYMBOL_GPL(tty_mode_ioctl);
int tty_perform_flush(struct tty_struct *tty, unsigned long arg) int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
...@@ -899,13 +899,12 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg) ...@@ -899,13 +899,12 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(tty_perform_flush); EXPORT_SYMBOL_GPL(tty_perform_flush);
int n_tty_ioctl(struct tty_struct * tty, struct file * file, int n_tty_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct tty_struct * real_tty; struct tty_struct *real_tty;
int retval; int retval;
if (tty->driver->type == TTY_DRIVER_TYPE_PTY && if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
...@@ -978,5 +977,4 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file, ...@@ -978,5 +977,4 @@ int n_tty_ioctl(struct tty_struct * tty, struct file * file,
return tty_mode_ioctl(tty, file, cmd, arg); return tty_mode_ioctl(tty, file, cmd, arg);
} }
} }
EXPORT_SYMBOL(n_tty_ioctl); EXPORT_SYMBOL(n_tty_ioctl);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7