Back out rev 1.11, about which bde had concerns, and instead implement

appropriate bounds-checking and typecasts based on our knowledge of
the desired conversion format specifier.

Simplify diagnostics and take care to print the correct conversion
format specifier when %l is involved.

1 files changed, 23 insertions, 14 deletions

diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index d8419c7..68fc42e 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -183,18 +183,16 @@ from column 10 and ending in column 132, use
 .Pp
 and to print all lines 80 characters or longer,
 .Dl grep `jot -s \&"\&" -b \&. 80`
-.Pp
-.Sh SEE ALSO
-.Xr ed 1 ,
-.Xr expand 1 ,
-.Xr rs 1 ,
-.Xr yes 1 ,
-.Xr printf 3 ,
-.Xr random 3
-.Sh BUGS
-Conversion format specifiers for
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
+The following diagnostic messages deserve special explanation:
+.Bl -diag
+.It "illegal or unsupported format '%s'"
+The requested conversion format specifier for
 .Xr printf 3
-are limited to those of the form
+was not of the form
 .Dl %[#][ ][{+,-}][0-9]*[.[0-9]*]?
 where
 .Dq ?
@@ -202,6 +200,17 @@ must be one of
 .Dl [l]{d,i,o,u,x}
 or
 .Dl {c,e,f,g,D,E,G,O,U,X}
-.Pp
-No bounds-checking is performed on numeric values, so arithmetic overflow
-will cause a fatal error.
+.It "range error in conversion"
+A value to be printed fell outside the range of the data type
+associated with the requested output format.
+.It "too many conversions"
+More than one conversion format specifier has been supplied,
+but only one is allowed.
+.El
+.Sh SEE ALSO
+.Xr ed 1 ,
+.Xr expand 1 ,
+.Xr rs 1 ,
+.Xr yes 1 ,
+.Xr printf 3 ,
+.Xr random 3