Commit 858f4419 authored by Guido van Rossum's avatar Guido van Rossum

Added '-l[flags]' option.

parent dd18a20b
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Variant of "which". # Variant of "which".
# On stderr, near and total misses are reported. # On stderr, near and total misses are reported.
# '-l<flags>' argument adds ls -l<flags> of each file found.
import sys, posix, string, path import sys, posix, string, path
from stat import * from stat import *
...@@ -12,6 +13,11 @@ def msg(str): ...@@ -12,6 +13,11 @@ def msg(str):
pathlist = string.splitfields(posix.environ['PATH'], ':') pathlist = string.splitfields(posix.environ['PATH'], ':')
sts = 0 sts = 0
longlist = ''
if sys.argv[1:] and sys.argv[1][:2] == '-l':
longlist = sys.argv[1]
del sys.argv[1]
for prog in sys.argv[1:]: for prog in sys.argv[1:]:
ident = () ident = ()
...@@ -19,24 +25,27 @@ for prog in sys.argv[1:]: ...@@ -19,24 +25,27 @@ for prog in sys.argv[1:]:
file = path.join(dir, prog) file = path.join(dir, prog)
try: try:
st = posix.stat(file) st = posix.stat(file)
if S_ISREG(st[ST_MODE]): except posix.error:
mode = S_IMODE(st[ST_MODE]) continue
if mode % 2 or mode/8 % 2 or mode/64 % 2: if not S_ISREG(st[ST_MODE]):
if ident: msg(file + ': not a disk file')
if st[:3] == ident: else:
s = ': same as ' mode = S_IMODE(st[ST_MODE])
else: if mode & 0111:
s = ': also ' if not ident:
msg(prog + s + file) print file
else: ident = st[:3]
print file
ident = st[:3]
else: else:
msg(file + ': not executable') if st[:3] == ident:
s = 'same as: '
else:
s = 'also: '
msg(s + file)
else: else:
msg(file + ': not a disk file') msg(file + ': not executable')
except posix.error: if longlist:
pass sts = posix.system('ls ' + longlist + ' ' + file)
if sts: msg('"ls -l" exit status: ' + `sts`)
if not ident: if not ident:
msg(prog + ': not found') msg(prog + ': not found')
sts = 1 sts = 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment