Magellan Linux

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

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

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

    revision 1122 by niro, Sun May 30 11:32:42 2010 UTC revision 1123 by niro, Wed Aug 18 21:56:57 2010 UTC
    # Line 38  struct globals { Line 38  struct globals {
    38   unsigned long long total_bytes;   unsigned long long total_bytes;
    39   unsigned long long begin_time_us;   unsigned long long begin_time_us;
    40  #endif  #endif
    41  };  } FIX_ALIASING;
    42  #define G (*(struct globals*)&bb_common_bufsiz1)  #define G (*(struct globals*)&bb_common_bufsiz1)
    43  #define INIT_G() do { \  #define INIT_G() do { \
    44   /* we have to zero it out because of NOEXEC */ \   /* we have to zero it out because of NOEXEC */ \
    # Line 301  int dd_main(int argc UNUSED_PARAM, char Line 301  int dd_main(int argc UNUSED_PARAM, char
    301   if (ftruncate(ofd, seek * obs) < 0) {   if (ftruncate(ofd, seek * obs) < 0) {
    302   struct stat st;   struct stat st;
    303    
    304   if (fstat(ofd, &st) < 0 || S_ISREG(st.st_mode) ||   if (fstat(ofd, &st) < 0
    305   S_ISDIR(st.st_mode))   || S_ISREG(st.st_mode)
    306     || S_ISDIR(st.st_mode)
    307     ) {
    308   goto die_outfile;   goto die_outfile;
    309     }
    310   }   }
    311   }   }
    312   } else {   } else {
    Legend:
    Removed from v.1122  
    changed lines
      Added in v.1123