Skip to content

od: standard -s option #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2024
Merged

od: standard -s option #661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions bin/od
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use constant LINESZ => 16;
use constant PRINTMAX => 126;

use vars qw/ $opt_A $opt_a $opt_b $opt_c $opt_d $opt_f $opt_i $opt_j $opt_l
$opt_N $opt_o $opt_v $opt_x /;
$opt_N $opt_o $opt_s $opt_v $opt_x /;

our $VERSION = '1.0';

Expand Down Expand Up @@ -85,7 +85,7 @@ $lastline = '';

my $Program = basename($0);

getopts('A:abcdfij:lN:ovx') or help();
getopts('A:abcdfij:lN:osvx') or help();
if (defined $opt_A) {
if ($opt_A !~ m/\A[doxn]\z/) {
warn "$Program: unexpected radix: '$opt_A'\n";
Expand Down Expand Up @@ -129,7 +129,7 @@ elsif ($opt_d) {
elsif ($opt_f) {
$fmt = \&float;
}
elsif ($opt_i) {
elsif ($opt_i || $opt_s) {
$fmt = \&decimal;
}
elsif ($opt_l) {
Expand Down Expand Up @@ -348,7 +348,7 @@ sub diffdata {
}

sub help {
print "usage: od [-abcdfiloxv] [-A radix] [-j skip_bytes] [-N limit_bytes] [file]...\n";
print "usage: od [-abcdfilosxv] [-A radix] [-j skip_bytes] [-N limit_bytes] [file]...\n";
exit EX_FAILURE;
}
__END__
Expand All @@ -359,7 +359,7 @@ od - dump files in octal and other formats

=head1 SYNOPSIS

B<od> [ I<-abcdfiloxv> ] [I<-j skip_n_bytes>] [I<-N read_n_bytes>] [ I<-A radix> ] [ F<file>... ]
B<od> [ I<-abcdfilosxv> ] [I<-j skip_n_bytes>] [I<-N read_n_bytes>] [ I<-A radix> ] [ F<file>... ]

=head1 DESCRIPTION

Expand Down Expand Up @@ -403,15 +403,15 @@ Show input as floating point numbers in exponent form.

=item -i

Show two-byte signed integers.
Show two-byte signed decimal integers.

=item -j Skip

Ignore the first Skip bytes of input.

=item -l

Show four-byte signed integers.
Show four-byte signed decimal integers.

=item -N Bytes

Expand All @@ -421,6 +421,10 @@ Set the number of maximum input bytes read.

Format input as two-byte octal numbers.

=item -s

Same as -i

=item -x

Use two-byte hexadecimal format.
Expand Down