summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorEric Andersen1999-10-09 00:25:00 +0000
committerEric Andersen1999-10-09 00:25:00 +0000
commitf811e07b072600a3784a92e5a1dc8a93dac477eb (patch)
tree820c6366f8bdacf617a9591cc2ca9dfe107b1fa3 /coreutils
parent8341a1565306a54e685455d19efb0516ad3328a1 (diff)
downloadbusybox-f811e07b072600a3784a92e5a1dc8a93dac477eb.zip
busybox-f811e07b072600a3784a92e5a1dc8a93dac477eb.tar.gz
More stuff.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cp.c206
-rw-r--r--coreutils/mv.c6
2 files changed, 132 insertions, 80 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 078a57c..797663d 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -1,89 +1,141 @@
+/*
+ * Mini cp implementation for busybox
+ *
+ * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
#include "internal.h"
#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <sys/param.h>
-#include <errno.h>
-
-const char cp_usage[] = "cp [-r] source-file destination-file\n"
-"\t\tcp [-r] source-file [source-file ...] destination-directory\n"
-"\n"
-"\tCopy the source files to the destination.\n"
-"\n"
-"\t-r:\tRecursively copy all files and directories\n"
-"\t\tunder the argument directory.";
-
-extern int
-cp_fn(const struct FileInfo * i)
+#include <time.h>
+#include <utime.h>
+#include <dirent.h>
+
+const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
+ " or: cp [OPTION]... SOURCE... DIRECTORY\n"
+ "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
+ "\n"
+ "\t-a\tsame as -dpR\n"
+ "\t-d\tpreserve links\n"
+ "\t-p\tpreserve file attributes if possable\n"
+ "\t-R\tcopy directories recursively\n";
+
+
+static int recursiveFlag = FALSE;
+static int followLinks = FALSE;
+static int preserveFlag = FALSE;
+static const char *srcName;
+static const char *destName;
+
+
+static int fileAction(const char *fileName)
{
- int sourceFd;
- int destinationFd;
- const char * destination = i->destination;
- struct stat destination_stat;
- int status;
- char buf[8192];
- char d[PATH_MAX];
-
- if ( (i->stat.st_mode & S_IFMT) == S_IFDIR ) {
- if ( mkdir(destination, i->stat.st_mode & ~S_IFMT)
- != 0 && errno != EEXIST ) {
- name_and_error(destination);
- return 1;
- }
- return 0;
+ char newdestName[NAME_MAX];
+ strcpy(newdestName, destName);
+ strcat(newdestName, fileName+(strlen(srcName)));
+ fprintf(stderr, "A: copying %s to %s\n", fileName, newdestName);
+ return (copyFile(fileName, newdestName, preserveFlag, followLinks));
+}
+
+static int dirAction(const char *fileName)
+{
+ char newdestName[NAME_MAX];
+ struct stat statBuf;
+ struct utimbuf times;
+
+ strcpy(newdestName, destName);
+ strcat(newdestName, fileName+(strlen(srcName)));
+ if (stat(newdestName, &statBuf)) {
+ if (mkdir( newdestName, 0777777 ^ umask (0))) {
+ perror(newdestName);
+ return( FALSE);
+ }
}
- if ( (sourceFd = open(i->source, O_RDONLY)) < 0 ) {
- name_and_error(i->source);
- return 1;
+ else if (!S_ISDIR (statBuf.st_mode)) {
+ fprintf(stderr, "`%s' exists but is not a directory", newdestName);
+ return( FALSE);
}
- if ( stat(destination, &destination_stat) == 0 ) {
- if ( i->stat.st_ino == destination_stat.st_ino
- && i->stat.st_dev == destination_stat.st_dev ) {
- fprintf(stderr
- ,"copy of %s to %s would copy file to itself.\n"
- ,i->source
- ,destination);
- close(sourceFd);
- return 1;
- }
+ if (preserveFlag==TRUE) {
+ /* Try to preserve premissions, but don't whine on failure */
+ if (stat(newdestName, &statBuf)) {
+ perror(newdestName);
+ return( FALSE);
+ }
+ chmod(newdestName, statBuf.st_mode);
+ chown(newdestName, statBuf.st_uid, statBuf.st_gid);
+ times.actime = statBuf.st_atime;
+ times.modtime = statBuf.st_mtime;
+ utime(newdestName, &times);
}
- /*
- * If the destination is a directory, create a file within it.
- */
- if ( (destination_stat.st_mode & S_IFMT) == S_IFDIR ) {
- destination = join_paths(
- d
- ,i->destination
- ,&i->source[i->directoryLength]);
-
- if ( stat(destination, &destination_stat) == 0 ) {
- if ( i->stat.st_ino == destination_stat.st_ino
- && i->stat.st_dev == destination_stat.st_dev ) {
- fprintf(stderr
- ,"copy of %s to %s would copy file to itself.\n"
- ,i->source
- ,destination);
- close(sourceFd);
- return 1;
- }
- }
+ return TRUE;
+}
+
+extern int cp_main(int argc, char **argv)
+{
+
+ int dirFlag;
+
+ if (argc < 3) {
+ fprintf(stderr, "Usage: %s", cp_usage);
+ return (FALSE);
}
+ argc--;
+ argv++;
- destinationFd = creat(destination, i->stat.st_mode & 07777);
+ /* Parse any options */
+ while (**argv == '-') {
+ while (*++(*argv))
+ switch (**argv) {
+ case 'a':
+ followLinks = TRUE;
+ preserveFlag = TRUE;
+ recursiveFlag = TRUE;
+ break;
+ case 'd':
+ followLinks = TRUE;
+ break;
+ case 'p':
+ preserveFlag = TRUE;
+ break;
+ case 'R':
+ recursiveFlag = TRUE;
+ break;
+ default:
+ fprintf(stderr, "Usage: %s\n", cp_usage);
+ exit(FALSE);
+ }
+ argc--;
+ argv++;
+ }
+
+
+ destName = argv[argc - 1];
- while ( (status = read(sourceFd, buf, sizeof(buf))) > 0 ) {
- if ( write(destinationFd, buf, status) != status ) {
- name_and_error(destination);
- close(sourceFd);
- close(destinationFd);
- return 1;
- }
+ dirFlag = isDirectory(destName);
+
+ if ((argc > 3) && !dirFlag) {
+ fprintf(stderr, "%s: not a directory\n", destName);
+ return (FALSE);
}
- close(sourceFd);
- close(destinationFd);
- if ( status < 0 ) {
- name_and_error(i->source);
- return 1;
+
+ while (argc-- >= 2) {
+ srcName = *(argv++);
+ return recursiveAction(srcName, recursiveFlag, followLinks,
+ fileAction, fileAction);
}
- return 0;
+ return( TRUE);
}
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 610040d..df56206 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -37,7 +37,7 @@ extern int mv_main (int argc, char **argv)
const char *srcName;
const char *destName;
const char *lastArg;
- BOOL dirFlag;
+ int dirFlag;
if (argc < 3) {
fprintf (stderr, "Usage: %s %s", *argv, mv_usage);
@@ -63,7 +63,7 @@ extern int mv_main (int argc, char **argv)
destName = lastArg;
- if (dirFlag)
+ if (dirFlag==TRUE)
destName = buildName (destName, srcName);
if (rename (srcName, destName) >= 0)
@@ -74,7 +74,7 @@ extern int mv_main (int argc, char **argv)
continue;
}
- if (!copyFile (srcName, destName, TRUE))
+ if (!copyFile (srcName, destName, TRUE, FALSE))
continue;
if (unlink (srcName) < 0)