lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / coreutils / mv.c

diff --git a/coreutils/mv.c b/coreutils/mv.c
index be10b030a1ea037ca2c846dc66eddcbb9736ae6a..7f49d5babd5f043c8d2ce140d797a09bed2d5f6e 100644 (file)
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
  *
- * 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.
  */
 
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
@@ -87,10 +87,10 @@ int mv_main(int argc, char **argv)
                        if (errno != EXDEV
                         || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
                        ) {
-                               bb_perror_msg("cannot rename '%s'", *argv);
+                               bb_perror_msg("can't rename '%s'", *argv);
                        } else {
                                static const char fmt[] ALIGN1 =
-                                       "cannot overwrite %sdirectory with %sdirectory";
+                                       "can't overwrite %sdirectory with %sdirectory";
 
                                if (dest_exists) {
                                        if (dest_exists == 3) {
@@ -105,7 +105,7 @@ int mv_main(int argc, char **argv)
                                                }
                                        }
                                        if (unlink(dest) < 0) {
-                                               bb_perror_msg("cannot remove '%s'", dest);
+                                               bb_perror_msg("can't remove '%s'", dest);
                                                goto RET_1;
                                        }
                                }