d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

seq(1): Require user-provided format strings to contain a conversion

Browse Source 
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
This commit is contained in:
Conrad Meyer 2019-03-07 18:24:16 +00:00
parent 052d159a8b
commit 905fdc3ff1
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/seq/seq.c
View File

@ -310,7 +310,8 @@ valid_format(const char *fmt)
}
}
return (conversions <= 1);
/* PR 236347 -- user format strings must have a conversion */
return (conversions == 1);
}
/*

17
usr.bin/seq/tests/seq_test.sh
View File

@ -1,4 +1,4 @@
# Copyright (c) 2018 Conrad Meyer <cem@FreeBSD.org>
# Copyright (c) 2019 Conrad Meyer <cem@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
}