Skip to content

express Option.arg as sentinel-terminated slice #3

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.

Sign up for GitHub

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

Open
djpohly wants to merge 1 commit into
base: master
Choose a base branch
from
Open

express Option.arg as sentinel-terminated slice #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions getopt.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub const Option = struct {
opt: u8,

/// Option argument, if any.
arg: ?[]const u8 = null,
arg: ?[:0]const u8 = null,
};

pub const Error = error{ InvalidOption, MissingArgument };
Expand Down Expand Up @@ -49,15 +49,15 @@ pub const OptionsIterator = struct {
if (arg[self.optpos + 1] != 0) {
const res = Option{
.opt = self.optopt,
.arg = mem.span(arg + self.optpos + 1),
.arg = mem.sliceTo(arg + self.optpos + 1, 0),
};
self.optind += 1;
self.optpos = 1;
return res;
} else if (self.optind + 1 < self.argv.len) {
const res = Option{
.opt = self.optopt,
.arg = mem.span(self.argv[self.optind + 1]),
.arg = mem.sliceTo(self.argv[self.optind + 1], 0),
};
self.optind += 2;
self.optpos = 1;
Expand Down Expand Up @@ -318,3 +318,30 @@ test "positional args with separator" {

try expect(mem.eql([*:0]const u8, opts.args().?, &[_][*:0]const u8{ "foo", "bar" }));
}

test "separate optarg is sentinel-terminated" {
var argv = [_][*:0]const u8{
"getopt",
"-a10",
};

var opts = getoptArgv(&argv, "a:bc:");

const arg = (try opts.next()).?.arg.?;
// If arg is not sentinel-terminated, this panics with index OOB
try expect(arg[arg.len] == 0);
}

test "separate optarg is sentinel-terminated" {
var argv = [_][*:0]const u8{
"getopt",
"-c",
"42",
};

var opts = getoptArgv(&argv, "a:bc:");

const arg = (try opts.next()).?.arg.?;
// If arg is not sentinel-terminated, this panics with index OOB
try expect(arg[arg.len] == 0);
}