From e5dfced23a904d08afa5dcee190c3c3d845d9f50 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 9 Apr 2001 22:48:12 +0000 Subject: Apply Vladimir's latest cleanup patch. -Erik --- cp_mv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'cp_mv.c') diff --git a/cp_mv.c b/cp_mv.c index fb48d3c5c..f4b5cd0d6 100644 --- a/cp_mv.c +++ b/cp_mv.c @@ -256,18 +256,16 @@ extern int cp_mv_main(int argc, char **argv) int state = 0; char *pushd, *d, *p; - if ((pushd = getcwd(NULL, BUFSIZ + 1)) == NULL) { - perror_msg("getcwd()"); + if ((pushd = xgetcwd(0)) == NULL) continue; - } + if (chdir(baseDestName) < 0) { perror_msg("chdir(%s)", baseSrcName); continue; } - if ((d = getcwd(NULL, BUFSIZ + 1)) == NULL) { - perror_msg("getcwd()"); + if ((d = xgetcwd(0)) == NULL) continue; - } + while (!state && *d != '\0') { if (stat(d, &sb) < 0) { /* stat not lstat - always dereference targets */ perror_msg("stat(%s)", d); -- cgit v1.2.3