Diff markup

Differences between /userland/init.c (Article 7.5) and /userland/init.c (Article 9)

 /* Copyright (C) 2005 David Decotigny              /* Copyright (C) 2005 David Decotigny
                                                    
    This program is free software; you can redi        This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Genera        modify it under the terms of the GNU General Public License
    as published by the Free Software Foundatio        as published by the Free Software Foundation; either version 2
    of the License, or (at your option) any lat        of the License, or (at your option) any later version.
                                                       
    This program is distributed in the hope tha        This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the         but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details        GNU General Public License for more details.
                                                       
    You should have received a copy of the GNU         You should have received a copy of the GNU General Public License
    along with this program; if not, write to t        along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 3        Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.                                               USA. 
 */                                                 */
                                                    
 #include <libc.h>                                  #include <libc.h>
 #include <debug.h>                                 #include <debug.h>
                                                !!  #include <drivers/devices.h>
                                                   >>  #include "fstest_utils.h"
                                                    
 /**                                                /**
  * @file init.c                                     * @file init.c
  * Test brk (and, hence: mremap) and exec()    !!   * Test fork and exec()
  */                                                 */
                                                    
 int main()                                         int main()
 {                                                  {
                                                   >>    bochs_printf("init: Welcome in userland !\n");
                                                    
   /* launch the tests */                       << 
   if (fork() == 0)                             << 
     exec("myprog7");                           << 
                                                    
   if (fork() == 0)                             !!    /* Creating initial device nodes */
     exec("myprog8");                           !!    TEST_EXPECT_CONDITION(mkdir("/dev", S_IRWXALL), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(mknod("/dev/zero", S_IRUSR | S_IWUSR,
                                                   >>                                S_IFCHR, SOS_CHARDEV_ZERO_MAJOR, SOS_CHARDEV_ZERO_MINOR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(mknod("/dev/null", S_IRUSR | S_IWUSR,
                                                   >>                                S_IFCHR, SOS_CHARDEV_ZERO_MAJOR, SOS_CHARDEV_NULL_MINOR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(mknod("/dev/kmem", S_IRUSR | S_IWUSR,
                                                   >>                                S_IFCHR, SOS_CHARDEV_MEM_MAJOR, SOS_CHARDEV_KMEM_MINOR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(mknod("/dev/mem", S_IRUSR | S_IWUSR,
                                                   >>                                S_IFCHR, SOS_CHARDEV_MEM_MAJOR, SOS_CHARDEV_PHYSMEM_MINOR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(mknod("/dev/tty", S_IRUSR | S_IWUSR,
                                                   >>                                S_IFCHR, SOS_CHARDEV_TTY_MAJOR, SOS_CHARDEV_CONSOLE_MINOR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(mknod("/dev/ttyS", S_IRUSR | S_IWUSR,
                                                   >>                                S_IFCHR, SOS_CHARDEV_TTY_MAJOR, SOS_CHARDEV_SERIAL_MINOR), RETVAL == 0);
                                                    
   if (fork() == 0)                             !!    ls("/", 1, 1);
     exec("myprog9");                           << 
                                                    
   if (fork() == 0)                             !!    /* Set up the shell on the console */
     exec("myprog10");                          !!    TEST_EXPECT_CONDITION(open("/dev/tty", O_RDWR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(open("/dev/tty", O_RDWR), RETVAL == 1);
                                                   >>    TEST_EXPECT_CONDITION(open("/dev/tty", O_RDWR), RETVAL == 2);
                                                    
   if (fork() == 0)                                   if (fork() == 0)
     exec("myprog11");                          !!      exec ("shell");
                                                    
   if (fork() == 0)                             !!    close (2);
     exec("myprog12");                          !!    close (1);
                                                !!    close (0);
   if (fork() == 0)                             << 
     exec("myprog13");                          << 
                                                    
   if (fork() == 0)                             !!    /* Set up the shell on the serial port */
     exec("myprog14");                          !!    TEST_EXPECT_CONDITION(open("/dev/ttyS", O_RDWR), RETVAL == 0);
                                                   >>    TEST_EXPECT_CONDITION(open("/dev/ttyS", O_RDWR), RETVAL == 1);
                                                   >>    TEST_EXPECT_CONDITION(open("/dev/ttyS", O_RDWR), RETVAL == 2);
                                                    
   if (fork() == 0)                                   if (fork() == 0)
     exec("banner");                            !!      exec ("shell");
                                                   >>  
                                                   >>    close (2);
                                                   >>    close (1);
                                                   >>    close (0);
                                                   >>  
                                                    
   bochs_printf("init: The end\n");                   bochs_printf("init: The end\n");
   return 0;                                          return 0;
 }                                                  }