Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mostly sync with CSRG.

Browse Source
This commit is contained in:
mycroft 1994-12-28 01:37:49 +00:00
parent 700673cebf
commit 0155aa3b5e
2 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/rm/rm.1
View File

@ -32,10 +32,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" from: @(#)rm.1 8.2 (Berkeley) 4/18/94 .\" from: @(#)rm.1 8.5 (Berkeley) 12/5/94
.\" $Id: rm.1,v 1.5 1994/09/20 00:37:14 mycroft Exp $ .\" $Id: rm.1,v 1.6 1994/12/28 01:37:49 mycroft Exp $
.\" .\"
.Dd April 18, 1994 .Dd December 5, 1994
.Dt RM 1 .Dt RM 1
.Os .Os
.Sh NAME .Sh NAME
@ -44,7 +44,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm rm .Nm rm
.Op Fl f | Fl i .Op Fl f | Fl i
.Op Fl dPRr .Op Fl dPRrW
.Ar file ... .Ar file ...
.Sh DESCRIPTION .Sh DESCRIPTION
The The
@ -100,6 +100,10 @@ that directory is skipped.
.It Fl r .It Fl r
Equivalent to Equivalent to
.Fl R . .Fl R .
.It Fl W
Attempts to undelete the named files.
Currently, this option can only be used to recover
files covered by whiteouts.
.El .El
.Pp .Pp
The The
@ -120,6 +124,7 @@ If an error occurs,
exits with a value >0. exits with a value >0.
.Sh SEE ALSO .Sh SEE ALSO
.Xr rmdir 1 , .Xr rmdir 1 ,
.Xr undelete 2 ,
.Xr unlink 2 , .Xr unlink 2 ,
.Xr fts 3 , .Xr fts 3 ,
.Xr symlink 7 .Xr symlink 7

60
bin/rm/rm.c
View File

@ -38,8 +38,8 @@ static char copyright[] =
#endif /* not lint */ #endif /* not lint */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)rm.c 8.5 (Berkeley) 4/18/94";*/ /*static char sccsid[] = "from: @(#)rm.c 8.7 (Berkeley) 10/18/94";*/
static char *rcsid = "$Id: rm.c,v 1.16 1994/11/02 16:17:14 jtc Exp $"; static char *rcsid = "$Id: rm.c,v 1.17 1994/12/28 01:37:50 mycroft Exp $";
#endif /* not lint */ #endif /* not lint */
#include <sys/types.h> #include <sys/types.h>
@ -55,7 +55,7 @@ static char *rcsid = "$Id: rm.c,v 1.16 1994/11/02 16:17:14 jtc Exp $";
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
int dflag, eval, fflag, iflag, Pflag, stdin_ok; int dflag, eval, fflag, iflag, Pflag, Wflag, stdin_ok;
int check __P((char *, char *, struct stat *)); int check __P((char *, char *, struct stat *));
void checkdot __P((char **)); void checkdot __P((char **));
@ -81,7 +81,7 @@ main(argc, argv)
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
Pflag = rflag = 0; Pflag = rflag = 0;
while ((ch = getopt(argc, argv, "dfiPRr")) != -1) while ((ch = getopt(argc, argv, "dfiPRrW")) != -1)
switch(ch) { switch(ch) {
case 'd': case 'd':
dflag = 1; dflag = 1;
@ -101,6 +101,9 @@ main(argc, argv)
case 'r': /* Compatibility. */ case 'r': /* Compatibility. */
rflag = 1; rflag = 1;
break; break;
case 'W':
Wflag = 1;
break;
case '?': case '?':
default: default:
usage(); usage();
@ -132,6 +135,7 @@ rm_tree(argv)
FTS *fts; FTS *fts;
FTSENT *p; FTSENT *p;
int needstat; int needstat;
int flags;
/* /*
* Remove a file hierarchy. If forcing removal (-f), or interactive * Remove a file hierarchy. If forcing removal (-f), or interactive
@ -145,9 +149,12 @@ rm_tree(argv)
*/ */
#define SKIPPED 1 #define SKIPPED 1
if (!(fts = fts_open(argv, flags = FTS_PHYSICAL;
needstat ? FTS_PHYSICAL : FTS_PHYSICAL|FTS_NOSTAT, if (!needstat)
(int (*)())NULL))) flags |= FTS_NOSTAT;
if (Wflag)
flags |= FTS_WHITEOUT;
if (!(fts = fts_open(argv, flags, (int (*)())NULL)))
err(1, NULL); err(1, NULL);
while ((p = fts_read(fts)) != NULL) { while ((p = fts_read(fts)) != NULL) {
switch (p->fts_info) { switch (p->fts_info) {
@ -197,10 +204,20 @@ rm_tree(argv)
* able to remove it. Don't print out the un{read,search}able * able to remove it. Don't print out the un{read,search}able
* message unless the remove fails. * message unless the remove fails.
*/ */
if (p->fts_info == FTS_DP || p->fts_info == FTS_DNR) { switch (p->fts_info) {
case FTS_DP:
case FTS_DNR:
if (!rmdir(p->fts_accpath) || fflag && errno == ENOENT) if (!rmdir(p->fts_accpath) || fflag && errno == ENOENT)
continue; continue;
} else { break;
case FTS_W:
if (!undelete(p->fts_accpath) ||
fflag && errno == ENOENT)
continue;
break;
default:
if (Pflag) if (Pflag)
rm_overwrite(p->fts_accpath, NULL); rm_overwrite(p->fts_accpath, NULL);
if (!unlink(p->fts_accpath) || fflag && errno == ENOENT) if (!unlink(p->fts_accpath) || fflag && errno == ENOENT)
@ -228,20 +245,31 @@ rm_file(argv)
while ((f = *argv++) != NULL) { while ((f = *argv++) != NULL) {
/* Assume if can't stat the file, can't unlink it. */ /* Assume if can't stat the file, can't unlink it. */
if (lstat(f, &sb)) { if (lstat(f, &sb)) {
if (!fflag || errno != ENOENT) { if (Wflag) {
warn("%s", f); sb.st_mode = S_IFWHT|S_IWUSR|S_IRUSR;
eval = 1; } else {
if (!fflag || errno != ENOENT) {
warn("%s", f);
eval = 1;
}
continue;
} }
} else if (Wflag) {
warnx("%s: %s", f, strerror(EEXIST));
eval = 1;
continue; continue;
} }
if (S_ISDIR(sb.st_mode) && !dflag) { if (S_ISDIR(sb.st_mode) && !dflag) {
warnx("%s: is a directory", f); warnx("%s: is a directory", f);
eval = 1; eval = 1;
continue; continue;
} }
if (!fflag && !check(f, f, &sb)) if (!fflag && !S_ISWHT(sb.st_mode) && !check(f, f, &sb))
continue; continue;
if (S_ISDIR(sb.st_mode)) if (S_ISWHT(sb.st_mode))
rval = undelete(f);
else if (S_ISDIR(sb.st_mode))
rval = rmdir(f); rval = rmdir(f);
else { else {
if (Pflag) if (Pflag)
@ -344,7 +372,6 @@ check(path, name, sp)
return (first == 'y' || first == 'Y'); return (first == 'y' || first == 'Y');
} }
/* /*
* POSIX.2 requires that if "." or ".." are specified as the basename * POSIX.2 requires that if "." or ".." are specified as the basename
* portion of an operand, a diagnostic message be written to standard * portion of an operand, a diagnostic message be written to standard
@ -353,7 +380,6 @@ check(path, name, sp)
* Since POSIX.2 defines basename as the final portion of a path after * Since POSIX.2 defines basename as the final portion of a path after
* trailing slashes have been removed, we'll remove them here. * trailing slashes have been removed, we'll remove them here.
*/ */
#define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || (a)[1] == '.' && !(a)[2])) #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || (a)[1] == '.' && !(a)[2]))
void void
checkdot(argv) checkdot(argv)
@ -391,6 +417,6 @@ void
usage() usage()
{ {
(void)fprintf(stderr, "usage: rm [-dfiPRr] file ...\n"); (void)fprintf(stderr, "usage: rm [-dfiPRrW] file ...\n");
exit(1); exit(1);
} }