Changeset 445 for trunk/user/ksh

Timestamp:

May 29, 2018, 9:27:23 AM (6 years ago)

Author:

alain

Message:

Restructure the mini_libc.

Location:

trunk/user/ksh

Files:

• Makefile (modified) (2 diffs)
• ksh.c (modified) (2 diffs)

trunk/user/ksh/Makefile

@@ -1 +1 @@
 #########################################################################
-# Makefile for the ALMOS-MKH "ksh" application
+#     Makefile for the "ksh" application                                #
 #########################################################################
 
 -include ../../params-soft.mk
+
 ifeq ($(ARCH_NAME),)
 $(error Please define in ARCH_NAME parameter in params-soft.mk!)
@@ -10 +11 @@
 OBJS = build/ksh.o
 
-INCLUDES = -I. -I$(LIBC_INCLUDE) -I$(LIBPTHREAD_INCLUDE) -I$(LIBALMOSMKH_INCLUDE) -I$(SHARED_INCLUDE)
+INCLUDES = -I.                      \
+           -I$(LIBC_INCLUDE)        \
+           -I$(LIBPTHREAD_INCLUDE)  \
+           -I$(LIBALMOSMKH_INCLUDE) \
+           -I$(SHARED_INCLUDE)
 
 compile: dirs build/ksh.elf
+
 build/ksh.elf : $(OBJS) ksh.ld
-        $(LD) -o $@ -T ksh.ld $(OBJS) -nostdlib -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lpthread -lc -lalmos-mkh -lc -lpthread -lc
+        $(LD) -o $@ -T ksh.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmosmkh -lpthread -lc
         $(DU) -D $@ > $@.txt
 

trunk/user/ksh/ksh.c

@@ -13 +13 @@
 #include <signal.h>
 #include <unistd.h>
-#include <almos-mkh.h>
+#include <almosmkh.h>
 
 #define CMD_MAX_SIZE   (256)    // max number of characters in one command
@@ -320 +320 @@
 
         display_chdev();
+    }
+    else if( strcmp( argv[1] , "dqdt" ) == 0 )
+    {
+        if( argc != 2 )
+        {
+                    printf("  usage: display dqdt\n");
+                    return;
+            }
+
+        display_dqdt();
     }
     else