diff options
author | Eric Andersen <andersen@codepoet.org> | 1999-10-18 23:02:32 +0400 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 1999-10-18 23:02:32 +0400 |
commit | bed30e97005aca748a44806399c646633038daa8 (patch) | |
tree | cdba32234f059656b0279b324ae28c742692cd0c /cp.c | |
parent | 9b5871888989b16f94cbba5dd304ac444def3afd (diff) |
More fixes
Diffstat (limited to 'cp.c')
-rw-r--r-- | cp.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -48,7 +48,7 @@ static int fileAction(const char *fileName, struct stat* statbuf) { char newdestName[NAME_MAX]; strcpy(newdestName, destName); - if (dirFlag==TRUE && newdestName[strlen(newdestName)-1]!= '/' ) { + if (dirFlag==TRUE) { strcat(newdestName, "/"); if ( skipName != NULL) strcat(newdestName, strstr(fileName, skipName)); @@ -104,10 +104,12 @@ extern int cp_main(int argc, char **argv) while (argc-- > 1) { srcName = *(argv++); skipName = strrchr(srcName, '/'); - if (skipName) skipName++; - if (recursiveAction(srcName, recursiveFlag, followLinks, - fileAction, fileAction) == FALSE) + if (skipName) + skipName++; + if (recursiveAction(srcName, recursiveFlag, followLinks, FALSE, + fileAction, fileAction) == FALSE) { exit( FALSE); + } } exit( TRUE); } |