bonsai/harakit
5
4
Fork 3
Code Issues 38 Pull Requests 6 Projects 1 Releases 21 Activity

dj(1), dj.1: Remove -A (use -a "\0") (see #101)

Browse Source
This commit is contained in:
dtb 2024-06-26 13:45:36 -06:00
parent e65f6b650d
commit fb74e7bef0
Signed by: trinity
GPG Key ID: 34C0543BBB6AF81B
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/dj.1
View File

@ -11,7 +11,7 @@ dj \(en disk jockey
.SH SYNOPSIS
dj
.RB ( -AHn )
.RB ( -Hn )
.RB ( -a
.RB [ byte ])
.RB ( -c
@ -67,12 +67,8 @@ Seeks a number of bytes through the output before starting to write from
the input. If the output is a stream, null characters are printed.
.IP \fB-a\fP
Accepts a single literal byte with which the input buffer is padded in the event
of an incomplete read from the input file.
.IP \fB-A\fP
Specifying this option pads the input buffer with null bytes in the event of an
incomplete read. This is equivalent to specifying
.B -a
with a null byte instead of a character.
of an incomplete read from the input file. If the option argument is empty, the
null byte is used.
.IP \fB-c\fP
Specifies a number of reads to make. The default is 0, in which case the
input is read until a partial or empty read is made.

7
src/dj.c
View File

@ -265,7 +265,7 @@ parse(char *s){
static int
usage(void){
fprintf(stderr, "Usage: %s (-AHn) (-a [byte]) (-c [count])\n"
fprintf(stderr, "Usage: %s (-Hn) (-a [byte]) (-c [count])\n"
"\t(-i [input file]) (-b [input block size]) (-s [input offset])\n"
"\t(-o [output file]) (-B [output block size]) (-S [output offset])\n",
program_name);
@ -294,7 +294,7 @@ int main(int argc, char *argv[]){
if(argc > 0){
program_name = argv[0];
while((c = getopt(argc, argv, "a:Ab:B:c:i:hHns:S:o:")) != -1)
while((c = getopt(argc, argv, "a:b:B:c:i:hHns:S:o:")) != -1)
switch(c){
case 'i': case 'o':
i = (c == 'o');
@ -306,11 +306,10 @@ int main(int argc, char *argv[]){
break;
terminate(io);
return oserr(optarg);
case 'A': align = '\0'; break;
case 'n': noerror = 1; break;
case 'H': fmt_output = fmt_human; break;
case 'a':
if(optarg[0] != '\0' && optarg[1] == '\0'){
if(optarg[0] == '\0' || optarg[1] == '\0'){
align = optarg[0];
break;
}