libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / libbb / remove_file.c

diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 8b14f07c936f4b1ca96ee2dfbbc826bca64343d8..5b75f7f30e8bb8b239fd456100bf10d1be0e9dd3 100644 (file)
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -17,11 +17,11 @@ int FAST_FUNC remove_file(const char *path, int flags)
 
        if (lstat(path, &path_stat) < 0) {
                if (errno != ENOENT) {
-                       bb_perror_msg("cannot stat '%s'", path);
+                       bb_perror_msg("can't stat '%s'", path);
                        return -1;
                }
                if (!(flags & FILEUTILS_FORCE)) {
-                       bb_perror_msg("cannot remove '%s'", path);
+                       bb_perror_msg("can't remove '%s'", path);
                        return -1;
                }
                return 0;
@@ -33,7 +33,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                int status = 0;
 
                if (!(flags & FILEUTILS_RECUR)) {
-                       bb_error_msg("%s: is a directory", path);
+                       bb_error_msg("'%s' is a directory", path);
                        return -1;
                }
 
@@ -63,7 +63,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                }
 
                if (closedir(dp) < 0) {
-                       bb_perror_msg("cannot close '%s'", path);
+                       bb_perror_msg("can't close '%s'", path);
                        return -1;
                }
 
@@ -74,7 +74,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                }
 
                if (rmdir(path) < 0) {
-                       bb_perror_msg("cannot remove '%s'", path);
+                       bb_perror_msg("can't remove '%s'", path);
                        return -1;
                }
 
@@ -94,7 +94,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
        }
 
        if (unlink(path) < 0) {
-               bb_perror_msg("cannot remove '%s'", path);
+               bb_perror_msg("can't remove '%s'", path);
                return -1;
        }