Merge branch 'master' of github.com:loftyzhang/os-shell

XFPlus · Mar 28, 2016 · 98d968f · 98d968f
2 parents fcbb49d + a5659cb
commit 98d968f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 1 deletion.
diff --git a/6-14061186-shell/execute.c b/6-14061186-shell/execute.c
@@ -891,7 +891,7 @@ int builtinCmd(SimpleCmd *cmd, int needRedir)
             printf(" ");
         }
         if (cmd->argc<2){
-            printf("echo:illegal input,supposing echo [String]");
+            printf("echo:illegal input,requiring echo [String]");
         }
         printf("\n");
         return 1;

diff --git a/6-14061186-shell/execute.o b/6-14061186-shell/execute.o
diff --git a/6-14061186-shell/user-sh b/6-14061186-shell/user-sh
diff --git a/张巍_14061186_冯炜韬_14061197_shell实验报告.docx b/张巍_14061186_冯炜韬_14061197_shell实验报告.docx