| ... | @@ -779,17 +779,10 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap { | ... | @@ -779,17 +779,10 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap { |
| 779 | | 779 | |
| 780 | for (environ) |env| { | 780 | for (environ) |env| { |
| 781 | if (env) |ptr| { | 781 | if (env) |ptr| { |
| 782 | var line_i: usize = 0; | 782 | const pair = mem.toSlice(u8, ptr); |
| 783 | while (ptr[line_i] != 0 and ptr[line_i] != '=') : (line_i += 1) {} | 783 | var parts = mem.separate(pair, "="); |
| 784 | if (ptr[line_i] != '=') { | 784 | const key = parts.next().?; |
| 785 | return error.Unexpected; | 785 | const value = parts.next().?; |
| 786 | } | | |
| 787 | const key = ptr[0..line_i]; | | |
| 788 | | | |
| 789 | var end_i: usize = line_i; | | |
| 790 | while (ptr[end_i] != 0) : (end_i += 1) {} | | |
| 791 | const value = ptr[line_i + 1 .. end_i]; | | |
| 792 | | | |
| 793 | try result.set(key, value); | 786 | try result.set(key, value); |
| 794 | } | 787 | } |
| 795 | } | 788 | } |
Shritesh Bhattarai <shritesh@shritesh.com> 2019-04-30 18:43:43-05:00