diff options
| -rw-r--r-- | Changelog | 19 | ||||
| -rw-r--r-- | LICENSE | 357 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | README | 40 | ||||
| -rw-r--r-- | busybox.spec | 2 | ||||
| -rw-r--r-- | chmod_chown_chgrp.c | 16 | ||||
| -rw-r--r-- | coreutils/mkdir.c | 2 | ||||
| -rw-r--r-- | examples/busybox.spec | 2 | ||||
| -rw-r--r-- | init.c | 11 | ||||
| -rw-r--r-- | init/init.c | 11 | ||||
| -rw-r--r-- | mkdir.c | 2 |
11 files changed, 414 insertions, 55 deletions
@@ -1,13 +1,12 @@ 0.36 * fixed dd so it properly defaults to stdin and stdout when no if= and of= are set (fix thanks to Eric Delaunay). - * Don't try to close the file descriptor of a pipe. (fix also from + * Don't try to close the file descriptor of a pipein tar. (fix also from Eric Delaunay). * Made createPath be quiet (again thanks to Eric Delaunay). * If BB_CONSOLE_CMD_IF_RC_SCRIPT_EXITS is defined, then whatever command you define it as will be run if the init script exits. - * Made createPath be quiet (again thanks to Eric Delaunay). - * Updated to install.sh to make it more robust (thanks to Adam Di Carlo) + * Updated install.sh to make it more robust (thanks to Adam Di Carlo) * NFS support added to mount by Eric Delaunay. It costs 10k when compiled in, but that is still a big win for those that use NFS. * Made 'rm -f' be silent for non-existant files (thanks to Eric Delaunay). @@ -15,9 +14,17 @@ and acts as god intended gunzip and zcat to act. They answer --help and obey the '-c' flag. * Fixed a bug in mv which caused it to not move files when the destination - was a directory name. - - -Erik Andersen + was a directory. + * Fixed a decimal-instead-of-octal bug causing mkdir to make directories + with very wrong permissions. + * chmod would overwrite file permissions instead of modifying them. + Now it properly modifies permissions. + * Init now sends warnings destined for the console to /dev/console to ensure + they show up on whatever the active console it. Otherwise important + messages (for example that the system is rebooting) were not seen when + switched to a different VT. + + -Erik Andersen, Nov 17, 1999 0.35 * gzip now obeys the principle of least surprise and acts like god intended @@ -17,15 +17,362 @@ Copyright 1998 Dave Cinege <dcinege@psychosis.com> mini-gzip(gzip), mini-netcat(mnc) Copyright 1998 Charles P. Wright <cpwright@villagenet.com> - -bunches of stuff as noted in header files +Tons of new stuff as noted in header files Copyright (C) 1999 by Lineo, inc. and written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> -copyright and license info. -This program suite may be distributed under the GNU General Public License. +Please feed suggestions, bug reports, insults, and bribes back to: + Erik Andersen + <andersen@lineo.com> + <andersee@deban.org> + + + +Busybox may be used and distributed under the GNU General Public License. + +--------------------------------------------------------------------------- + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice -Please send patches, suggestions, insults, and bribes to <andersee@debian.org>. +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. @@ -17,7 +17,7 @@ PROG=busybox -VERSION=0.35 +VERSION=0.36 BUILDTIME=$(shell date "+%Y%m%d-%H%M") # Comment out the following to make a debuggable build @@ -107,6 +107,9 @@ install: busybox whichversion: @echo $(VERSION) + +dist: release + release: distclean - (cd .. ; cp -a busybox busybox-$(VERSION); tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)) + (cd .. ; rm -rf busybox-$(VERSION) ; cp -a busybox busybox-$(VERSION); rm -rf busybox-$(VERSION)/CVS busybox-$(VERSION)/.cvsignore ; tar -cvzf busybox-$(VERSION).tar.gz busybox-$(VERSION)) @@ -1,26 +1,26 @@ Please see the LICENSE file for copyright information. -Busybox is a multicall binary used to provide a minimal subset of -POSIX style commands and specialized functions. +BusyBox is a suite of "tiny" Unix utilities in a multi-call binary. It +provides a pretty complete POSIX environment in a very small package. +Just add a kernel, "ash" (Keith Almquists tiny Bourne shell clone), and +an editor such as "elvis-tiny" or "ae", and you have a working system. +Busybox was begun to support the Debian Rescue/Install disks, but it +also makes an excellent environment for any small or embedded system. -It is geared toward the very small, i.e. boot floppies, embedded- -systems, etc. Specifically it is used in the Debian Rescue/Install -system (which caused the original busybox to be made), the Linux Router -Project, and others. +As of version 0.20 there is a version number. : ) Also as of version +0.20, BB is now modularized to easily allow you to build of only the +BB parts you need, thereby reducing binary size. To turn off unwanted +Busybox components, simply edit the file busybox.def.h and comment out +the parts you do not need using C++ style (//) comments. -As of version 0.20 there is a version number. : ) -Also as of version 0.20, BB is modularized to allow an easy build of -only the BB parts you need, to reduce binary size. +After the build is complete a busybox.links file is generated which is +then used by 'make install' to create symlinks to the busybox binary +for all compiled in functions. By default, 'make install' will place +the symlink forest into `pwd`/busybox_install unless you have defined +the PREFIX environment variable. -Edit the file busybox.def.h and comment out the parts you do not need -using C++ comments (//) +Please feed suggestions, bug reports, insults, and bribes back to: + Erik Andersen + <andersen@lineo.com> + <andersee@deban.org> -After the build is complete a busybox.links file is generated to allow -you to easily make the sym/hard links to the busybox binary. - -Note the modular system is Makefile based, and purposely very -simplistic. It does no dependency checking. That is left for you -to figure out by trial and error. - -Please feed patches back to: - Erik Andersen <andersee@deban.org> diff --git a/busybox.spec b/busybox.spec index e3fbb6d47..4a3ef6579 100644 --- a/busybox.spec +++ b/busybox.spec @@ -1,5 +1,5 @@ Name: busybox -Version: 0.35 +Version: 0.36 Release: 1 Group: System/Utilities Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary. diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c index e9704fff8..c9ea39bf5 100644 --- a/chmod_chown_chgrp.c +++ b/chmod_chown_chgrp.c @@ -31,7 +31,7 @@ static uid_t uid=-1; static gid_t gid=-1; static int whichApp; static char* invocationName=NULL; -static mode_t mode=0644; +static char* theMode=NULL; #define CHGRP_APP 1 @@ -61,7 +61,12 @@ static int fileAction(const char *fileName, struct stat* statbuf) } break; case CHMOD_APP: - if (chmod(fileName, mode) == 0) + /* Parse the specified modes */ + if ( parse_mode(theMode, &(statbuf->st_mode)) == FALSE ) { + fprintf(stderr, "%s: Unknown mode: %s\n", invocationName, theMode); + exit( FALSE); + } + if (chmod(fileName, statbuf->st_mode) == 0) return( TRUE); break; } @@ -100,12 +105,7 @@ int chmod_chown_chgrp_main(int argc, char **argv) } if ( whichApp == CHMOD_APP ) { - /* Find the specified modes */ - mode = 0; - if ( parse_mode(*argv, &mode) == FALSE ) { - fprintf(stderr, "%s: Unknown mode: %s\n", invocationName, *argv); - exit( FALSE); - } + theMode=*argv; } else { /* Find the selected group */ diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 4c7ebed6a..28315cad6 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -34,7 +34,7 @@ static const char mkdir_usage[] = "Usage: mkdir [OPTION] DIRECTORY...\n\n" static int parentFlag = FALSE; -static mode_t mode = 777; +static mode_t mode = 0777; extern int mkdir_main(int argc, char **argv) diff --git a/examples/busybox.spec b/examples/busybox.spec index e3fbb6d47..4a3ef6579 100644 --- a/examples/busybox.spec +++ b/examples/busybox.spec @@ -1,5 +1,5 @@ Name: busybox -Version: 0.35 +Version: 0.36 Release: 1 Group: System/Utilities Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary. @@ -41,7 +41,7 @@ #include <sys/vt.h> /* for vt_stat */ #include <sys/ioctl.h> -#define VT_CONSOLE "/dev/console" /* Logical system console */ +#define DEV_CONSOLE "/dev/console" /* Logical system console */ #define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ #define VT_SECONDARY "/dev/tty2" /* Virtual console */ #define VT_LOG "/dev/tty3" /* Virtual console */ @@ -53,7 +53,7 @@ #define LOG 0x1 #define CONSOLE 0x2 -static char *console = VT_CONSOLE; +static char *console = DEV_CONSOLE; static char *second_console = VT_SECONDARY; static char *log = VT_LOG; static int kernel_version = 0; @@ -109,7 +109,8 @@ void message(int device, char *fmt, ...) va_end(arguments); } if (device & CONSOLE) { - if ((fd = device_open(console, O_WRONLY|O_NOCTTY|O_NDELAY)) >= 0) { + /* Always send console messages to /dev/console so people will see them. */ + if ((fd = device_open(DEV_CONSOLE, O_WRONLY|O_NOCTTY|O_NDELAY)) >= 0) { va_start(arguments, fmt); vdprintf(fd, fmt, arguments); va_end(arguments); @@ -217,7 +218,7 @@ static void console_init() /* this is linux virtual tty */ snprintf( the_console, sizeof the_console, "/dev/tty%d", vt.v_active ); } else { - console = VT_CONSOLE; + console = DEV_CONSOLE; tried_devcons++; } } @@ -226,7 +227,7 @@ static void console_init() /* Can't open selected console -- try /dev/console */ if (!tried_devcons) { tried_devcons++; - console = VT_CONSOLE; + console = DEV_CONSOLE; continue; } /* Can't open selected console -- try vt1 */ diff --git a/init/init.c b/init/init.c index a3e8d6700..f6e9eff97 100644 --- a/init/init.c +++ b/init/init.c @@ -41,7 +41,7 @@ #include <sys/vt.h> /* for vt_stat */ #include <sys/ioctl.h> -#define VT_CONSOLE "/dev/console" /* Logical system console */ +#define DEV_CONSOLE "/dev/console" /* Logical system console */ #define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ #define VT_SECONDARY "/dev/tty2" /* Virtual console */ #define VT_LOG "/dev/tty3" /* Virtual console */ @@ -53,7 +53,7 @@ #define LOG 0x1 #define CONSOLE 0x2 -static char *console = VT_CONSOLE; +static char *console = DEV_CONSOLE; static char *second_console = VT_SECONDARY; static char *log = VT_LOG; static int kernel_version = 0; @@ -109,7 +109,8 @@ void message(int device, char *fmt, ...) va_end(arguments); } if (device & CONSOLE) { - if ((fd = device_open(console, O_WRONLY|O_NOCTTY|O_NDELAY)) >= 0) { + /* Always send console messages to /dev/console so people will see them. */ + if ((fd = device_open(DEV_CONSOLE, O_WRONLY|O_NOCTTY|O_NDELAY)) >= 0) { va_start(arguments, fmt); vdprintf(fd, fmt, arguments); va_end(arguments); @@ -217,7 +218,7 @@ static void console_init() /* this is linux virtual tty */ snprintf( the_console, sizeof the_console, "/dev/tty%d", vt.v_active ); } else { - console = VT_CONSOLE; + console = DEV_CONSOLE; tried_devcons++; } } @@ -226,7 +227,7 @@ static void console_init() /* Can't open selected console -- try /dev/console */ if (!tried_devcons) { tried_devcons++; - console = VT_CONSOLE; + console = DEV_CONSOLE; continue; } /* Can't open selected console -- try vt1 */ @@ -34,7 +34,7 @@ static const char mkdir_usage[] = "Usage: mkdir [OPTION] DIRECTORY...\n\n" static int parentFlag = FALSE; -static mode_t mode = 777; +static mode_t mode = 0777; extern int mkdir_main(int argc, char **argv) |