cvs commit: src/bin/rm rm.1 rm.c

[Doug Barton]

dougb       2005-09-29 20:40:29 UTC

  FreeBSD src repository

  Modified files:
    bin/rm               rm.1 rm.c 
  Log:
  Handle the case where the -P flag is specified for a read-only file
  earlier, and more gracefully. Previously, this combination would be
  ignored early in the code where permissions are tested and fail later
  with a very unhelpful "permission denied" error.
  
  Instead, test for this flag in the same block that generates the
  "override?" messages for read-only files, but instead of trying
  to guess what the user has in mind, generate an error and exit.
  
  Update the man page to reflect this new behavior.
  
  Not objected to by:     freebsd-hackers@
  
  Revision  Changes    Path
  1.37      +4 -0      src/bin/rm/rm.1
  1.53      +5 -4      src/bin/rm/rm.c