improve unlink error message

[zpackage] / zpm-syncfs.c

diff --git a/zpm-syncfs.c b/zpm-syncfs.c
index 51b010ef3f96daa8b32f8321f538851b20ecdff3..06e5d350458f7e032058e7dfb71d70925ea3b8a3 100644 (file)
--- a/zpm-syncfs.c
+++ b/zpm-syncfs.c
@@ -658,7 +658,7 @@ static int remove_files(void *f, int ncols, char **vals, char **cols) {
                        case ENOENT:
                                break;
                        default:
-                               return seterror(conf, "can't unlink");
+                               return seterror(conf, "can't unlink %s: %s", dest, strerror(errno));
                }
        }
        
@@ -1475,7 +1475,7 @@ int main(int ac, char **av) {
                        fprintf(stderr, "file ops: %d\n", conf.ops_total);
                        if (conf.ops_remove > 0) {
                                if (conf.verbose) {
-                                       fprintf(stderr, "removing %d files\n", conf.ops_remove);
+                                       fprintf(stderr, "removing %d file%s\n", conf.ops_remove, conf.ops_remove > 0 ? "s" : "");
                                }
                                conf.reverse = 1;
                                conf.ops_completed = 0;
@@ -1489,7 +1489,7 @@ int main(int ac, char **av) {
 
                        if (conf.ops_update > 0) {
                                if (conf.verbose) {
-                                       fprintf(stderr, "updating %d files\n", conf.ops_update);
+                                       fprintf(stderr, "updating %d file%s\n", conf.ops_update, conf.ops_update > 0 ? "s" : "");
                                }
                                conf.reverse = 0;
                                conf.ops_completed = 0;
@@ -1503,7 +1503,7 @@ int main(int ac, char **av) {
 
                        if (conf.ops_install > 0) {
                                if (conf.verbose) {
-                                       fprintf(stderr, "installing %d files\n", conf.ops_install);
+                                       fprintf(stderr, "installing %d file%s\n", conf.ops_install, conf.ops_install > 0 ? "s" : "");
                                }
                                conf.reverse = 0;
                                conf.ops_completed = 0;