LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, Dmitry Torokhov <dtor@mail.ru>,
	Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH] Braille screen reader fixes
Date: Sat, 23 Feb 2008 14:15:55 +0100	[thread overview]
Message-ID: <20080223131555.GD4244@implementation> (raw)
In-Reply-To: <20080223131028.GC4244@implementation>

Braille screen reader fixes:
- console_cmdline's brl_options field is only required when braille
console support is enabled.
- Use strlcpy to copy the console name.
- braille console support depends on VT support.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

--- linux-2.6.24.1-orig/kernel/printk.c	2008-02-21 12:09:06.000000000 +0100
+++ linux-2.6.24.1-perso/kernel/printk.c	2008-02-23 12:57:42.000000000 +0100
@@ -105,7 +105,9 @@ struct console_cmdline
 	char	name[8];			/* Name of the driver	    */
 	int	index;				/* Minor dev. to use	    */
 	char	*options;			/* Options for the driver   */
+#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
 	char	*brl_options;			/* Options for braille driver */
+#endif
 };
 
 #define MAX_CMDLINECONSOLES 8
@@ -789,10 +791,11 @@ static int __add_preferred_console
 	if (!brl_options)
 		selected_console = i;
 	c = &console_cmdline[i];
-	memcpy(c->name, name, sizeof(c->name));
-	c->name[sizeof(c->name) - 1] = 0;
+	strlcpy(c->name, name, sizeof(c->name));
 	c->options = options;
+#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
 	c->brl_options = brl_options;
+#endif
 	c->index = idx;
 	return 0;
 }
--- linux-2.6.24.1-orig/drivers/accessibility/Kconfig	2008-02-23 13:32:38.000000000 +0100
+++ linux-2.6.24.1-perso/drivers/accessibility/Kconfig	2008-02-23 13:23:21.000000000 +0100
@@ -8,6 +8,7 @@ menuconfig ACCESSIBILITY
 if ACCESSIBILITY
 config A11Y_BRAILLE_CONSOLE
 	bool "Console on braille device"
+	depends on VT
 	depends on SERIAL_CORE_CONSOLE
 	---help---
 	  Enables console output on a braille device connected to a 8250

  reply	other threads:[~2008-02-23 13:19 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-04  3:18 [PATCH] Basic braille screen reader support Samuel Thibault
2008-02-04  3:22 ` Samuel Thibault
2008-02-04 17:10 ` Greg KH
2008-02-04 17:24   ` Samuel Thibault
2008-02-04 18:06     ` Greg KH
2008-02-04 18:15       ` Samuel Thibault
2008-02-04 18:27         ` Greg KH
2008-02-05 22:00 ` [PATCH,RESEND] " Samuel Thibault
2008-02-06  0:58   ` Andrew Morton
2008-02-06  2:04     ` Samuel Thibault
2008-02-22  0:28       ` [PATCH2] " Samuel Thibault
2008-02-23  8:04         ` Andrew Morton
2008-02-23 13:10           ` Samuel Thibault
2008-02-23 13:15             ` Samuel Thibault [this message]
2008-02-23 13:17             ` [PATCH] Braille screen reader documentation Samuel Thibault
2008-04-24  0:39             ` [PATCH2] Basic braille screen reader support Samuel Thibault
2008-04-24  4:46               ` Andrew Morton
2008-04-24 10:21               ` Alan Cox
2008-04-24 11:09                 ` Samuel Thibault
2008-03-19 18:57   ` [mmotm build error] Re: [PATCH,RESEND] " Randy Dunlap
2008-03-20  2:07     ` Samuel Thibault
2008-03-20  4:19       ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080223131555.GD4244@implementation \
    --to=samuel.thibault@ens-lyon.org \
    --cc=akpm@linux-foundation.org \
    --cc=dtor@mail.ru \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH] Braille screen reader fixes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).