Allow user to omit font size specification when loading a font. In addition

the following fixes had been made:

- check the size of the font being loaded and compare it with possible sizes
  to minimise possibility of loading something that is not a fontfile at all
  and turning console screen into garbage;

- prevent buffer overflow (and coredump as a result ) when loading valid
  uuencoded file with size that exceeds allocated buffer;

- correct and improve several error messages.

Approved by:	-audit, -hackers (silently)

1 files changed, 12 insertions, 2 deletions

diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index ab92c54..91b6cf3 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -24,7 +24,7 @@
 .Op Fl b Ar color
 .Op Fl c Ar appearance
 .Op Fl d
-.Op Fl f Ar size Ar file
+.Op Fl f Oo Ar size Oc Ar \ file
 .Op Fl g Ar geometry
 .Op Fl i Cm adapter | mode
 .Op Fl l Ar screen_map
@@ -142,7 +142,7 @@ or
 Used together with the 
 .Xr moused 8
 daemon for text mode cut & paste functionality.
-.It Fl f Ar size Ar file
+.It Fl f [ Ar size ] Ar file
 Load font
 .Ar file
 for
@@ -157,6 +157,11 @@ You can also use the menu-driven
 .Xr vidfont 1
 command to load the font of your choice.
 .Pp
+.Ar Size
+may be omitted, in this case
+.Nm
+will try to guess it from the size of font file.
+.Pp
 Note that older video cards, such as MDA and CGA, do not support 
 software font.
 See also
@@ -296,6 +301,11 @@ you may abbreviate the file name as
 .Pp
 .Dl vidcontrol -f 8x16 iso-8x16
 .Pp
+Furthermore, you can also omit font size
+.Dq 8x16 :
+.Pp
+.Dl vidcontrol -f iso-8x16
+.Pp
 Likewise, you can also abbreviate the screen output map file name for
 the
 .Fl l