Changeset 10ea0ca in mainline

Timestamp:

2008-12-12T06:21:51Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a1e28489

Parents:

4b8f1c3

Message:

IA^{$:Fix in hello,Makefile}

Location:

boot/arch/ia64/loader

Files:

• Makefile (modified) (1 diff)
• gefi/HelenOS/hello.c (modified) (2 diffs)

boot/arch/ia64/loader/Makefile

@@ -88 +88 @@
         boot.S
 
+NOCOMPONENTS = \
+        $(KERNELDIR)/kernel.bin 
 COMPONENTS = \
-        $(KERNELDIR)/kernel.bin 
-NOCOMPONENTS = \
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \

boot/arch/ia64/loader/gefi/HelenOS/hello.c

@@ -107 +107 @@
                 defaultLoad=1;
         }       
+/*      else{
+                CHAR16 buf[1024];
+                //buf[0]='\\';
+                i--;
+                int j;
+                for(j=0;LoadOptions[i+j]!=L' '&&LoadOptions[i+j]!=0;j++)
+                        buf[j+1]=LoadOptions[i+j];
+                buf[j+1]=0;
+                StrCat(FileName,buf);
+                defaultLoad=0;
+        }*/
         else{
                 CHAR16 buf[1024];
@@ -113 +124 @@
                 int j;
                 for(j=0;LoadOptions[i+j]!=L' '&&LoadOptions[i+j]!=0;j++)
-                        buf[j+1]=LoadOptions[i+j];
+                        buf[j]=LoadOptions[i+j];
                 buf[j+1]=0;
                 StrCat(FileName,buf);