svn commit: r344891 - in head/usr.bin/seq: . tests
Conrad Meyer
cem at FreeBSD.org
Thu Mar 7 18:24:18 UTC 2019
Author: cem
Date: Thu Mar 7 18:24:16 2019
New Revision: 344891
URL: https://svnweb.freebsd.org/changeset/base/344891
Log:
seq(1): Require user-provided format strings to contain a conversion
This matches GNU seq, for example.
For users that are looking for similar functionality, 'jot -b foo N' will
print 'foo' N times. See jot(1).
PR: 236347
Reported by: <y AT maya.st>
Sponsored by: Dell EMC Isilon
Modified:
head/usr.bin/seq/seq.c
head/usr.bin/seq/tests/seq_test.sh
Modified: head/usr.bin/seq/seq.c
==============================================================================
--- head/usr.bin/seq/seq.c Thu Mar 7 18:12:34 2019 (r344890)
+++ head/usr.bin/seq/seq.c Thu Mar 7 18:24:16 2019 (r344891)
@@ -310,7 +310,8 @@ valid_format(const char *fmt)
}
}
- return (conversions <= 1);
+ /* PR 236347 -- user format strings must have a conversion */
+ return (conversions == 1);
}
/*
Modified: head/usr.bin/seq/tests/seq_test.sh
==============================================================================
--- head/usr.bin/seq/tests/seq_test.sh Thu Mar 7 18:12:34 2019 (r344890)
+++ head/usr.bin/seq/tests/seq_test.sh Thu Mar 7 18:24:16 2019 (r344891)
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Conrad Meyer <cem at FreeBSD.org>
+# Copyright (c) 2019 Conrad Meyer <cem at FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,22 @@ float_rounding_body()
atf_check -o inline:'1\n1.1\n1.2\n' seq 1 0.1 1.2
}
+atf_test_case format_includes_conversion
+format_includes_conversion_head()
+{
+ atf_set "descr" "Check for correct user-provided format strings"
+}
+format_includes_conversion_body()
+{
+ # PR 236347
+ atf_check -s exit:1 -o empty -e match:"invalid format string" \
+ seq -f foo 3
+ atf_check -s exit:0 -o inline:'foo1\nfoo2\n' -e empty \
+ seq -f foo%g 2
+}
+
atf_init_test_cases()
{
atf_add_test_case float_rounding
+ atf_add_test_case format_includes_conversion
}
More information about the svn-src-head
mailing list