summaryrefslogtreecommitdiffstats
path: root/usr.bin/jot
diff options
context:
space:
mode:
authordds <dds@FreeBSD.org>2006-11-06 15:11:50 +0000
committerdds <dds@FreeBSD.org>2006-11-06 15:11:50 +0000
commit41f3c2053fb177055691c8f832a4a9cc62c3c65b (patch)
treebda309685456bbe12ea67a0fac550092564989fd /usr.bin/jot
parent9463ede042c21b113792c1aadb5d0651507b7786 (diff)
downloadFreeBSD-src-41f3c2053fb177055691c8f832a4a9cc62c3c65b.zip
FreeBSD-src-41f3c2053fb177055691c8f832a4a9cc62c3c65b.tar.gz
Use a more sensible default of 1 or -1 when only the start and
end values are specified. PR: bin/68981 Submitted by: Stefan `Sec` Zehl MFC after: 2 weeks
Diffstat (limited to 'usr.bin/jot')
-rw-r--r--usr.bin/jot/jot.16
-rw-r--r--usr.bin/jot/jot.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 1aa0d62..77cebb4 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -115,7 +115,7 @@ conflict, the lower value is used.
If fewer than three are specified, defaults are assigned
left to right, except for
.Ar s ,
-which assumes its default unless both
+which assumes a default of 1 or -1 if both
.Ar begin
and
.Ar end
@@ -171,6 +171,10 @@ a function in APL.
.Ex -std
.Sh EXAMPLES
The command
+.Dl jot - 1 10
+.Pp
+prints the integers from 1 to 10,
+while the command
.Dl jot 21 -1 1.00
.Pp
prints 21 evenly spaced numbers increasing from -1 to 1.
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index d7f700c..f403bcc 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -193,10 +193,13 @@ main(int argc, char **argv)
case HAVE_ENDER | HAVE_STEP:
case HAVE_BEGIN:
case HAVE_BEGIN | HAVE_STEP:
- case HAVE_BEGIN | HAVE_ENDER:
reps = REPS_DEF;
mask |= HAVE_REPS;
break;
+ case HAVE_BEGIN | HAVE_ENDER:
+ s = ender > begin ? 1 : -1;
+ mask |= HAVE_STEP;
+ break;
case HAVE_BEGIN | HAVE_ENDER | HAVE_STEP:
if (randomize)
reps = REPS_DEF;
OpenPOWER on IntegriCloud