catを修正

src/cat.zig

@@ -75,33 +75,41 @@ pub fn main() !void {
     }
 
     if (fname.items.len == 0) {
-        try help();
+        const stdin = io.getStdIn().reader();
-        return;
+        var buf: [2048]u8 = undefined;
-    }
-
-    for (fname.items) |item| {
-        const file = try fs.cwd().openFile(item, .{});
-        defer file.close();
-
-        var buf: [1024]u8 = undefined;
         while (true) {
-            const result = try file.reader().readUntilDelimiterOrEof(buf[0..], '\n') orelse break;
+            const lne = try stdin.read(buf[0..]);
-            if (issqz and std.mem.trimRight(u8, result, "\n\r").len == 0) continue;
+            if (lne == 0) {
-            const stripped = std.mem.trim(u8, result, " \n\t\r");
+                break;
+            }
 
-            if (isone) {
+            try io.getStdOut().writer().writeAll(buf[0..lne]);
-                try io.getStdOut().writer().writeAll(stripped);
+        }
-            } else {
+    } else {
-                if (isnum or (isnun and stripped.len != 0)) {
+        for (fname.items) |item| {
-                    line_number += 1;
+            const file = try fs.cwd().openFile(item, .{});
-                    try io.getStdOut().writer().print("  {:3} | ", .{line_number});
+            defer file.close();
-                } else if (isnum) {
+
-                    line_number += 1;
+            var buf: [1024]u8 = undefined;
-                    try io.getStdOut().writer().print("  {:3} | ", .{line_number});
+            while (true) {
+                const result = try file.reader().readUntilDelimiterOrEof(buf[0..], '\n') orelse break;
+                if (issqz and std.mem.trimRight(u8, result, "\n\r").len == 0) continue;
+                const stripped = std.mem.trim(u8, result, " \n\t\r");
+
+                if (isone) {
+                    try io.getStdOut().writer().writeAll(stripped);
+                } else {
+                    if (isnum or (isnun and stripped.len != 0)) {
+                        line_number += 1;
+                        try io.getStdOut().writer().print("  {:3} | ", .{line_number});
+                    } else if (isnum) {
+                        line_number += 1;
+                        try io.getStdOut().writer().print("  {:3} | ", .{line_number});
+                    }
+
+                    try io.getStdOut().writer().writeAll(result);
+                    try io.getStdOut().writer().print("\n", .{});
                 }
-
-                try io.getStdOut().writer().writeAll(result);
-                try io.getStdOut().writer().print("\n", .{});
             }
         }
     }