Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/remove_file.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/remove_file.c (modified) (7 diffs)

branches/2.2.9/mindi-busybox/libbb/remove_file.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -12 +12 @@
 /* Used from NOFORK applets. Must not allocate anything */
 
-int remove_file(const char *path, int flags)
+int FAST_FUNC remove_file(const char *path, int flags)
 {
     struct stat path_stat;
@@ -18 +18 @@
     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;
         }
@@ -64 +64 @@
 
         if (closedir(dp) < 0) {
-            bb_perror_msg("cannot close '%s'", path);
+            bb_perror_msg("can't close '%s'", path);
             return -1;
         }
@@ -75 +75 @@
 
         if (rmdir(path) < 0) {
-            bb_perror_msg("cannot remove '%s'", path);
+            bb_perror_msg("can't remove '%s'", path);
             return -1;
         }
@@ -83 +83 @@
 
     /* !ISDIR */
-    if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0
-            && !S_ISLNK(path_stat.st_mode) && isatty(0))
+    if ((!(flags & FILEUTILS_FORCE)
+         && access(path, W_OK) < 0
+         && !S_ISLNK(path_stat.st_mode)
+         && isatty(0))
      || (flags & FILEUTILS_INTERACTIVE)
     ) {
@@ -93 +95 @@
 
     if (unlink(path) < 0) {
-        bb_perror_msg("cannot remove '%s'", path);
+        bb_perror_msg("can't remove '%s'", path);
         return -1;
     }