Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mkinitrd-magellan/busybox/coreutils/mv.c

    Diff of /trunk/mkinitrd-magellan/busybox/coreutils/mv.c

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 816 by niro, Fri Apr 24 18:33:46 2009 UTC revision 984 by niro, Sun May 30 11:32:42 2010 UTC
    # Line 87  int mv_main(int argc, char **argv) Line 87  int mv_main(int argc, char **argv)
    87   if (errno != EXDEV   if (errno != EXDEV
    88   || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1   || (source_exists = cp_mv_stat2(*argv, &source_stat, lstat)) < 1
    89   ) {   ) {
    90   bb_perror_msg("cannot rename '%s'", *argv);   bb_perror_msg("can't rename '%s'", *argv);
    91   } else {   } else {
    92   static const char fmt[] ALIGN1 =   static const char fmt[] ALIGN1 =
    93   "cannot overwrite %sdirectory with %sdirectory";   "can't overwrite %sdirectory with %sdirectory";
    94    
    95   if (dest_exists) {   if (dest_exists) {
    96   if (dest_exists == 3) {   if (dest_exists == 3) {
    # Line 105  int mv_main(int argc, char **argv) Line 105  int mv_main(int argc, char **argv)
    105   }   }
    106   }   }
    107   if (unlink(dest) < 0) {   if (unlink(dest) < 0) {
    108   bb_perror_msg("cannot remove '%s'", dest);   bb_perror_msg("can't remove '%s'", dest);
    109   goto RET_1;   goto RET_1;
    110   }   }
    111   }   }
    Legend:
    Removed from v.816  
    changed lines
      Added in v.984