Better error messages when unlink fails

diff --git a/receiver.c b/receiver.c
index e5baa33..7be9588 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -1,5 +1,6 @@
-/* 
-   Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+   
+   Copyright (C) 1996-2000 by Andrew Tridgell
    Copyright (C) Paul Mackerras 1996
    
    This program is free software; you can redistribute it and/or modify

diff --git a/rsync.c b/rsync.c
index 44d54da..5ee50c0 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -67,21 +67,21 @@ int delete_file(char *fname)
 
        if (!S_ISDIR(st.st_mode)) {
                if (robust_unlink(fname) == 0 || errno == ENOENT) return 0;
-               rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno));
+               rprintf(FERROR,"delete_file: unlink(%s) : %s\n", fname, strerror(errno));
                return -1;
        }
 
        if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
        if (!force_delete || !recurse || 
            (errno != ENOTEMPTY && errno != EEXIST)) {
-               rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+               rprintf(FERROR,"delete_file: rmdir(%s) : %s\n", fname, strerror(errno));
                return -1;
        }
 
        /* now we do a recsursive delete on the directory ... */
        d = opendir(fname);
        if (!d) {
-               rprintf(FERROR,"opendir(%s): %s\n",
+               rprintf(FERROR,"delete_file: opendir(%s): %s\n",
                        fname,strerror(errno));
                return -1;
        }
@@ -103,7 +103,7 @@ int delete_file(char *fname)
        closedir(d);
        
        if (do_rmdir(fname) != 0) {
-               rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
+               rprintf(FERROR,"delete_file: rmdir(%s) : %s\n", fname, strerror(errno));
                return -1;
        }