1
0
mirror of git://projects.qi-hardware.com/wernermisc.git synced 2025-04-21 12:27:27 +03:00

m1/patches/rtems: refresh

This commit is contained in:
Xiangfu
2012-05-14 12:36:46 +08:00
parent 9a316150b4
commit b6b61b1702
4 changed files with 60 additions and 61 deletions

View File

@@ -4,11 +4,11 @@ Date: Fri Feb 24 21:58:20 2012 +0100
Export rtems_shell_init_env, rtems_shell_env_free, rtems_shell_main_mv, rtems_shell_main_cp and rtems_shell_main_rm
diff --git a/cpukit/libmisc/shell/main_mv.c b/cpukit/libmisc/shell/main_mv.c
index 7e3db0f..5cfddc9 100644
--- a/cpukit/libmisc/shell/main_mv.c
+++ b/cpukit/libmisc/shell/main_mv.c
@@ -116,7 +116,7 @@ rtems_shell_mv_exit (rtems_shell_mv_globals* globals, int code)
Index: rtems/cpukit/libmisc/shell/main_mv.c
===================================================================
--- rtems.orig/cpukit/libmisc/shell/main_mv.c 2012-05-14 12:34:47.271490000 +0800
+++ rtems/cpukit/libmisc/shell/main_mv.c 2012-05-14 12:35:14.309964001 +0800
@@ -116,7 +116,7 @@
const char *user_from_uid(uid_t uid, int nouser);
char *group_from_gid(gid_t gid, int nogroup);
@@ -17,11 +17,11 @@ index 7e3db0f..5cfddc9 100644
rtems_shell_main_mv(int argc, char *argv[])
{
rtems_shell_mv_globals mv_globals;
diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c
index 14b609b..9c4b1d5 100644
--- a/cpukit/libmisc/shell/shell.c
+++ b/cpukit/libmisc/shell/shell.c
@@ -61,7 +61,7 @@ rtems_shell_env_t *rtems_current_shell_env = &rtems_global_shell_env;
Index: rtems/cpukit/libmisc/shell/shell.c
===================================================================
--- rtems.orig/cpukit/libmisc/shell/shell.c 2012-05-14 12:34:47.287482000 +0800
+++ rtems/cpukit/libmisc/shell/shell.c 2012-05-14 12:35:14.313962001 +0800
@@ -59,7 +59,7 @@
/*
* Initialize the shell user/process environment information
*/
@@ -30,7 +30,7 @@ index 14b609b..9c4b1d5 100644
rtems_shell_env_t *shell_env_p
)
{
@@ -83,7 +83,7 @@ static rtems_shell_env_t *rtems_shell_init_env(
@@ -81,7 +81,7 @@
/*
* Completely free a shell_env_t and all associated memory
*/
@@ -39,11 +39,11 @@ index 14b609b..9c4b1d5 100644
void *ptr
)
{
diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h
index f71cadd..a3abd3e 100644
--- a/cpukit/libmisc/shell/shell.h
+++ b/cpukit/libmisc/shell/shell.h
@@ -207,6 +207,13 @@ bool rtems_shell_main_loop(
Index: rtems/cpukit/libmisc/shell/shell.h
===================================================================
--- rtems.orig/cpukit/libmisc/shell/shell.h 2012-05-14 12:34:47.259496001 +0800
+++ rtems/cpukit/libmisc/shell/shell.h 2012-05-14 12:35:14.317960001 +0800
@@ -205,6 +205,13 @@
rtems_shell_env_t *rtems_shell_env
);
@@ -57,7 +57,7 @@ index f71cadd..a3abd3e 100644
extern rtems_shell_env_t rtems_global_shell_env;
extern rtems_shell_env_t *rtems_current_shell_env;
@@ -307,6 +314,13 @@ extern rtems_status_code rtems_shell_wait_for_input(
@@ -305,6 +312,13 @@
extern int rtems_shell_main_monitor(int argc, char **argv);