wip ErrCtx

This commit is contained in:
2022-06-15 12:56:19 +03:00
parent 72f6c9c6f4
commit eb6003c957
5 changed files with 53 additions and 28 deletions

View File

@@ -12,6 +12,7 @@ const User = @import("../User.zig");
const Group = @import("../Group.zig");
const Corpus = @import("../Corpus.zig");
const DB = @import("../DB.zig");
const ErrCtx = @import("../ErrCtx.zig");
const usage =
\\usage: turbonss-unix2db [options]
@@ -65,15 +66,22 @@ fn execute(
const groupFname = result.argFlag("--group") orelse "./group";
const outFile = result.argFlag("--output") orelse "./db.turbo";
std.debug.print("passwd file name: {s}\n", .{passwdFname});
//std.debug.print("passwd file name: {s}\n", .{passwdFname});
var passwdFile = try fs.cwd().openFile(passwdFname, .{ .mode = .read_only });
defer passwdFile.close();
var groupFile = try fs.cwd().openFile(groupFname, .{ .mode = .read_only });
defer groupFile.close();
var users = try User.fromReader(allocator, passwdFile.reader());
var err_ctx = ErrCtx{};
var users = try User.fromReader(
allocator,
err_ctx.writer(),
passwdFile.reader(),
);
defer for (users) |*user| user.deinit(allocator);
defer allocator.free(users);
var groups = try Group.fromReader(allocator, groupFile.reader());
defer for (groups) |*group| group.deinit(allocator);
defer allocator.free(groups);
@@ -116,7 +124,7 @@ test "invalid argument" {
}
test "smoke test" {
if (true) return error.SkipZigTest;
//if (true) return error.SkipZigTest;
const allocator = testing.allocator;
var stderr = ArrayList(u8).init(allocator);