From: Michael Schutte <michi@uiae.at>
To: kbd@lists.altlinux.org
Subject: [kbd] [PATCH] vcstime: Use either /dev/vcs[a] or /dev/vcs[a]0
Date: Sat, 2 Jan 2010 17:34:41 +0100 [thread overview]
Message-ID: <1262450081-7229-2-git-send-email-michi@uiae.at> (raw)
Make vcstime work on all systems by considering both /dev/vcs and
/dev/vcs0 to hold the console memory for the current VT.
Signed-off-by: Michael Schutte <michi@uiae.at>
---
contrib/vcstime.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/contrib/vcstime.c b/contrib/vcstime.c
index 0e657c0..1ee8edd 100644
--- a/contrib/vcstime.c
+++ b/contrib/vcstime.c
@@ -20,10 +20,11 @@ number_of_columns() {
int fda;
unsigned char rc[2]; /* unsigned: Ranty@soon.com */
- if((fda = open("/dev/vcsa0", O_RDONLY)) < 0)
- fatal("/dev/vcsa0");
+ if((fda = open("/dev/vcsa", O_RDONLY)) < 0
+ && (fda = open("/dev/vcsa0", O_RDONLY)) < 0)
+ fatal("/dev/vcsa");
if(read(fda, rc, 2) != 2)
- fatal("/dev/vcsa0");
+ fatal("/dev/vcsa");
close(fda);
return rc[1];
}
@@ -36,8 +37,9 @@ main(){
struct tm *t;
char tijd[10];
- if((fd = open("/dev/vcs0", O_WRONLY)) < 0)
- fatal("/dev/vcs0");
+ if((fd = open("/dev/vcs", O_WRONLY)) < 0
+ && (fd = open("/dev/vcs0", O_WRONLY)) < 0)
+ fatal("/dev/vcs");
while(1) {
lseek(fd, cols-10, 0);
--
tg: (dab334b..) fixes/vcstime (depends on: upstream/master)
next reply other threads:[~2010-01-02 16:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-02 16:34 Michael Schutte [this message]
2010-01-03 0:18 ` [kbd] [PATCH] vcstime: Use either /dev/vcs[a] or /dev/vcs[a]0 Alexey Gladkov
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=1262450081-7229-2-git-send-email-michi@uiae.at \
--to=michi@uiae.at \
--cc=kbd@lists.altlinux.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 read-only IMAP folder(s) and NNTP newsgroup(s).