From b75c120cc0b30da045bedd30f1bfa9a800caddb7 Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 22 Aug 2001 11:12:00 +0000 Subject: [PATCH] imon wasn't devfs-compliant yet. --- imon/imon.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/imon/imon.c b/imon/imon.c index a1d67aad..20bf1f50 100644 --- a/imon/imon.c +++ b/imon/imon.c @@ -1,4 +1,4 @@ -/* $Id: imon.c,v 1.4 2000/06/13 10:51:06 armin Exp $ +/* $Id: imon.c,v 1.5 2001/08/22 11:12:00 paul Exp $ * * iMON , extended version. * original iMON source (c) Michael Knigge @@ -19,6 +19,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log: imon.c,v $ + * Revision 1.5 2001/08/22 11:12:00 paul + * imon wasn't devfs-compliant yet. + * * Revision 1.4 2000/06/13 10:51:06 armin * fixed status output if channels are in * a different order. @@ -510,12 +513,14 @@ int main(int argc, char **argv) { usage(); } + if (!(isdninfo = fopen("/dev/isdninfo", "r"))) { + if (!(isdninfo = fopen("/dev/isdn/isdninfo", "r"))) { + perror("Can't open /dev/isdn/isdninfo nor /dev/isdninfo"); + return 1; + } + } if (phonebook) readphonebook(); - if (!(isdninfo = fopen("/dev/isdninfo", "r"))) { - fprintf(stderr, "Can't open /dev/isdninfo\n"); - return(-1); - } /* * initialize ncurses and draw the main screen @@ -597,8 +602,7 @@ int main(int argc, char **argv) { if (errno != EINTR) { perror("select"); sleep(5); - exit(-1); - break; + return 2; } } imon_draw_status(color, ¤t_time);