X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7210dbfd2ab424d5beee7dd94975006e1fa35ed7..d724dd186ed6a2d66fa13a9357ce91e459d39e8c:/util.c diff --git a/util.c b/util.c index 477f5bca..9547eef8 100644 --- a/util.c +++ b/util.c @@ -4,7 +4,7 @@ * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2008 Wayne Davison * * 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 @@ -147,8 +147,8 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) t[1].tv_usec = 0; # ifdef HAVE_LUTIMES if (S_ISLNK(mode)) { - if (lutimes(fname, t) < 0 && errno != ENOSYS) - return -1; + if (lutimes(fname, t) < 0) + return errno == ENOSYS ? 1 : -1; return 0; } # endif @@ -895,8 +895,8 @@ int push_dir(const char *dir, int set_path_only) curr_dir_depth = count_dir_elements(curr_dir + module_dirlen); } - if (verbose >= 5) - rprintf(FINFO, "[%s] dir is now %s\n", who_am_i(), curr_dir); + if (verbose >= 5 && !set_path_only) + rprintf(FINFO, "[%s] push_dir(%s)\n", who_am_i(), curr_dir); return 1; } @@ -916,6 +916,9 @@ int pop_dir(const char *dir) if (sanitize_paths) curr_dir_depth = count_dir_elements(curr_dir + module_dirlen); + if (verbose >= 5) + rprintf(FINFO, "[%s] pop_dir(%s)\n", who_am_i(), curr_dir); + return 1; }