Skip to content

Commit efdd20b

Browse files
committed
updated getcwd
1 parent 65e60ae commit efdd20b

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎implement-shell-tools/ls/ls.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function Flaga() {
6363
// ===== Extracting Data From Arguments =====
6464
function getCurrentWorkingDirectory(args) {
6565
const index = args[1].lastIndexOf("/");
66-
return args[1].slice(0, index);
66+
return args[1].slice(0, index + 1);
6767
}
6868

6969
function getFsItems(userArgs) {
@@ -76,11 +76,11 @@ function checkArgsLength(fsItems) {
7676
}
7777

7878
function getDirArgs(currentWorkingDirectory, fsItems) {
79-
return fsItems.filter((p) => fs.statSync(currentWorkingDirectory + "/" + p).isDirectory());
79+
return fsItems.filter((p) => fs.statSync(currentWorkingDirectory + p).isDirectory());
8080
}
8181

8282
function getFileArgs(currentWorkingDirectory, fsItems) {
83-
const fileArgs = fsItems.filter((p) => !fs.statSync(currentWorkingDirectory + "/" + p).isDirectory());
83+
const fileArgs = fsItems.filter((p) => !fs.statSync(currentWorkingDirectory + p).isDirectory());
8484
if (showAll == false) removeDotFiles(fileArgs);
8585
return fileArgs;
8686
}
@@ -108,7 +108,7 @@ function populateOutput(currentWorkingDirectory, fsItems, dirArgs, fileArgs) {
108108
}
109109

110110
function dirOutput(dir, currentWorkingDirectory) {
111-
let contents = fs.readdirSync(currentWorkingDirectory + "/" + dir);
111+
let contents = fs.readdirSync(currentWorkingDirectory + dir);
112112
let outputStr = "";
113113
if (showAll) outputStr += ".\t..\t";
114114
else {

‎implement-shell-tools/wc/wc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ function getFlags(userArgs) {
3333
.join("");
3434
}
3535

36-
function executeFlags(flags) {
36+
function executeFlags(flags, allFilesData) {
3737
for (const flag of flags) {
38-
if (flagHandlers[flag]) flagHandlers[flag]();
38+
if (flagHandlers[flag]) flagHandlers[flag](allFilesData);
3939
else invalidFlagError();
4040
}
4141
}

0 commit comments

Comments
 (0)