Magellan Linux

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

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

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

    revision 983 by niro, Fri Apr 24 18:33:46 2009 UTC revision 984 by niro, Sun May 30 11:32:42 2010 UTC
    # Line 25  static const struct suffix_mult head_suf Line 25  static const struct suffix_mult head_suf
    25   { "b", 512 },   { "b", 512 },
    26   { "k", 1024 },   { "k", 1024 },
    27   { "m", 1024*1024 },   { "m", 1024*1024 },
    28   { }   { "", 0 }
    29  };  };
    30  #endif  #endif
    31    
    # Line 40  int head_main(int argc, char **argv) Line 40  int head_main(int argc, char **argv)
    40   int count_bytes = 0;   int count_bytes = 0;
    41   int header_threshhold = 1;   int header_threshhold = 1;
    42  #endif  #endif
       
    43   FILE *fp;   FILE *fp;
    44   const char *fmt;   const char *fmt;
    45   char *p;   char *p;
    # Line 50  int head_main(int argc, char **argv) Line 49  int head_main(int argc, char **argv)
    49    
    50  #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD  #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
    51   /* Allow legacy syntax of an initial numeric option without -n. */   /* Allow legacy syntax of an initial numeric option without -n. */
    52   if (argc > 1 && argv[1][0] == '-'   if (argv[1] && argv[1][0] == '-'
    53   && isdigit(argv[1][1])   && isdigit(argv[1][1])
    54   ) {   ) {
    55   --argc;   --argc;
    # Line 79  int head_main(int argc, char **argv) Line 78  int head_main(int argc, char **argv)
    78  #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD  #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
    79   GET_COUNT:   GET_COUNT:
    80  #endif  #endif
       
    81  #if !ENABLE_FEATURE_FANCY_HEAD  #if !ENABLE_FEATURE_FANCY_HEAD
    82   count = xatoul(p);   count = xatoul(p);
    83  #else  #else
    # Line 128  int head_main(int argc, char **argv) Line 126  int head_main(int argc, char **argv)
    126   putchar(c);   putchar(c);
    127   }   }
    128   if (fclose_if_not_stdin(fp)) {   if (fclose_if_not_stdin(fp)) {
    129   bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */   bb_simple_perror_msg(*argv);
    130   retval = EXIT_FAILURE;   retval = EXIT_FAILURE;
    131   }   }
    132   die_if_ferror_stdout();   die_if_ferror_stdout();
    133     } else {
    134     retval = EXIT_FAILURE;
    135   }   }
    136   fmt = header_fmt_str;   fmt = header_fmt_str;
    137   } while (*++argv);   } while (*++argv);
    Legend:
    Removed from v.983  
    changed lines
      Added in v.984