From a7ed6ca6183fd36a3a77ac9a13223168feba4406 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 23 Mar 2004 16:16:15 +0000 Subject: [PATCH] A few formatting tweaks in delete_file(). --- rsync.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rsync.c b/rsync.c index f91cda59..1eab8ab6 100644 --- a/rsync.c +++ b/rsync.c @@ -64,28 +64,28 @@ int delete_file(char *fname) #else ret = do_stat(fname, &st); #endif - if (ret) { + if (ret) return -1; - } if (!S_ISDIR(st.st_mode)) { - if (robust_unlink(fname) == 0 || errno == ENOENT) return 0; + if (robust_unlink(fname) == 0 || errno == ENOENT) + return 0; rprintf(FERROR, "delete_file: unlink %s failed: %s\n", full_fname(fname), strerror(errno)); return -1; } - if (do_rmdir(fname) == 0 || errno == ENOENT) return 0; - if (!force_delete || !recurse || - (errno != ENOTEMPTY && errno != EEXIST)) { + if (do_rmdir(fname) == 0 || errno == ENOENT) + return 0; + if (!force_delete || !recurse + || (errno != ENOTEMPTY && errno != EEXIST)) { rprintf(FERROR, "delete_file: rmdir %s failed: %s\n", full_fname(fname), strerror(errno)); return -1; } /* now we do a recsursive delete on the directory ... */ - d = opendir(fname); - if (!d) { + if (!(d = opendir(fname))) { rprintf(FERROR, "delete_file: opendir %s failed: %s\n", full_fname(fname), strerror(errno)); return -1; @@ -93,12 +93,12 @@ int delete_file(char *fname) for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { char *dname = d_name(di); - if (strcmp(dname,".") == 0 - || strcmp(dname,"..") == 0) + if (dname[0] == '.' && (dname[1] == '\0' + || (dname[1] == '.' && dname[2] == '\0'))) continue; pathjoin(buf, sizeof buf, fname, dname); if (verbose > 0) - rprintf(FINFO,"deleting %s\n", buf); + rprintf(FINFO, "deleting %s\n", buf); if (delete_file(buf) != 0) { closedir(d); return -1; -- 2.34.1