CVS commit: src/usr.bin/config

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Sat Aug 29 07:24:49 UTC 2015

Modified Files:
        src/usr.bin/config: main.c sem.c

Log Message:
Fix previous.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/config/main.c
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/config/sem.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.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.77 src/usr.bin/config/main.c:1.78
--- src/usr.bin/config/main.c:1.77	Fri Aug 28 03:55:15 2015
+++ src/usr.bin/config/main.c	Sat Aug 29 07:24:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.77 2015/08/28 03:55:15 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.78 2015/08/29 07:24:49 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.77 2015/08/28 03:55:15 uebayasi Exp $");
+__RCSID("$NetBSD: main.c,v 1.78 2015/08/29 07:24:49 uebayasi Exp $");
 
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
@@ -429,6 +429,13 @@ main(int argc, char **argv)
 		stop();
 
 	/*
+	 * Fix maxusers.
+	 */
+	char buf[32];
+	snprintf(buf, sizeof(buf), "%d", maxusers);
+	addoption(intern("MAXUSERS"), intern(buf));
+
+	/*
 	 * If working on an ioconf-only config, process here and exit
 	 */
 	if (ioconfname) {

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.72 src/usr.bin/config/sem.c:1.73
--- src/usr.bin/config/sem.c:1.72	Sat Aug 29 07:08:38 2015
+++ src/usr.bin/config/sem.c	Sat Aug 29 07:24:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.72 2015/08/29 07:08:38 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.73 2015/08/29 07:24:49 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.72 2015/08/29 07:08:38 uebayasi Exp $");
+__RCSID("$NetBSD: sem.c,v 1.73 2015/08/29 07:24:49 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <ctype.h>
@@ -239,7 +239,6 @@ setdefmaxusers(int min, int def, int max
 void
 setmaxusers(int n)
 {
-	char buf[32];
 
 	if (maxusers == n) {
 		cfgerror("duplicate maxusers parameter");
@@ -257,8 +256,6 @@ setmaxusers(int n)
 		cfgerror("warning: maxusers (%d) > %d", n, maxmaxusers);
 		errors--;
 	}
-	snprintf(buf, sizeof(buf), "%d", maxusers);
-	addoption("MAXUSERS", buf);
 }
 
 void