Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/console-tools/loadfont.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 6  Line 6 
6   *   *
7   * Loads the console font, and possibly the corresponding screen map(s).   * Loads the console font, and possibly the corresponding screen map(s).
8   * (Adapted for busybox by Matej Vela.)   * (Adapted for busybox by Matej Vela.)
9     *
10     * Licensed under GPLv2, see file LICENSE in this tarball for details.
11   */   */
12  #include "libbb.h"  #include "libbb.h"
13  #include <sys/kd.h>  #include <sys/kd.h>
# Line 275  int setfont_main(int argc UNUSED_PARAM, Line 277  int setfont_main(int argc UNUSED_PARAM,
277   opts = getopt32(argv, "m:C:", &mapfilename, &tty_name);   opts = getopt32(argv, "m:C:", &mapfilename, &tty_name);
278   argv += optind;   argv += optind;
279    
280   fd = xopen(tty_name, O_NONBLOCK);   fd = xopen_nonblocking(tty_name);
281    
282   if (sizeof(CONFIG_DEFAULT_SETFONT_DIR) > 1) { // if not ""   if (sizeof(CONFIG_DEFAULT_SETFONT_DIR) > 1) { // if not ""
283   if (*argv[0] != '/') {   if (*argv[0] != '/') {

Legend:
Removed from v.983  
changed lines
  Added in v.984