mahlon/shelldap
1
0
Fork 0
Code Issues Pull requests Activity

With ls -l, print file type ('-' or 'd') as first field of output

Browse source 
This change brings output of 'ls -l' closer to the actual shell command.

FossilOrigin-Name: 7f38c81ca4c4844eae37e5450b3bda2f4bfdf4a68c840b81f3f2cd963bc0473d
This commit is contained in:
docelic@crystallabs.io 2019-05-04 20:38:32 +00:00
parent 1b07818e6a
commit c03ba4a650
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
shelldap
View file

@ -2011,7 +2011,7 @@ sub run_list
my $filter; my $filter;
# flag booleans # flag booleans
my ( $recurse, $long ); my ( $recurse, $long, $all );
# parse arguments: [ <option> ...] [<filter> ...] [<attribute> ...] # parse arguments: [ <option> ...] [<filter> ...] [<attribute> ...]
# #
@ -2021,6 +2021,7 @@ sub run_list
my $flags = $1; my $flags = $1;
$recurse = $flags =~ /R/; $recurse = $flags =~ /R/;
$long = $flags =~ /l/; $long = $flags =~ /l/;
$all = $flags =~ /a/;
shift( @args ); shift( @args );
} }
@ -2076,7 +2077,11 @@ sub run_list
my $base = $self->base(); my $base = $self->base();
foreach my $e ( sort { $a->dn() cmp $b->dn() } @{ $s->{'entries'} } ) { foreach my $e ( sort { $a->dn() cmp $b->dn() } @{ $s->{'entries'} } ) {
my $dn = $e->dn(); my $dn = $e->dn();
next if lc( $dn ) eq lc( $base );
# Later, turn this into '.' and '..' display
unless($all) {
next if lc( $dn ) eq lc( $base );
}
if ( ! $long ) { if ( ! $long ) {
# strip the current base from the dn, if we're recursing and not in long mode # strip the current base from the dn, if we're recursing and not in long mode
@ -2090,37 +2095,42 @@ sub run_list
} }
} }
my $type = '-'; # Assume the entry is a leaf
# if this entry is a container for other entries, append a # if this entry is a container for other entries, append a
# trailing slash. # trailing slash.
$dn .= '/' if $e->get_value('hasSubordinates') && if( $e->get_value('hasSubordinates') && $e->get_value('hasSubordinates') eq 'TRUE') {
$e->get_value('hasSubordinates') eq 'TRUE'; $dn .= '/';
$type = 'd'
}
# additional arguments/attributes were given; show their values # additional arguments/attributes were given; show their values
# #
if ( scalar @args ) { if ( scalar @args ) {
my @elements = ( $dn ); my @line = ( $type, $dn );
foreach my $attr ( @args ) { foreach my $attr ( @args ) {
my @vals = $e->get_value( $attr ); my @vals = $e->get_value( $attr );
push( @elements, join(',', @vals) ); push( @line, join(',', @vals) );
} }
print join( "\t", @elements )."\n"; print join( "\t", @line )."\n";
} }
# show descriptions # show descriptions
# #
else { else {
my $line = "$type $dn";
my $desc = $e->get_value( 'description' ); my $desc = $e->get_value( 'description' );
if ( $desc ) { if ( $desc ) {
$desc =~ s/\n.*//s; # 1st line only $desc =~ s/\n.*//s; # 1st line only
$dn .= " ($desc)"; $line .= " ($desc)";
} } else {
# no desc? Try and infer something useful
# no desc? Try and infer something useful # to display.
# to display. #
#
else {
# pull objectClasses, hash for lookup speed # pull objectClasses, hash for lookup speed
my @oc = $e->get_value( 'objectClass' ); my @oc = $e->get_value( 'objectClass' );
@ -2130,12 +2140,12 @@ sub run_list
foreach my $d_listing ( sort keys %descs ) { foreach my $d_listing ( sort keys %descs ) {
if ( exists $ochash{ $d_listing } ) { if ( exists $ochash{ $d_listing } ) {
my $str = $e->get_value( $descs{ $d_listing }, asref => 1 ); my $str = $e->get_value( $descs{ $d_listing }, asref => 1 );
$dn .= ' (' . (join ', ', @$str) . ')' if $str && scalar @$str; $line .= ' (' . (join ', ', @$str) . ')' if $str && scalar @$str;
} }
next; next;
} }
} }
print "$dn\n"; print "$line\n";
} }
$dn_count++; $dn_count++;
} }