cvs commit: src/bin/ls extern.h ls.c print.c

[Jeroen Ruigrok/asmodai]

asmodai     2005/09/18 11:01:49 PDT

DragonFly src repository

  Modified files:
    bin/ls               extern.h ls.c print.c 
  Log:
  Synchronise with FreeBSD:
  
  Bump Id where needed.
  
  Constify parameters that do not get touched.
  
  Do something sensible if both -h and -k are given.
  
  If we are asked to print the total number of blocks, do so even if we
  have no entries to print (either due to an empty directory or an
  error).  This makes the -l and -s options more consistent, like
  Solaris and (Debian) Linux.  To make this happen, tweak two
  optimizations on the second call to display():
  
  - Don't skip display() altogether, even if list == NULL.
  - Don't skip the call to the printfn in display() if we
    need to print the total.
  
  Small clean ups and casts.
  
  Revision  Changes    Path
  1.6       +4 -4      src/bin/ls/extern.h
  1.14      +17 -14    src/bin/ls/ls.c
  1.13      +8 -7      src/bin/ls/print.c


http://www.dragonflybsd.org/cvsweb/src/bin/ls/extern.h.diff?r1=1.5&r2=1.6&f=u
http://www.dragonflybsd.org/cvsweb/src/bin/ls/ls.c.diff?r1=1.13&r2=1.14&f=u
http://www.dragonflybsd.org/cvsweb/src/bin/ls/print.c.diff?r1=1.12&r2=1.13&f=u