Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

コマンドの整理と,substr()の使用停止 #39

Merged
merged 3 commits into from Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion usr/GNUmakefile
Expand Up @@ -19,6 +19,7 @@
#
# Makefile : usr ディレクトリ用の Makefile
#
# 2019.03.13 : in out を追加
# 2018.11.24 : ar cp fsize mv を追加
# 2018.01.26 : lib ディレクトリを削除(C-- 標準ライブラリを用いる)
# 2016.01.07 : 初期バージョン
Expand All @@ -28,7 +29,8 @@
MAKEFLAGS=--no-print-directory

# サブディレクトリ
SUBDIRS:=ar cat cp dump echo edit fsize hello ls mkdir mv rm rmdir shell touch
SUBDIRS:=ar cat cp dump echo edit fsize hello in ls mkdir mv out rm rmdir \
shell touch
# port

all :
Expand Down
2 changes: 1 addition & 1 deletion usr/in/GNUmakefile
Expand Up @@ -29,7 +29,7 @@ NAME=in
SRCS=${NAME}.cmm
#----------------------------------------------------------------------------

all : clean ${NAME}.exe ${NAME}
all : clean ${NAME}.exe #${NAME}

${NAME}.exe : ${SRCS}
cm2e -P -o ${NAME} ${SRCS} # i/o 特権モード
Expand Down
Binary file removed usr/in/in
Binary file not shown.
2 changes: 1 addition & 1 deletion usr/in/in.cmm
Expand Up @@ -2,7 +2,7 @@
* TacOS Source Code
* Tokuyama kousen Advanced educational Computer.
*
* Copyright (C) 2016 by
* Copyright (C) 2019 by
* Dept. of Computer Science and Electronic Engineering,
* Tokuyama College of Technology, JAPAN
*
Expand Down
2 changes: 1 addition & 1 deletion usr/out/GNUmakefile
Expand Up @@ -29,7 +29,7 @@ NAME=out
SRCS=${NAME}.cmm
#----------------------------------------------------------------------------

all : clean ${NAME}.exe ${NAME}
all : clean ${NAME}.exe #${NAME}

${NAME}.exe : ${SRCS}
cm2e -P -o ${NAME} ${SRCS} # i/o 特権モード
Expand Down
44 changes: 0 additions & 44 deletions usr/port/GNUmakefile

This file was deleted.

5 changes: 0 additions & 5 deletions usr/port/Makefile

This file was deleted.

72 changes: 0 additions & 72 deletions usr/port/port.cmm

This file was deleted.

3 changes: 2 additions & 1 deletion usr/shell/shell.cmm
Expand Up @@ -39,6 +39,7 @@
#include <string.hmm>
#include <ctype.hmm>
#include <syslib.hmm>
#include <crt0.hmm>

#define LMAX 80 // 1行最大 80 文字
#define ARGMAX 30 // コマンド業引数は最大30個
Expand Down Expand Up @@ -72,7 +73,7 @@ boolean parse(char[] line) {
p = skipSpc(line , p); // 余計な空白をスキップする
if (line[p]=='\0') break; // 行末になった

argv[i] = subStr(line, p); // 文字列を記録する
argv[i] = _addrAdd(line, p); // 文字列を記録する
i = i + 1;

p = srchSpc(line , p); // 空白を探す
Expand Down