 @@ -62,26 +62,27 @@ from The Open Group.
 /* use bitmap structure */
 #include <X11/fonts/bitmap.h>
 #include <X11/fonts/bdfint.h>
 #if HAVE_STDINT_H
 #include <stdint.h>
 #elif !defined(INT32_MAX)
 #define INT32_MAX 0x7fffffff
 #endif
 #define INDICES 256
 #define MAXENCODING 0xFFFF
 #define BDFLINELEN  1024
 #define BDFLINESTR  "%1023s" /* scanf specifier to read a BDFLINELEN string */
 static Bool bdfPadToTerminal(FontPtr pFont);
 extern int  bdfFileLineNum;
 /***====================================================================***/
 static Bool
 bdfReadBitmap(CharInfoPtr pCI, FontFilePtr file, int bit, int byte,
 	      int glyph, int scan, CARD32 *sizes)
+{
     int         widthBits,
                 widthBytes,
                 widthHexChars;
 @@ -331,27 +332,27 @@ bdfReadCharacters(FontFilePtr file, Font
 	int         t;
 	int         wx;		/* x component of width */
 	int         wy;		/* y component of width */
 	int         bw;		/* bounding-box width */
 	int         bh;		/* bounding-box height */
 	int         bl;		/* bounding-box left */
 	int         bb;		/* bounding-box bottom */
 	int         enc,
 	            enc2;	/* encoding */
 	unsigned char *p;	/* temp pointer into line */
 	char        charName[100];
 	int         ignore;
-	if (sscanf((char *) line, "STARTCHAR %s", charName) != 1) {
+	if (sscanf((char *) line, "STARTCHAR %99s", charName) != 1) {
 	    bdfError("bad character name in BDF file\n");
 	    goto BAILOUT;	/* bottom of function, free and return error */
+	}
 	if (bitmapExtra)
 	    bitmapExtra->glyphNames[ndx] = bdfForceMakeAtom(charName, NULL);
 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
 	if (!line || (t = sscanf((char *) line, "ENCODING %d %d", &enc, &enc2)) < 1) {
 	    bdfError("bad 'ENCODING' in BDF file\n");
 	    goto BAILOUT;
+	}
 	if (enc < -1 || (t == 2 && enc2 < -1)) {
 	    bdfError("bad ENCODING value");
 @@ -537,33 +538,38 @@ BAILOUT:
     return (FALSE);
+}
 /***====================================================================***/
 static Bool
 bdfReadHeader(FontFilePtr file, bdfFileState *pState)
+{
     unsigned char *line;
     char        namebuf[BDFLINELEN];
     unsigned char        lineBuf[BDFLINELEN];
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
-    if (!line || sscanf((char *) line, "STARTFONT %s", namebuf) != 1 ||
+    if (!line ||
 	sscanf((char *) line, "STARTFONT " BDFLINESTR, namebuf) != 1 ||
 	    !bdfStrEqual(namebuf, "2.1")) {
 	bdfError("bad 'STARTFONT'\n");
 	return (FALSE);
+    }
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
-    if (!line || sscanf((char *) line, "FONT %[^\n]", pState->fontName) != 1) {
+#if MAXFONTNAMELEN != 1024
 # error "need to adjust sscanf length limit to be MAXFONTNAMELEN - 1"
 #endif
     if (!line ||
 	sscanf((char *) line, "FONT %1023[^\n]", pState->fontName) != 1) {
 	bdfError("bad 'FONT'\n");
 	return (FALSE);
+    }
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
     if (!line || !bdfIsPrefix(line, "SIZE")) {
 	bdfError("missing 'SIZE'\n");
 	return (FALSE);
+    }
     if (sscanf((char *) line, "SIZE %f%d%d", &pState->pointSize,
 	       &pState->resolution_x, &pState->resolution_y) != 3) {
 	bdfError("bad 'SIZE'\n");
 	return (FALSE);
+    }
 @@ -626,27 +632,29 @@ bdfReadProperties(FontFilePtr file, Font
     nextProp = 0;
     props_left = nProps;
     while (props_left-- > 0) {
 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
 	if (line == NULL || bdfIsPrefix(line, "ENDPROPERTIES")) {
 	    bdfError("\"STARTPROPERTIES %d\" followed by only %d properties\n",
 		     nProps, nProps - props_left - 1);
 	    goto BAILOUT;
+	}
 	while (*line && isspace(*line))
 	    line++;
-	switch (sscanf((char *) line, "%s%s%s", namebuf, secondbuf, thirdbuf)) {
+	switch (sscanf((char *) line,
 			BDFLINESTR BDFLINESTR BDFLINESTR,
 			namebuf, secondbuf, thirdbuf)) {
 	default:
 	    bdfError("missing '%s' parameter value\n", namebuf);
 	    goto BAILOUT;
 	case 2:
 	    /*
 	     * Possibilites include: valid quoted string with no white space
 	     * valid integer value invalid value
 	     */
 	    if (secondbuf[0] == '"') {
 		stringProps[nextProp] = TRUE;
 		props[nextProp].value =
 		    bdfGetPropertyValue((char *)line + strlen(namebuf) + 1);

 @@ -60,26 +60,27 @@ from The Open Group.
 /* use bitmap structure */
 #include "bitmap.h"
 #include "bdfint.h"
 #if HAVE_STDINT_H
 #include <stdint.h>
 #elif !defined(INT32_MAX)
 #define INT32_MAX 0x7fffffff
 #endif
 #define INDICES 256
 #define MAXENCODING 0xFFFF
 #define BDFLINELEN  1024
 #define BDFLINESTR  "%1023s" /* scanf specifier to read a BDFLINELEN string */
 static Bool bdfPadToTerminal(FontPtr pFont);
 extern int  bdfFileLineNum;
 /***====================================================================***/
 static Bool
 bdfReadBitmap(CharInfoPtr pCI, FontFilePtr file, int bit, int byte,
 	      int glyph, int scan, CARD32 *sizes)
+{
     int         widthBits,
                 widthBytes,
                 widthHexChars;
 @@ -330,27 +331,27 @@ bdfReadCharacters(FontFilePtr file, Font
 	int         t;
 	int         wx;		/* x component of width */
 	int         wy;		/* y component of width */
 	int         bw;		/* bounding-box width */
 	int         bh;		/* bounding-box height */
 	int         bl;		/* bounding-box left */
 	int         bb;		/* bounding-box bottom */
 	int         enc,
 	            enc2;	/* encoding */
 	unsigned char *p;	/* temp pointer into line */
 	char        charName[100];
 	int         ignore;
-	if (sscanf((char *) line, "STARTCHAR %s", charName) != 1) {
+	if (sscanf((char *) line, "STARTCHAR %99s", charName) != 1) {
 	    bdfError("bad character name in BDF file\n");
 	    goto BAILOUT;	/* bottom of function, free and return error */
+	}
 	if (bitmapExtra)
 	    bitmapExtra->glyphNames[ndx] = bdfForceMakeAtom(charName, NULL);
 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
 	if (!line || (t = sscanf((char *) line, "ENCODING %d %d", &enc, &enc2)) < 1) {
 	    bdfError("bad 'ENCODING' in BDF file\n");
 	    goto BAILOUT;
+	}
 	if (enc < -1 || (t == 2 && enc2 < -1)) {
 	    bdfError("bad ENCODING value");
 @@ -539,33 +540,38 @@ BAILOUT:
     return (FALSE);
+}
 /***====================================================================***/
 static Bool
 bdfReadHeader(FontFilePtr file, bdfFileState *pState)
+{
     unsigned char *line;
     char        namebuf[BDFLINELEN];
     unsigned char        lineBuf[BDFLINELEN];
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
-    if (!line || sscanf((char *) line, "STARTFONT %s", namebuf) != 1 ||
+    if (!line ||
 	sscanf((char *) line, "STARTFONT " BDFLINESTR, namebuf) != 1 ||
 	    !bdfStrEqual(namebuf, "2.1")) {
 	bdfError("bad 'STARTFONT'\n");
 	return (FALSE);
+    }
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
-    if (!line || sscanf((char *) line, "FONT %[^\n]", pState->fontName) != 1) {
+#if MAXFONTNAMELEN != 1024
 # error "need to adjust sscanf length limit to be MAXFONTNAMELEN - 1"
 #endif
     if (!line ||
 	sscanf((char *) line, "FONT %1023[^\n]", pState->fontName) != 1) {
 	bdfError("bad 'FONT'\n");
 	return (FALSE);
+    }
     line = bdfGetLine(file, lineBuf, BDFLINELEN);
     if (!line || !bdfIsPrefix(line, "SIZE")) {
 	bdfError("missing 'SIZE'\n");
 	return (FALSE);
+    }
     if (sscanf((char *) line, "SIZE %f%d%d", &pState->pointSize,
 	       &pState->resolution_x, &pState->resolution_y) != 3) {
 	bdfError("bad 'SIZE'\n");
 	return (FALSE);
+    }
 @@ -629,27 +635,29 @@ bdfReadProperties(FontFilePtr file, Font
     nextProp = 0;
     props_left = nProps;
     while (props_left-- > 0) {
 	line = bdfGetLine(file, lineBuf, BDFLINELEN);
 	if (line == NULL || bdfIsPrefix(line, "ENDPROPERTIES")) {
 	    bdfError("\"STARTPROPERTIES %d\" followed by only %d properties\n",
 		     nProps, nProps - props_left - 1);
 	    goto BAILOUT;
+	}
 	while (*line && isspace(*line))
 	    line++;
-	switch (sscanf((char *) line, "%s%s%s", namebuf, secondbuf, thirdbuf)) {
+	switch (sscanf((char *) line,
 			BDFLINESTR BDFLINESTR BDFLINESTR,
 			namebuf, secondbuf, thirdbuf)) {
 	default:
 	    bdfError("missing '%s' parameter value\n", namebuf);
 	    goto BAILOUT;
 	case 2:
 	    /*
 	     * Possibilites include: valid quoted string with no white space
 	     * valid integer value invalid value
 	     */
 	    if (secondbuf[0] == '"') {
 		stringProps[nextProp] = TRUE;
 		props[nextProp].value =
 		    bdfGetPropertyValue((char *)line + strlen(namebuf) + 1);