Merge "Lose mv to toybox."
This commit is contained in:
Elliott Hughes
Gerrit Code Review
commit
12677383ae
|
|
@ -58,13 +58,6 @@ LOCAL_MODULE := libtoolbox_grep
|
|||
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := upstream-netbsd/bin/mv/mv.c
|
||||
LOCAL_CFLAGS += $(common_cflags) -Dmain=mv_main -D__SVR4
|
||||
LOCAL_MODULE := libtoolbox_mv
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
|
|
@ -74,7 +67,6 @@ BSD_TOOLS := \
|
|||
dd \
|
||||
du \
|
||||
grep \
|
||||
mv \
|
||||
|
||||
OUR_TOOLS := \
|
||||
cmp \
|
||||
|
|
|
|||
|
|
@ -1,396 +0,0 @@
|
|||
/* $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);
|
||||
}
|
||||
|
||||
#ifndef __ANDROID__
|
||||
if (fcpxattr(from_fd, to_fd) == -1)
|
||||
warn("%s: error copying extended attributes", to);
|
||||
#endif
|
||||
|
||||
(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);
|
||||
#ifndef __ANDROID__
|
||||
if (fchflags(to_fd, sbp->st_flags) && (errno != EOPNOTSUPP))
|
||||
warn("%s: set flags (was: 0%07o)", to, sbp->st_flags);
|
||||
#endif
|
||||
|
||||
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 */
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/* $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 __ANDROID__
|
||||
#define _PATH_RM "/system/bin/rm"
|
||||
#define _PATH_CP "/system/bin/cp"
|
||||
#else
|
||||
#ifdef RESCUEDIR
|
||||
#define _PATH_RM RESCUEDIR "/rm"
|
||||
#define _PATH_CP RESCUEDIR "/cp"
|
||||
#else
|
||||
#define _PATH_RM "/bin/rm"
|
||||
#define _PATH_CP "/bin/cp"
|
||||
#endif
|
||||
#endif
|
||||
Loading…
Reference in New Issue