Shell v0.6.1. Some minor improvements.

git-svn-id: svn://kolibrios.org@3247 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/system/shell/cmd/cmd_cd.c

@@ -12,7 +12,7 @@ if (NULL == dir)
 	#elif LANG_RUS
 		printf("  cd <äčđĺęňîđč˙>\n\r");
 	#endif
-	return FALSE;
+	return TRUE;
 	}
 
 if ( 0 == strcmp(dir, ".") )

programs/system/shell/cmd/cmd_cp.c

@@ -1,15 +1,4 @@
 
-void print_error(void)
-{
-
-#if LANG_ENG
-    printf("  Error!\n\r");
-#elif LANG_RUS
-    printf("  Žè¨¡ª !\n\r");
-#endif
-
-}
-
 int cmd_cp(char param[])
 {
 
@@ -40,7 +29,7 @@ if (argc != 2)
 
       parameters_free(argc, argv);
 
-      return FALSE;
+      return TRUE;
    }
 
 filename_in  = (char*) malloc(4096);
@@ -80,12 +69,10 @@ k70_in.p21 = filename_in;
 result = kol_file_70(&k70_in); // ¯®«ãç ¥¬ ¨­ä®à¬ æ¨î ® ä ©«¥
 if ( 0 != result )
        {
-       print_error();
-
        parameters_free(argc, argv);
        free(filename_in);
        free(filename_out);
-       return FALSE;
+       return TRUE;
        }
 
 filesize = bdvk.p32[0]; // ¯®«ãç ¥¬ à §¬¥à ä ©«   (®£à ­¨ç¥­¨¥ - 4 ƒ¡ ©â )
@@ -115,8 +102,6 @@ for ( i = 0; i < n; i++)
     result = kol_file_70(&k70_in); // ç⥭¨¥
     if (result != 0)
        {
-       print_error();
-
        parameters_free(argc, argv);
        free(filename_in);
        free(filename_out);
@@ -128,8 +113,6 @@ for ( i = 0; i < n; i++)
     result = kol_file_70(&k70_out); // § ¯¨áì
     if (result != 0)
        {
-       print_error();
-
        parameters_free(argc, argv);
        free(filename_in);
        free(filename_out);
@@ -152,8 +135,6 @@ if ( (filesize%4096) != 0 ) //
    result = kol_file_70(&k70_in); // ç⥭¨¥
    if (result != 0)
        {
-       print_error();
-
        parameters_free(argc, argv);
        free(filename_in);
        free(filename_out);
@@ -165,8 +146,6 @@ if ( (filesize%4096) != 0 ) //
     result = kol_file_70(&k70_out); // § ¯¨áì
     if (result != 0)
        {
-       print_error();
-
        parameters_free(argc, argv);
        free(filename_in);
        free(filename_out);
@@ -177,7 +156,6 @@ if ( (filesize%4096) != 0 ) //
    }
 
 
-
 parameters_free(argc, argv);
 free(filename_in);
 free(filename_out);

programs/system/shell/cmd/cmd_date.c

@@ -29,3 +29,4 @@ time = kol_system_time_get();
 
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_echo.c

@@ -4,3 +4,4 @@ int cmd_echo(char text[])
 printf("%s\n\r", text);
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_exit.c

@@ -6,3 +6,4 @@ _exit(1);
 kol_exit();
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_free.c

@@ -16,3 +16,4 @@ used = total - free;
 		
 return TRUE;		
 }
+

programs/system/shell/cmd/cmd_help.c

@@ -38,3 +38,4 @@ else
 
 return FALSE;
 }
+

programs/system/shell/cmd/cmd_history.c

@@ -11,3 +11,4 @@ for (i = 0; i < CMD_HISTORY_NUM_REAL; i++)
 
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_kill.c

@@ -1,22 +1,32 @@
 
 
-int cmd_kill(char process[])
+int cmd_kill(char param[])
 {
 
-unsigned proc;
+unsigned process;
 int result;
+int i;
 
-if (NULL == process)
+if ( strlen(param) == 0 )
 	{
 	printf("  kill <PID>\n\r");
-	return FALSE;
+	return TRUE;
 	}
+
+if (!strcmp(param, "all"))
+	{
+	for (i = 2;i<256;i++)
+		{
+		kol_kill_process(i);
+		}
+	return TRUE;
+        }
 else
 	{
-	proc = _atoi(process);
-	if ( 0 != proc )
+	process = _atoi(param);
+	if ( 0 != process )
 		{
-		result = kol_process_kill_pid(proc);
+		result = kol_process_kill_pid(process);
 		if (result < 0)
 			return FALSE;
 		else
@@ -25,3 +35,4 @@ else
 	}
 
 }
+

programs/system/shell/cmd/cmd_killall.c

@@ -1,15 +0,0 @@
-
-int cmd_killall(char process_name[])
-{
-
-unsigned	i;
-if (!strlen(process_name))
-	{
-	for (i = 2;i<256;i++)
-		{
-		kol_kill_process(i);
-		}
-	return TRUE;
-	}
-return TRUE;
-}

programs/system/shell/cmd/cmd_ls.c

@@ -47,3 +47,4 @@ for (i = 0; i < num_of_file; i++)
 free((void*)k70.p16);
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_mkdir.c

@@ -13,7 +13,7 @@ if (NULL == dir)
 	#elif LANG_RUS
 		printf("  mkdir <¤¨à¥ªâ®à¨ï>\n\r");
 	#endif	
-	return FALSE;
+	return TRUE;
 	}
 
 
@@ -46,3 +46,4 @@ else
 	return FALSE;
 
 }
+

programs/system/shell/cmd/cmd_more.c

@@ -16,7 +16,7 @@ if (strlen(file)<1)
 	#elif LANG_RUS
 		printf ("  more <¨¬ï ä ©« >\n\r");
 	#endif
-	return FALSE;
+	return TRUE;
 	}
 
 if ( '/' == file[0])
@@ -93,3 +93,4 @@ con_set_flags(flags);
 printf ("\n\r");
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_ps.c

@@ -26,3 +26,4 @@ free(buf1k);
 return TRUE;
 
 }
+

programs/system/shell/cmd/cmd_pwd.c

@@ -4,3 +4,4 @@ int cmd_pwd(char param[])
 printf ("  %s%c\n\r", cur_dir, cur_dir[strlen(cur_dir)-1]=='/'?' ':'/' );
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_reboot.c

@@ -7,3 +7,4 @@ else
 	kol_system_end(3);
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_rm.c

@@ -13,7 +13,7 @@ if (NULL == file)
 	#elif LANG_RUS
 		printf ("  rm <¨¬ï ä ©« >\n\r");
 	#endif
-	return FALSE;
+	return TRUE;
 	}
 
 if ( '/' == file[0])
@@ -52,3 +52,4 @@ else
 	return FALSE;
 
 }
+

programs/system/shell/cmd/cmd_rmdir.c

@@ -13,7 +13,7 @@ if (NULL == dir)
 	#elif LANG_ENG
 		printf("  rmdir <¤¨à¥ªâ®à¨ï>\n\r");
 	#endif
-	return FALSE;
+	return TRUE;
 	}
 
 if ( ( 0 == strcmp(dir, ".") ) || ( 0 == strcmp(dir, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) 
@@ -48,3 +48,4 @@ else
 	return FALSE;
 
 }
+

programs/system/shell/cmd/cmd_shutdown.c

@@ -4,3 +4,4 @@ int cmd_shutdown(char param[])
 kol_system_end(2);
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_sleep.c

@@ -4,9 +4,17 @@ int cmd_sleep(char param[])
 int delay;
 
 if (!strlen(param))
-	return FALSE;
+	{
+	#if LANG_ENG
+		printf("    sleep <time in the 1/100 of second>\n\r");
+	#elif LANG_RUS
+		printf("  sleep <интервал в сотых доля секунды>\n\r");
+	#endif
+	return TRUE;
+	}
 
 delay = _atoi(param);
 kol_sleep((unsigned)delay);
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_touch.c

@@ -13,7 +13,7 @@ if (NULL == file)
 	#elif LANG_RUS
 		printf("  touch <¨¬ï ä ©« >\n\r");
 	#endif
-	return FALSE;
+	return TRUE;
 	}
 
 if (  ( 0 == strcmp(file, ".") ) || ( 0 == strcmp(file, "..") ) || ( 0 == strcmp(cur_dir, "/")) ) 

programs/system/shell/cmd/cmd_uptime.c

@@ -17,3 +17,4 @@ up_millisecs = (time_tick*10)%100;
 #endif
 return TRUE;
 }
+

programs/system/shell/cmd/cmd_ver.c

@@ -1,6 +1,7 @@
 
 int cmd_ver(char param[])
 {
+
 if (!strcmp(param, "kernel"))
 	{
 	char		*kvbuf;
@@ -63,3 +64,4 @@ if (!strcmp(param, "cpu"))
 printf ("  Shell v%s\n\r", SHELL_VERSION);
 return TRUE;
 }
+