changes were done

Author: shaghayeghfar

implement-shell-tools/cat/cat.js

@@ -8,12 +8,16 @@ let startIndex = 0;
 let lineNumber = 1;
 
 // Check for flags
-if (args[0] === "-n") {
-  numberAllLines = true;
-  startIndex = 1;
-} else if (args[0] === "-b") {
-  numberNonBlankLines = true;
-  startIndex = 1;
+for (let i = 0; i < args.length; i++) {
+  if (args[i] === "-n") {
+    numberAllLines = true;
+    startIndex++;
+  } else if (args[i] === "-b") {
+    numberNonBlankLines = true;
+    startIndex++;
+  } else {
+    break;
+  }
 }
 
 // Read each file
@@ -23,7 +27,10 @@ for (let i = startIndex; i < args.length; i++) {
   try {
     let content = fs.readFileSync(fileName, "utf8");
 
-    let lines = content.split("\n");
+    // Remove the extra empty line if the file ends with "\n"
+    let lines = content.endsWith("\n")
+      ? content.slice(0, -1).split("\n")
+      : content.split("\n");
 
     for (let j = 0; j < lines.length; j++) {
       let line = lines[j];

implement-shell-tools/wc/wc.js

@@ -29,40 +29,75 @@ if (!countLines && !countWords && !countBytes) {
   countBytes = true;
 }
 
+// Totals
+let totalLines = 0;
+let totalWords = 0;
+let totalBytes = 0;
+let filesCounted = 0;
+
 // Function to count one file
 function countFile(fileName) {
-  const content = fs.readFileSync(fileName, "utf8");
+  try {
+    const content = fs.readFileSync(fileName, "utf8");
+
+    let lines = content.split("\n").length - 1;
+
+    let words = content
+      .trim()
+      .split(/\s+/)
+      .filter((word) => word.length > 0).length;
+
+    let bytes = Buffer.byteLength(content);
+
+    totalLines += lines;
+    totalWords += words;
+    totalBytes += bytes;
+    filesCounted++;
+
+    let result = "";
 
-  let lines = content.split("\n").length - 1;
+    if (countLines) {
+      result += lines + " ";
+    }
 
-  let words = content
-    .trim()
-    .split(/\s+/)
-    .filter((word) => word.length > 0).length;
+    if (countWords) {
+      result += words + " ";
+    }
 
-  let bytes = Buffer.byteLength(content);
+    if (countBytes) {
+      result += bytes + " ";
+    }
 
+    result += fileName;
+
+    console.log(result);
+  } catch (error) {
+    console.log("Cannot read file: " + fileName);
+  }
+}
+
+// Run wc for every file
+for (let file of files) {
+  countFile(file);
+}
+
+// Print totals if more than one file was counted
+if (filesCounted > 1) {
   let result = "";
 
   if (countLines) {
-    result += lines + " ";
+    result += totalLines + " ";
   }
 
   if (countWords) {
-    result += words + " ";
+    result += totalWords + " ";
   }
 
   if (countBytes) {
-    result += bytes + " ";
+    result += totalBytes + " ";
   }
 
-  result += fileName;
+  result += "total";
 
   console.log(result);
 }
-
-// Run wc for every file
-
-for (let file of files) {
-  countFile(file);
-}