Tue Aug 16 10:39:31 2011 UTC ()

Avoid non-literal format strings


(christos)

diff -r1.6 -r1.7 src/usr.sbin/isdn/isdnd/rc_parse.y

--- src/usr.sbin/isdn/isdnd/Attic/rc_parse.y 2009/04/16 05:56:32	1.6
+++ src/usr.sbin/isdn/isdnd/Attic/rc_parse.y 2011/08/16 10:39:31	1.7

 @@ -20,27 +20,27 @@
  *   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  *   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  *   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  *   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  *   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *   SUCH DAMAGE.
+ *
  *---------------------------------------------------------------------------
+ *
  *	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$
+ *
  *      last edit-date: [Mon Oct  2 22:51:23 2000]
+ *
  *---------------------------------------------------------------------------*/
 %{
 /* #define YYDEBUG 1 */
 #include <stdio.h>
 #include <stdlib.h>
 @@ -239,46 +239,51 @@ sysentry:	sysfileentry
 		| sysboolentry
 		| sysnumentry
 		| sysstrentry
 		| sysmonitorstart
 		| sysmonitorrights
 		| nullentry
 		| error '\n'
+		;
 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);
+		    	    }
+			}
+		;
 sysmonitorrights:
 		MONITORACCESS '=' monrights '\n'
 			{ monitor_add_rights($3); }
+		;
 monrights:	monrights ',' monright	{ $$ = $1 | $3; }
 		| monright		{ $$ = $1; }
+		;