Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mkinitrd-magellan/busybox/console-tools/loadkmap.c

    Diff of /trunk/mkinitrd-magellan/busybox/console-tools/loadkmap.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 24  struct kbentry { Line 24  struct kbentry {
    24  #define MAX_NR_KEYMAPS  256  #define MAX_NR_KEYMAPS  256
    25    
    26  int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;  int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
    27  int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)  int loadkmap_main(int argc UNUSED_PARAM, char **argv)
    28  {  {
    29   struct kbentry ke;   struct kbentry ke;
    30   int i, j, fd;   int i, j, fd;
    # Line 32  int loadkmap_main(int argc UNUSED_PARAM, Line 32  int loadkmap_main(int argc UNUSED_PARAM,
    32  /* const char *tty_name = CURRENT_TTY; */  /* const char *tty_name = CURRENT_TTY; */
    33   RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);   RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
    34    
    35     /* When user accidentally runs "loadkmap FILE"
    36     * instead of "loadkmap <FILE", we end up waiting for input from tty.
    37     * Let's prevent it: */
    38     if (argv[1])
    39     bb_show_usage();
    40  /* bb_warn_ignoring_args(argv[1]); */  /* bb_warn_ignoring_args(argv[1]); */
    41   fd = get_console_fd_or_die();   fd = get_console_fd_or_die();
    42  /* or maybe:  /* or maybe:
    Legend:
    Removed from v.1122  
    changed lines
      Added in v.1123