On Sun, May 18, 2014 at 03:05:33PM +0100, Sami Kerola wrote: > The devfs files /dev/vcc/a* does not need to be supported, and vcsa0 has > not existed in years if ever. > > Reference: http://lwn.net/Articles/65197/ > Reference: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devices.txt?id=14186fea0cb06bc43181ce239efe0df6f1af260a#n260 > Signed-off-by: Sami Kerola <kerolasa@xxxxxx> > --- > bash-completion/setterm | 2 +- > term-utils/setterm.c | 26 +++++++------------------- > 2 files changed, 8 insertions(+), 20 deletions(-) > > diff --git a/bash-completion/setterm b/bash-completion/setterm > index a7ef6eb..f47debf 100644 > --- a/bash-completion/setterm > +++ b/bash-completion/setterm > @@ -40,7 +40,7 @@ _setterm_module() > ;; > '-dump'|'-append') > local NUM_CONS > - NUM_CONS=(/sys/class/tty/*) > + NUM_CONS=(/dev/vcsa?*) > COMPREPLY=( $(compgen -W "{1..${#NUM_CONS[*]}}" -- $cur) ) > return 0 > ;; > diff --git a/term-utils/setterm.c b/term-utils/setterm.c > index d889db4..3a02347 100644 > --- a/term-utils/setterm.c > +++ b/term-utils/setterm.c > @@ -724,31 +724,18 @@ static void show_tabs(void) > > static void __attribute__((__noreturn__)) read_error(struct setterm_control *ctl) > { > - if (ctl->opt_sn_num != 0) > - errx(EXIT_DUMPFILE, _("Couldn't read %s"), ctl->in_device); > - else > - errx(EXIT_DUMPFILE, _("Couldn't read neither /dev/vcsa0 nor /dev/vcsa")); > + err(EXIT_DUMPFILE, _("Couldn't read %s"), ctl->in_device); > } Sooo.. do we really need read_error()? ;-) Karel -- Karel Zak <kzak@xxxxxxxxxx> http://karelzak.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
