fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix last offset output using skip in od(1)

Browse Source 
Yeah, if the skipping is longer than the file itself, we need
to take the skip value, not the address.
Also, only print the last newline when we've actually printed
at least 1 address.
This commit is contained in:
FRIGN 2015-09-30 20:06:22 +02:00 committed by sin
parent 8be7c42863
commit 98e7e75ec6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
od.c
View File

@ -89,10 +89,10 @@ od(FILE *in, char *in_name, FILE *out, char *out_name)
if (feof(in) || ferror(in) || ferror(out)) if (feof(in) || ferror(in) || ferror(out))
break; break;
} }
if (addr) if (addr - skip > 0)
fputc('\n', out); fputc('\n', out);
if (radix != 'n') { if (radix != 'n') {
printaddress(out, addr); printaddress(out, MAX(addr, skip));
fputc('\n', out); fputc('\n', out);
} }
} }