diff --git a/arch/x86/kernel/kb.c b/arch/x86/kernel/kb.c index 9499d9d8..379fb878 100644 --- a/arch/x86/kernel/kb.c +++ b/arch/x86/kernel/kb.c @@ -113,7 +113,7 @@ static void keyboard_handler(struct state *r) */ kputchar(kbdus[scancode]); if (kb_buffer.size <= kb_buffer.maxsize && kb_buffer.buffer != NULL) { - if (scancode == 14) { + if (scancode == 14 && kb_buffer.size != 0) { kb_buffer.size--; } else { diff --git a/newlib/examples/hello.c b/newlib/examples/hello.c index b6bf5ef6..0a112970 100644 --- a/newlib/examples/hello.c +++ b/newlib/examples/hello.c @@ -44,7 +44,7 @@ int main(int argc, char** argv) { char* teststr = malloc(sizeof(char)*100); int testfile = open("/bin/test2", O_CREAT | O_EXCL, "wr"); - write(testfile, "test", 4); + write(testfile, "hello in new file '/bin/test2'", 30); lseek(testfile, 0, SEEK_SET); read(testfile, teststr, 100); close(testfile); diff --git a/newlib/src/libgloss/metalsvm/open.c b/newlib/src/libgloss/metalsvm/open.c index 2081f76f..9127ab9f 100644 --- a/newlib/src/libgloss/metalsvm/open.c +++ b/newlib/src/libgloss/metalsvm/open.c @@ -1,34 +1,18 @@ /* - * Copyright (c) 2011, Stefan Lankes, Chair for Operating Systems, - * RWTH Aachen University + * Copyright 2010 Stefan Lankes, Chair for Operating Systems, + * RWTH Aachen University * - * All rights reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Chair for Operating Systems, - * RWTH Aachen University. - * 4. Neither the name of the Chair for Operating Systems, RWTH Aachen University - * nor the names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. + * http://www.apache.org/licenses/LICENSE-2.0 * - * THIS SOFTWARE IS PROVIDED BY ''AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * This file is part of MetalSVM. */