diff options
author | Eric Andersen <andersen@codepoet.org> | 1999-11-16 03:46:00 +0300 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 1999-11-16 03:46:00 +0300 |
commit | d80e851dc05f978dded84b7ac9fcae7066e3ffe0 (patch) | |
tree | 9f32d236ce80a7a692f74fe1012df3bed6b19418 /coreutils | |
parent | a9c95ea6551eb3d894fcc56822c8aa394972b699 (diff) |
Stuf
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/cp.c | 2 | ||||
-rw-r--r-- | coreutils/mv.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c index 57158c820..ce632016e 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c @@ -54,6 +54,8 @@ static int fileAction(const char *fileName, struct stat* statbuf) strcat(newdestName, "/"); if ( skipName != NULL) strcat(newdestName, strstr(fileName, skipName)); + else + strcat(newdestName, srcName); } return (copyFile(fileName, newdestName, preserveFlag, followLinks)); } diff --git a/coreutils/mv.c b/coreutils/mv.c index b861ab7e6..2be3961ca 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -56,7 +56,7 @@ extern int mv_main(int argc, char **argv) fprintf(stderr, "%s: not a directory\n", destName); exit (FALSE); } - + while (argc-- > 1) { srcName = *(argv++); skipName = strrchr(srcName, '/'); @@ -67,6 +67,11 @@ extern int mv_main(int argc, char **argv) strcat(newdestName, "/"); if ( skipName != NULL) strcat(newdestName, strstr(srcName, skipName)); + else + strcat(newdestName, srcName); + fprintf(stderr, "srcName='%s'\n", srcName); + fprintf(stderr, "skipName='%s'\n", skipName); + fprintf(stderr, "newdestName='%s'\n", newdestName); } if (copyFile(srcName, newdestName, FALSE, FALSE) == FALSE) { exit( FALSE); |