projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Latest and greatest
[oweals/busybox.git]
/
cp.c
diff --git
a/cp.c
b/cp.c
index c5e34d33347801759d3a5ea7243a86cdf84fb200..ce632016ead857a2a1b1852a2ca1d47dee488f41 100644
(file)
--- a/
cp.c
+++ b/
cp.c
@@
-1,7
+1,9
@@
/*
* Mini cp implementation for busybox
*
/*
* Mini cp implementation for busybox
*
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <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
*
* 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
@@
-25,8
+27,8
@@
#include <utime.h>
#include <dirent.h>
#include <utime.h>
#include <dirent.h>
-const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
- " or: cp [OPTION]... SOURCE... DIRECTORY\n"
+
static
const char cp_usage[] = "cp [OPTION]... SOURCE DEST\n"
+ " or: cp [OPTION]... SOURCE... DIRECTORY\n
\n
"
"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
"\n"
"\t-a\tsame as -dpR\n"
"Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
"\n"
"\t-a\tsame as -dpR\n"
@@
-52,6
+54,8
@@
static int fileAction(const char *fileName, struct stat* statbuf)
strcat(newdestName, "/");
if ( skipName != NULL)
strcat(newdestName, strstr(fileName, skipName));
strcat(newdestName, "/");
if ( skipName != NULL)
strcat(newdestName, strstr(fileName, skipName));
+ else
+ strcat(newdestName, srcName);
}
return (copyFile(fileName, newdestName, preserveFlag, followLinks));
}
}
return (copyFile(fileName, newdestName, preserveFlag, followLinks));
}
@@
-60,8
+64,7
@@
extern int cp_main(int argc, char **argv)
{
if (argc < 3) {
{
if (argc < 3) {
- fprintf(stderr, "Usage: %s", cp_usage);
- exit (FALSE);
+ usage (cp_usage);
}
argc--;
argv++;
}
argc--;
argv++;
@@
-85,8
+88,7
@@
extern int cp_main(int argc, char **argv)
recursiveFlag = TRUE;
break;
default:
recursiveFlag = TRUE;
break;
default:
- fprintf(stderr, "Usage: %s\n", cp_usage);
- exit(FALSE);
+ usage (cp_usage);
}
argc--;
argv++;
}
argc--;
argv++;