sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Import NetBSD mv command.

Browse source 
Change-Id: I08cd4e866685080f7b4d617ee150f5b9d7626e7e
This commit is contained in:
Zachary Storer 2014-07-07 12:13:40 -06:00 committed by Lionel Sambuc
parent 29fe671680
commit a8492e9397
7 changed files with 589 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/Makefile
View file

@ -2,7 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93 # @(#)Makefile 8.1 (Berkeley) 5/31/93
SUBDIR= cat chmod date df echo ed expr hostname \ SUBDIR= cat chmod date df echo ed expr hostname \
kill ksh ln ls mkdir pax pwd rm rmdir \ kill ksh ln ls mkdir mv pax pwd rm rmdir \
sleep stty sync test sleep stty sync test
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

6
bin/mv/Makefile Normal file
View file

@ -0,0 +1,6 @@
# $NetBSD: Makefile,v 1.9 2002/11/30 03:16:14 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/2/94
PROG= mv
.include <bsd.prog.mk>

146
bin/mv/mv.1 Normal file
View file

@ -0,0 +1,146 @@
.\" $NetBSD: mv.1,v 1.26 2012/03/22 07:58:17 wiz Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" the Institute of Electrical and Electronics Engineers, Inc.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" @(#)mv.1 8.1 (Berkeley) 5/31/93
.\"
.Dd December 26, 2002
.Dt MV 1
.Os
.Sh NAME
.Nm mv
.Nd move files
.Sh SYNOPSIS
.Nm
.Op Fl fiv
.Ar source target
.Nm
.Op Fl fiv
.Ar source ... directory
.Sh DESCRIPTION
In its first form, the
.Nm
utility renames the file named by the
.Ar source
operand to the destination path named by the
.Ar target
operand.
This form is assumed when the last operand does not name an already
existing directory.
.Pp
In its second form,
.Nm
moves each file named by a
.Ar source
operand to a destination file in the existing directory named by the
.Ar directory
operand.
The destination path for each operand is the pathname produced by the
concatenation of the last operand, a slash, and the final pathname
component of the named file.
.Pp
The following options are available:
.Bl -tag -width flag
.It Fl f
Do not prompt for confirmation before overwriting the destination
path.
.It Fl i
Causes
.Nm
to write a prompt to standard error before moving a file that would
overwrite an existing file.
If the response from the standard input begins with the character ``y'',
the move is attempted.
.It Fl v
Cause
.Nm
to be verbose, showing files as they are processed.
.El
.Pp
The last of any
.Fl f
or
.Fl i
options is the one which affects
.Nm Ns 's
behavior.
.Pp
It is an error for any of the
.Ar source
operands to specify a nonexistent file or directory.
.Pp
It is an error for the
.Ar source
operand to specify a directory if the
.Ar target
exists and is not a directory.
.Pp
If the destination path does not have a mode which permits writing,
.Nm
prompts the user for confirmation as specified for the
.Fl i
option.
.Pp
Should the
.Xr rename 2
call fail because
.Ar source
and
.Ar target
are on different file systems,
.Nm
will remove the destination file, copy the source file to the
destination, and then remove the source.
The effect is roughly equivalent to:
.Bd -literal -offset indent
rm -f destination_path \*[Am]\*[Am] \e
cp -PRp source_file destination_path \*[Am]\*[Am] \e
rm -rf source_file
.Ed
.Sh EXIT STATUS
The
.Nm
utility exits 0 on success, and \*[Gt]0 if an error occurs.
.Sh SEE ALSO
.Xr cp 1 ,
.Xr rename 2 ,
.Xr symlink 7
.Sh STANDARDS
The
.Nm
utility is expected to be
.St -p1003.2
compatible.
.Pp
The
.Fl v
option is an extension to
.St -p1003.2 .

396
bin/mv/mv.c Normal file
View file

@ -0,0 +1,396 @@
/* $NetBSD: mv.c,v 1.43 2011/08/29 14:46:54 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Ken Smith of The State University of New York at Buffalo.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1989, 1993, 1994\
The Regents of the University of California. All rights reserved.");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: mv.c,v 1.43 2011/08/29 14:46:54 joerg Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/extattr.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
#include <locale.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "pathnames.h"
static int fflg, iflg, vflg;
static int stdin_ok;
static int copy(char *, char *);
static int do_move(char *, char *);
static int fastcopy(char *, char *, struct stat *);
__dead static void usage(void);
int
main(int argc, char *argv[])
{
int ch, len, rval;
char *p, *endp;
struct stat sb;
char path[MAXPATHLEN + 1];
size_t baselen;
setprogname(argv[0]);
(void)setlocale(LC_ALL, "");
while ((ch = getopt(argc, argv, "ifv")) != -1)
switch (ch) {
case 'i':
fflg = 0;
iflg = 1;
break;
case 'f':
iflg = 0;
fflg = 1;
break;
case 'v':
vflg = 1;
break;
default:
usage();
}
argc -= optind;
argv += optind;
if (argc < 2)
usage();
stdin_ok = isatty(STDIN_FILENO);
/*
* If the stat on the target fails or the target isn't a directory,
* try the move. More than 2 arguments is an error in this case.
*/
if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) {
if (argc > 2)
usage();
exit(do_move(argv[0], argv[1]));
}
/* It's a directory, move each file into it. */
baselen = strlcpy(path, argv[argc - 1], sizeof(path));
if (baselen >= sizeof(path))
errx(1, "%s: destination pathname too long", argv[argc - 1]);
endp = &path[baselen];
if (!baselen || *(endp - 1) != '/') {
*endp++ = '/';
++baselen;
}
for (rval = 0; --argc; ++argv) {
p = *argv + strlen(*argv) - 1;
while (*p == '/' && p != *argv)
*p-- = '\0';
if ((p = strrchr(*argv, '/')) == NULL)
p = *argv;
else
++p;
if ((baselen + (len = strlen(p))) >= MAXPATHLEN) {
warnx("%s: destination pathname too long", *argv);
rval = 1;
} else {
memmove(endp, p, len + 1);
if (do_move(*argv, path))
rval = 1;
}
}
exit(rval);
/* NOTREACHED */
}
static int
do_move(char *from, char *to)
{
struct stat sb;
char modep[15];
/*
* (1) If the destination path exists, the -f option is not specified
* and either of the following conditions are true:
*
* (a) The permissions of the destination path do not permit
* writing and the standard input is a terminal.
* (b) The -i option is specified.
*
* the mv utility shall write a prompt to standard error and
* read a line from standard input. If the response is not
* affirmative, mv shall do nothing more with the current
* source file...
*/
if (!fflg && !access(to, F_OK)) {
int ask = 1;
int ch;
if (iflg) {
if (access(from, F_OK)) {
warn("rename %s", from);
return (1);
}
(void)fprintf(stderr, "overwrite %s? ", to);
} else if (stdin_ok && access(to, W_OK) && !stat(to, &sb)) {
if (access(from, F_OK)) {
warn("rename %s", from);
return (1);
}
strmode(sb.st_mode, modep);
(void)fprintf(stderr, "override %s%s%s/%s for %s? ",
modep + 1, modep[9] == ' ' ? "" : " ",
user_from_uid(sb.st_uid, 0),
group_from_gid(sb.st_gid, 0), to);
} else
ask = 0;
if (ask) {
if ((ch = getchar()) != EOF && ch != '\n') {
int ch2;
while ((ch2 = getchar()) != EOF && ch2 != '\n')
continue;
}
if (ch != 'y' && ch != 'Y')
return (0);
}
}
/*
* (2) If rename() succeeds, mv shall do nothing more with the
* current source file. If it fails for any other reason than
* EXDEV, mv shall write a diagnostic message to the standard
* error and do nothing more with the current source file.
*
* (3) If the destination path exists, and it is a file of type
* directory and source_file is not a file of type directory,
* or it is a file not of type directory, and source file is
* a file of type directory, mv shall write a diagnostic
* message to standard error, and do nothing more with the
* current source file...
*/
if (!rename(from, to)) {
if (vflg)
printf("%s -> %s\n", from, to);
return (0);
}
if (errno != EXDEV) {
warn("rename %s to %s", from, to);
return (1);
}
/*
* (4) If the destination path exists, mv shall attempt to remove it.
* If this fails for any reason, mv shall write a diagnostic
* message to the standard error and do nothing more with the
* current source file...
*/
if (!lstat(to, &sb)) {
if ((S_ISDIR(sb.st_mode)) ? rmdir(to) : unlink(to)) {
warn("can't remove %s", to);
return (1);
}
}
/*
* (5) The file hierarchy rooted in source_file shall be duplicated
* as a file hierarchy rooted in the destination path...
*/
if (lstat(from, &sb)) {
warn("%s", from);
return (1);
}
return (S_ISREG(sb.st_mode) ?
fastcopy(from, to, &sb) : copy(from, to));
}
static int
fastcopy(char *from, char *to, struct stat *sbp)
{
struct timeval tval[2];
static blksize_t blen;
static char *bp;
int nread, from_fd, to_fd;
if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
warn("%s", from);
return (1);
}
if ((to_fd =
open(to, O_CREAT | O_TRUNC | O_WRONLY, sbp->st_mode)) < 0) {
warn("%s", to);
(void)close(from_fd);
return (1);
}
if (!blen && !(bp = malloc(blen = sbp->st_blksize))) {
warn(NULL);
blen = 0;
(void)close(from_fd);
(void)close(to_fd);
return (1);
}
while ((nread = read(from_fd, bp, blen)) > 0)
if (write(to_fd, bp, nread) != nread) {
warn("%s", to);
goto err;
}
if (nread < 0) {
warn("%s", from);
err: if (unlink(to))
warn("%s: remove", to);
(void)close(from_fd);
(void)close(to_fd);
return (1);
}
#if !defined(__minix)
if (fcpxattr(from_fd, to_fd) == -1)
warn("%s: error copying extended attributes", to);
#endif /* !defined(__minix) */
(void)close(from_fd);
#ifdef BSD4_4
TIMESPEC_TO_TIMEVAL(&tval[0], &sbp->st_atimespec);
TIMESPEC_TO_TIMEVAL(&tval[1], &sbp->st_mtimespec);
#else
tval[0].tv_sec = sbp->st_atime;
tval[1].tv_sec = sbp->st_mtime;
tval[0].tv_usec = 0;
tval[1].tv_usec = 0;
#endif
#ifdef __SVR4
if (utimes(to, tval))
#else
if (futimes(to_fd, tval))
#endif
warn("%s: set times", to);
if (fchown(to_fd, sbp->st_uid, sbp->st_gid)) {
if (errno != EPERM)
warn("%s: set owner/group", to);
sbp->st_mode &= ~(S_ISUID | S_ISGID);
}
if (fchmod(to_fd, sbp->st_mode))
warn("%s: set mode", to);
#if !defined(__minix)
if (fchflags(to_fd, sbp->st_flags) && (errno != EOPNOTSUPP))
warn("%s: set flags (was: 0%07o)", to, sbp->st_flags);
#endif /* !defined(__minix) */
if (close(to_fd)) {
warn("%s", to);
return (1);
}
if (unlink(from)) {
warn("%s: remove", from);
return (1);
}
if (vflg)
printf("%s -> %s\n", from, to);
return (0);
}
static int
copy(char *from, char *to)
{
pid_t pid;
int status;
if ((pid = vfork()) == 0) {
execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, NULL);
warn("%s", _PATH_CP);
_exit(1);
}
if (waitpid(pid, &status, 0) == -1) {
warn("%s: waitpid", _PATH_CP);
return (1);
}
if (!WIFEXITED(status)) {
warnx("%s: did not terminate normally", _PATH_CP);
return (1);
}
if (WEXITSTATUS(status)) {
warnx("%s: terminated with %d (non-zero) status",
_PATH_CP, WEXITSTATUS(status));
return (1);
}
if (!(pid = vfork())) {
execl(_PATH_RM, "mv", "-rf", "--", from, NULL);
warn("%s", _PATH_RM);
_exit(1);
}
if (waitpid(pid, &status, 0) == -1) {
warn("%s: waitpid", _PATH_RM);
return (1);
}
if (!WIFEXITED(status)) {
warnx("%s: did not terminate normally", _PATH_RM);
return (1);
}
if (WEXITSTATUS(status)) {
warnx("%s: terminated with %d (non-zero) status",
_PATH_RM, WEXITSTATUS(status));
return (1);
}
return (0);
}
static void
usage(void)
{
(void)fprintf(stderr, "usage: %s [-fiv] source target\n"
" %s [-fiv] source ... directory\n", getprogname(),
getprogname());
exit(1);
/* NOTREACHED */
}

40
bin/mv/pathnames.h Normal file
View file

@ -0,0 +1,40 @@
/* $NetBSD: pathnames.h,v 1.8 2004/08/19 22:26:07 christos Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 5/31/93
*/
#ifdef RESCUEDIR
#define _PATH_RM RESCUEDIR "/rm"
#define _PATH_CP RESCUEDIR "/cp"
#else
#define _PATH_RM "/bin/rm"
#define _PATH_CP "/bin/cp"
#endif

1
commands/cp/Makefile
View file

@ -4,7 +4,6 @@ PROG= cp
BINDIR= /bin BINDIR= /bin
MAN= MAN=
LINKS+= ${BINDIR}/cp ${BINDIR}/mv
LINKS+= ${BINDIR}/cp ${BINDIR}/clone LINKS+= ${BINDIR}/cp ${BINDIR}/clone
LINKS+= ${BINDIR}/cp ${BINDIR}/cpdir LINKS+= ${BINDIR}/cp ${BINDIR}/cpdir

1
man/man1/Makefile
View file

@ -50,7 +50,6 @@ MLINKS += ash.1 umask.1
MLINKS += ash.1 unset.1 MLINKS += ash.1 unset.1
MLINKS += ash.1 wait.1 MLINKS += ash.1 wait.1
MLINKS += compress.1 uncompress.1 MLINKS += compress.1 uncompress.1
MLINKS += cp.1 mv.1
MLINKS += cp.1 cpdir.1 MLINKS += cp.1 cpdir.1
MLINKS += svc.1 ci.1 MLINKS += svc.1 ci.1
MLINKS += svc.1 co.1 MLINKS += svc.1 co.1