CVS commit: src/usr.sbin/isdn/isdnd

2017-07-11 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Jul 12 01:57:43 UTC 2017

Modified Files:
src/usr.sbin/isdn/isdnd: isdnd.8

Log Message:
PR/52396: Edgar Pettijohn: Spell daemon consistently.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/isdn/isdnd/isdnd.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/isdnd.8
diff -u src/usr.sbin/isdn/isdnd/isdnd.8:1.15 src/usr.sbin/isdn/isdnd/isdnd.8:1.16
--- src/usr.sbin/isdn/isdnd/isdnd.8:1.15	Mon Jul  3 17:35:30 2017
+++ src/usr.sbin/isdn/isdnd/isdnd.8	Tue Jul 11 21:57:43 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: isdnd.8,v 1.15 2017/07/03 21:35:30 wiz Exp $
+.\" $NetBSD: isdnd.8,v 1.16 2017/07/12 01:57:43 christos Exp $
 .\"
 .\" Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
 .\"
@@ -23,13 +23,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: isdnd.8,v 1.15 2017/07/03 21:35:30 wiz Exp $
+.\"	$Id: isdnd.8,v 1.16 2017/07/12 01:57:43 christos Exp $
 .\"
 .\" $FreeBSD$
 .\"
 .\"	last edit-date: [Tue May  2 13:45:12 2000]
 .\"
-.Dd April 5, 2012
+.Dd July 11, 2017
 .Dt ISDND 8
 .Os
 .Sh NAME
@@ -51,7 +51,7 @@
 .Op Fl m
 .Sh DESCRIPTION
 .Nm
-is the isdn4bsd package demon which manages all ISDN related connection
+is the isdn4bsd package daemon which manages all ISDN related connection
 and disconnection of ISDN devices supported by the package.
 .Pp
 The options are as follows:

CVS commit: src/usr.sbin/isdn/isdnd

2016-03-02 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Wed Mar  2 19:28:56 UTC 2016

Modified Files:
src/usr.sbin/isdn/isdnd: log.c

Log Message:
fix indent


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/isdn/isdnd/log.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/log.c
diff -u src/usr.sbin/isdn/isdnd/log.c:1.9 src/usr.sbin/isdn/isdnd/log.c:1.10
--- src/usr.sbin/isdn/isdnd/log.c:1.9	Wed Mar  2 14:03:31 2016
+++ src/usr.sbin/isdn/isdnd/log.c	Wed Mar  2 14:28:56 2016
@@ -27,7 +27,7 @@
  *	i4b daemon - logging routines
  *	-
  *
- *	$Id: log.c,v 1.9 2016/03/02 19:03:31 martin Exp $ 
+ *	$Id: log.c,v 1.10 2016/03/02 19:28:56 christos Exp $ 
  *
  * $FreeBSD$
  *
@@ -161,8 +161,8 @@ logit(int what, const char *fmt, ...)
 
 	/* put log on screen ? */
 
-	if ((do_fullscreen && curses_ready) &&
-	   (!debug_noscreen || what != LL_DBG))
+	if (do_fullscreen && curses_ready &&
+	(!debug_noscreen || what != LL_DBG))
 	{
 		wprintw(lower_w, "%s %s %-.*s\n", dp, logtab[what].text,

CVS commit: src/usr.sbin/isdn/isdnd

2016-03-02 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Wed Mar  2 19:03:31 UTC 2016

Modified Files:
src/usr.sbin/isdn/isdnd: log.c

Log Message:
David Binderman in PR bin/50884: simplify boolean expression


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/isdn/isdnd/log.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/log.c
diff -u src/usr.sbin/isdn/isdnd/log.c:1.8 src/usr.sbin/isdn/isdnd/log.c:1.9
--- src/usr.sbin/isdn/isdnd/log.c:1.8	Wed Aug 31 16:24:59 2011
+++ src/usr.sbin/isdn/isdnd/log.c	Wed Mar  2 19:03:31 2016
@@ -27,7 +27,7 @@
  *	i4b daemon - logging routines
  *	-
  *
- *	$Id: log.c,v 1.8 2011/08/31 16:24:59 plunky Exp $ 
+ *	$Id: log.c,v 1.9 2016/03/02 19:03:31 martin Exp $ 
  *
  * $FreeBSD$
  *
@@ -162,7 +162,7 @@ logit(int what, const char *fmt, ...)
 	/* put log on screen ? */
 
 	if ((do_fullscreen && curses_ready) &&
-	   ((!debug_noscreen) || (debug_noscreen && (what != LL_DBG
+	   (!debug_noscreen || what != LL_DBG))
 	{
 		wprintw(lower_w, "%s %s %-.*s\n", dp, logtab[what].text,

CVS commit: src/usr.sbin/isdn/isdnd

2015-12-23 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Wed Dec 23 10:56:29 UTC 2015

Modified Files:
src/usr.sbin/isdn/isdnd: exec.c

Log Message:
David Binderman in PR 50578: fix resource leak in an error branch.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/isdn/isdnd/exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/exec.c
diff -u src/usr.sbin/isdn/isdnd/exec.c:1.11 src/usr.sbin/isdn/isdnd/exec.c:1.12
--- src/usr.sbin/isdn/isdnd/exec.c:1.11	Fri Mar  2 02:58:46 2012
+++ src/usr.sbin/isdn/isdnd/exec.c	Wed Dec 23 10:56:29 2015
@@ -27,7 +27,7 @@
  *	exec.h - supplemental program/script execution
  *	--
  *
- *	$Id: exec.c,v 1.11 2012/03/02 02:58:46 joerg Exp $ 
+ *	$Id: exec.c,v 1.12 2015/12/23 10:56:29 martin Exp $ 
  *
  * $FreeBSD$
  *
@@ -368,7 +368,10 @@ upd_callstat_file(char *filename, int ro
 			nfp = fopen(buf, "w");
 			if (nfp == NULL)
 			{
-logit(LL_ERR, "ERROR, upd_callstat_file: cannot open for write %s, %s", buf, strerror(errno));
+logit(LL_ERR, "ERROR, upd_callstat_file: "
+"cannot open for write %s, %s", buf,
+strerror(errno));
+fclose(fp);
 return;
 			}

CVS commit: src/usr.sbin/isdn/isdnd

2014-11-14 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Sat Nov 15 02:09:18 UTC 2014

Modified Files:
src/usr.sbin/isdn/isdnd: msghdl.c

Log Message:
Show display if it is not empty.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/isdn/isdnd/msghdl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/msghdl.c
diff -u src/usr.sbin/isdn/isdnd/msghdl.c:1.11 src/usr.sbin/isdn/isdnd/msghdl.c:1.12
--- src/usr.sbin/isdn/isdnd/msghdl.c:1.11	Thu Apr 16 05:56:32 2009
+++ src/usr.sbin/isdn/isdnd/msghdl.c	Sat Nov 15 02:09:18 2014
@@ -27,7 +27,7 @@
  *	i4b daemon - message from kernel handling routines
  *	--
  *
- *	$Id: msghdl.c,v 1.11 2009/04/16 05:56:32 lukem Exp $ 
+ *	$Id: msghdl.c,v 1.12 2014/11/15 02:09:18 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -149,7 +149,7 @@ msg_connect_ind(msg_connect_ind_t *mp, i
 		decr_free_channels(find_ctrl_state(mp->controller));
 		if (cep->alert)
 		{
-			if (mp->display)
+			if (mp->display[0])
 			{
 logit(LL_CHD, "%05d %s alerting: incoming call from %s to %s (%s)",
 	mp->header.cdid, cep->name, SRC, DST, mp->display);
@@ -163,7 +163,7 @@ msg_connect_ind(msg_connect_ind_t *mp, i
 		}
 		else
 		{
-			if (mp->display)
+			if (mp->display[0])
 			{
 logit(LL_CHD, "%05d %s answering: incoming call from %s to %s (%s)",
 	mp->header.cdid, cep->name, SRC, DST, mp->display);

CVS commit: src/usr.sbin/isdn/isdnd

2012-03-01 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Fri Mar  2 02:58:46 UTC 2012

Modified Files:
src/usr.sbin/isdn/isdnd: exec.c

Log Message:
More time_t fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/isdn/isdnd/exec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/exec.c
diff -u src/usr.sbin/isdn/isdnd/exec.c:1.10 src/usr.sbin/isdn/isdnd/exec.c:1.11
--- src/usr.sbin/isdn/isdnd/exec.c:1.10	Thu Apr 16 05:56:32 2009
+++ src/usr.sbin/isdn/isdnd/exec.c	Fri Mar  2 02:58:46 2012
@@ -27,7 +27,7 @@
  *	exec.h - supplemental program/script execution
  *	--
  *
- *	$Id: exec.c,v 1.10 2009/04/16 05:56:32 lukem Exp $ 
+ *	$Id: exec.c,v 1.11 2012/03/02 02:58:46 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -316,7 +316,7 @@ upd_callstat_file(char *filename, int ro
 			return;
 		}
 
-		ret = fprintf(fp, "%ld %ld 1", (long)now, (long)now);
+		ret = fprintf(fp, "%jd %jd 1", (intmax_t)now, (intmax_t)now);
 		if (ret <= 0)
 			logit(LL_ERR, "ERROR, upd_callstat_file: fprintf failed: %s", strerror(errno));
 		
@@ -372,7 +372,7 @@ upd_callstat_file(char *filename, int ro
 return;
 			}
 
-			ret = fprintf(nfp, "%ld %ld %d", (long)s, (long)l, n);
+			ret = fprintf(nfp, "%jd %jd %d", (intmax_t)s, (intmax_t)l, n);
 			if (ret <= 0)
 logit(LL_ERR, "ERROR, upd_callstat_file: fprintf failed: %s", strerror(errno));
 			
@@ -382,7 +382,7 @@ upd_callstat_file(char *filename, int ro
 			n = 0;
 			s = now;
 
-			logit(LL_WRN, "upd_callstat_file: rotate %s, new s=%ld l=%ld n=%d", filename, s, l, n);
+			logit(LL_WRN, "upd_callstat_file: rotate %s, new s=%jd l=%jd n=%d", filename, (intmax_t)s, (intmax_t)l, n);
 		}
 	}
 
@@ -393,7 +393,7 @@ upd_callstat_file(char *filename, int ro
 	 * leftovers from previous contents!
 	 */
 
-	ret = fprintf(fp, "%ld %ld %-3d", (long)s, (long)now, n);	
+	ret = fprintf(fp, "%jd %jd %-3d", (time_t)s, (time_t)now, n);	
 
 	if (ret <= 0)
 		logit(LL_ERR, "ERROR, upd_callstat_file: fprintf failed: %s", strerror(errno));

CVS commit: src/usr.sbin/isdn/isdnd

2012-03-01 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Thu Mar  1 22:31:48 UTC 2012

Modified Files:
src/usr.sbin/isdn/isdnd: isdnd.h rates.c rc_config.c support.c timer.c

Log Message:
Fix format strings to deal with 64bit time_t.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/isdn/isdnd/isdnd.h
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/isdn/isdnd/rates.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/isdn/isdnd/rc_config.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/isdn/isdnd/support.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/isdn/isdnd/timer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/isdnd.h
diff -u src/usr.sbin/isdn/isdnd/isdnd.h:1.17 src/usr.sbin/isdn/isdnd/isdnd.h:1.18
--- src/usr.sbin/isdn/isdnd/isdnd.h:1.17	Wed Aug 31 13:32:37 2011
+++ src/usr.sbin/isdn/isdnd/isdnd.h	Thu Mar  1 22:31:48 2012
@@ -27,7 +27,7 @@
  *	i4b daemon - main header file
  *	-
  *
- *	$Id: isdnd.h,v 1.17 2011/08/31 13:32:37 joerg Exp $ 
+ *	$Id: isdnd.h,v 1.18 2012/03/01 22:31:48 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -791,7 +791,7 @@ void init_controller_protocol ( void );
 void init_single_controller_protocol ( struct isdn_ctrl_state *ctrl );
 void init_log ( void );
 void init_screen ( void );
-void logit ( int what, const char *fmt, ... );
+void logit ( int what, const char *fmt, ... ) __printflike(2, 3);
 int main ( int argc, char **argv );
 void msg_accounting ( msg_accounting_ind_t *mp );
 void msg_alert_ind ( msg_alert_ind_t *mp );

Index: src/usr.sbin/isdn/isdnd/rates.c
diff -u src/usr.sbin/isdn/isdnd/rates.c:1.6 src/usr.sbin/isdn/isdnd/rates.c:1.7
--- src/usr.sbin/isdn/isdnd/rates.c:1.6	Sat Oct 30 08:19:30 2004
+++ src/usr.sbin/isdn/isdnd/rates.c	Thu Mar  1 22:31:48 2012
@@ -35,7 +35,7 @@
  *	i4b daemon - charging rates description file handling
  *	-
  *
- *	$Id: rates.c,v 1.6 2004/10/30 08:19:30 dsl Exp $ 
+ *	$Id: rates.c,v 1.7 2012/03/01 22:31:48 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -391,8 +391,8 @@ get_current_rate(struct cfg_entry *cep, 
 	{
 	case ULSRC_CMDL:	/* specified on commandline */
 		if (dolog)
-			logit(LL_CHD, "%05d %s rate %d sec/unit (cmdl)",
-cep->cdid, cep->name, unit_length);
+			logit(LL_CHD, "%05d %s rate %jd sec/unit (cmdl)",
+cep->cdid, cep->name, (intmax_t)unit_length);
 		return(unit_length);
 		break;
 
@@ -493,7 +493,7 @@ getrate(int rate_type )
 		if ((time_now >= hd->start_time ) &&
 		(time_now < hd->end_time ))
 		{
-			DBGL(DL_RATES, (logit(LL_DBG, "rate=%d sec/unit (day=%d, beg=%d:%2.2d, end=%d:2.2d, current=%d:%2.2d)",
+			DBGL(DL_RATES, (logit(LL_DBG, "rate=%d sec/unit (day=%d, beg=%d:%2.2d, end=%d:%2.2d, current=%d:%2.2d)",
 hd->rate,
 ptr->tm_wday,
 hd->start_time/60, hd->start_time%60,

Index: src/usr.sbin/isdn/isdnd/rc_config.c
diff -u src/usr.sbin/isdn/isdnd/rc_config.c:1.25 src/usr.sbin/isdn/isdnd/rc_config.c:1.26
--- src/usr.sbin/isdn/isdnd/rc_config.c:1.25	Thu Apr 16 05:56:32 2009
+++ src/usr.sbin/isdn/isdnd/rc_config.c	Thu Mar  1 22:31:48 2012
@@ -27,7 +27,7 @@
  *	i4b daemon - config file processing
  *	---
  *
- *	$Id: rc_config.c,v 1.25 2009/04/16 05:56:32 lukem Exp $ 
+ *	$Id: rc_config.c,v 1.26 2012/03/01 22:31:48 joerg Exp $ 
  *
  * $FreeBSD$
  *
@@ -454,13 +454,13 @@ cfg_setval(int keyword)
 			FILE *fp;
 			int s, l;
 			int n;
-			DBGL(DL_RCCF, (logit(LL_DBG, "entry %s: budget-callbacksfile = %s", yylval.str)));
+			DBGL(DL_RCCF, (logit(LL_DBG, "entry %s: budget-callbacksfile = %s", current_cfe->name, yylval.str)));
 			fp = fopen(yylval.str, "r");
 			if (fp != NULL)
 			{
 if ((fscanf(fp, "%d %d %d", (int *)&s, (int *)&l, &n)) != 3)
 {
-	DBGL(DL_RCCF, (logit(LL_DBG, "entry %d: initializing budget-callbacksfile %s", current_cfe->name, yylval.str)));
+	DBGL(DL_RCCF, (logit(LL_DBG, "entry %s: initializing budget-callbacksfile %s", current_cfe->name, yylval.str)));
 	fclose(fp);
 	fp = fopen(yylval.str, "w");
 	if (fp != NULL) {
@@ -1134,7 +1134,7 @@ parse_valid(char *dt)
 			ret = sscanf(dt, "%d:%d-%d:%d", &fromhr, &frommin, &tohr, &tomin);
 			if (ret !=4)
 			{
-logit(LL_ERR, "ERROR parsing config file: timespec [%s] error at line %d!", *dt, lineno);
+logit(LL_ERR, "ERROR parsing config file: timespec [%s] error at line %d!", dt, lineno);
 config_error_flag++;
 return;
 			}
@@ -1142,7 +1142,7 @@ parse_valid(char *dt)
 			if (fromhr < 0 || fromhr > 24 || tohr < 0 || tohr > 24 ||
 			   frommin < 0 || frommin > 59 || tomin < 0 || tomin > 59)
 			{
-logit(LL_ERR, "ERROR parsing config file: invalid time [%s] at line %d!", *dt, lineno);
+logit(LL_ERR, "ERROR parsing config file: invalid time [%s] at line %d!", dt, lineno);
 config_error_flag++;
 return;
 			}

Index: src/usr.sbin/isdn/isdnd/support.c
diff -u src/usr.sbin/isd

CVS commit: src/usr.sbin/isdn/isdnd

2011-08-16 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Tue Aug 16 10:39:31 UTC 2011

Modified Files:
src/usr.sbin/isdn/isdnd: rc_parse.y

Log Message:
Avoid non-literal format strings


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/isdn/isdnd/rc_parse.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/rc_parse.y
diff -u src/usr.sbin/isdn/isdnd/rc_parse.y:1.6 src/usr.sbin/isdn/isdnd/rc_parse.y:1.7
--- src/usr.sbin/isdn/isdnd/rc_parse.y:1.6	Thu Apr 16 01:56:32 2009
+++ src/usr.sbin/isdn/isdnd/rc_parse.y	Tue Aug 16 06:39:31 2011
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration parser
  *	-
  *
- *	$Id: rc_parse.y,v 1.6 2009/04/16 05:56:32 lukem Exp $ 
+ *	$Id: rc_parse.y,v 1.7 2011/08/16 10:39:31 christos Exp $ 
  *
  * $FreeBSD$
  *
@@ -249,26 +249,31 @@
 sysmonitorstart:
 		MONITOR '=' STRING '\n'
 			{
-			const char *err = NULL;
+			const char *emsg;
 			switch (monitor_start_rights($3)) {
 				case I4BMAR_OK:
+	emsg = NULL;
 					break;
 				case I4BMAR_LENGTH:
-					err = "local socket name too long: %s";
+					emsg = "local socket name too long";
 					break;
 				case I4BMAR_DUP:
-					err = "duplicate entry: %s";
+					emsg = "duplicate entry";
 					break;
 				case I4BMAR_CIDR:
-					err = "invalid CIDR specification: %s";
+					emsg = "invalid CIDR specification";
 					break;
 				case I4BMAR_NOIP:
-					err = "could not resolve host or net specification: %s";
+					emsg = "could not resolve host or net "
+	"specification";
 					break;
+default:
+	emsg = "unknown";
+	break;
 			}
-			if (err) {
+			if (emsg) {
 				char msg[1024];
-				snprintf(msg, sizeof msg, err, $3);
+				snprintf(msg, sizeof msg, "%s: %s", emsg, $3);
 				yyerror(msg);
 			}
 			}

CVS commit: src/usr.sbin/isdn/isdnd

2009-10-29 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Oct 29 14:39:24 UTC 2009

Modified Files:
src/usr.sbin/isdn/isdnd: Makefile rc_scan.l

Log Message:
option noinput


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/isdn/isdnd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/isdn/isdnd/rc_scan.l

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/Makefile
diff -u src/usr.sbin/isdn/isdnd/Makefile:1.8 src/usr.sbin/isdn/isdnd/Makefile:1.9
--- src/usr.sbin/isdn/isdnd/Makefile:1.8	Mon Apr 20 12:05:30 2009
+++ src/usr.sbin/isdn/isdnd/Makefile	Thu Oct 29 10:39:23 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2009/04/20 16:05:30 drochner Exp $
+#	$NetBSD: Makefile,v 1.9 2009/10/29 14:39:23 christos Exp $
 
 PROG	=	isdnd
 SRCS	=	rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c	\
@@ -7,7 +7,7 @@
 		holiday.c
 
 CPPFLAGS+=	-I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel
-CPPFLAGS+=	-I${.CURDIR} -I${.OBJDIR} -DYY_NO_INPUT
+CPPFLAGS+=	-I${.CURDIR} -I${.OBJDIR}
 
 # compile debug support
 CPPFLAGS+=	-DDEBUG

Index: src/usr.sbin/isdn/isdnd/rc_scan.l
diff -u src/usr.sbin/isdn/isdnd/rc_scan.l:1.6 src/usr.sbin/isdn/isdnd/rc_scan.l:1.7
--- src/usr.sbin/isdn/isdnd/rc_scan.l:1.6	Sat Oct 30 04:19:30 2004
+++ src/usr.sbin/isdn/isdnd/rc_scan.l	Thu Oct 29 10:39:24 2009
@@ -30,7 +30,7 @@
  *	i4b daemon - runtime configuration lexical analyzer
  *	---
  *
- *	$Id: rc_scan.l,v 1.6 2004/10/30 08:19:30 dsl Exp $ 
+ *	$Id: rc_scan.l,v 1.7 2009/10/29 14:39:24 christos Exp $ 
  *
  * $FreeBSD$
  *
@@ -55,8 +55,7 @@
 
 %}
 
-%option	noyywrap
-%option nounput
+%option	noyywrap nounput noinput
 
 %%

CVS commit: src/usr.sbin/isdn/isdnd

2009-04-08 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Thu Apr  9 02:30:51 UTC 2009

Modified Files:
src/usr.sbin/isdn/isdnd: isdnd.rc.5

Log Message:
Don't depend on magic default value for -offset. Don't use .br, use a
paragraph. Use more sane indentation and avoid compact style for huge
list to make it more readable.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/isdn/isdnd/isdnd.rc.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/isdn/isdnd/isdnd.rc.5
diff -u src/usr.sbin/isdn/isdnd/isdnd.rc.5:1.17 src/usr.sbin/isdn/isdnd/isdnd.rc.5:1.18
--- src/usr.sbin/isdn/isdnd/isdnd.rc.5:1.17	Thu Sep 25 09:37:32 2003
+++ src/usr.sbin/isdn/isdnd/isdnd.rc.5	Thu Apr  9 02:30:51 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: isdnd.rc.5,v 1.17 2003/09/25 09:37:32 wiz Exp $
+.\" $NetBSD: isdnd.rc.5,v 1.18 2009/04/09 02:30:51 joerg Exp $
 .\"
 .\" Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: isdnd.rc.5,v 1.17 2003/09/25 09:37:32 wiz Exp $
+.\"	$Id: isdnd.rc.5,v 1.18 2009/04/09 02:30:51 joerg Exp $
 .\"
 .\" $FreeBSD$
 .\"
@@ -289,7 +289,7 @@
 controller is connected to.
 The following parameters are currently supported:
 .Pp
-.Bl -tag -width calledback -compact -offset
+.Bl -tag -width calledback -compact -offset 
 .It Ar dss1
 The DSS1 or so-called "Euro-ISDN" D-channel protocol according to
 ITU Recommendations Q.921 and Q.931.
@@ -302,7 +302,7 @@
 It must not have a parameter.
 This keyword must be used at least once.
 The following keywords are valid in an entry section:
-.Bl -tag -width unitlengthsrc -compact
+.Bl -tag -width downtime
 .It Li answerprog
 This keyword is used to specify the name of a program which is run in
 case an incoming telephone connection specified
@@ -421,7 +421,7 @@
 The keyword is mandatory.
 The currently supported parameters are:
 .Pp
-.Bl -tag -width calledback -compact -offset
+.Bl -tag -width calledback -compact -offset 
 .It Ar accept
 Accept an incoming call.
 .It Ar reject
@@ -505,7 +505,7 @@
 line becomes idle.
 The current algorithms are:
 .Pp
-.Bl -tag -width calledback -compact -offset
+.Bl -tag -width calledback -compact -offset 
 .It Ar fix-unit-size
 idle algorithm which assumes fixed sized changing units during the whole call.
 .It Ar var-unit-size
@@ -702,7 +702,7 @@
 .It Li ratetype
 The rate entry used from the rates file.
 (optional)
-.br
+.Pp
 For example, ratetype=0 selects lines beginning "ra0" in /etc/isdn/isdnd.rates;
 (typically ra0 lines are a set of tables for local call rates on different
 days of the week \*[Am] times per day).