build: make all 76 utilities compile against current V

common/readutmp_nix.c.v

@@ -4,30 +4,30 @@ module common
 #include <utmpx.h>
 #include <errno.h>
 
-// TODO: conflicts with `timeval` in <time.h>
-// <bits/types/struct_timeval.h>
-/*
-pub struct C.timeval {
-	tv_sec  i64 // Seconds.
-	tv_usec i64 // Microseconds.
-}*/
-
-// <time.h>
-pub struct C.timeval {
-pub:
-	tv_sec  u64 // Seconds.
-	tv_usec u64 // Microseconds.
+// `struct utmpx` was previously declared twice, once here and once in
+// src/users/users.c.v with a different (shorter) field list, which V rejects as
+// a redeclaration. Declare it once, here, with the glibc layout.
+//
+// The fixed size fields are UT_LINESIZE/UT_NAMESIZE/UT_HOSTSIZE (32/32/256) and
+// the element size has to match what getutxent() writes, because read_utmp()
+// copies entries into a []C.utmpx.
+pub struct C.exit_status {
+	et_code u16
+	et_term u16
 }
 
 pub struct C.utmpx {
-	ut_type    i16       // Type of login.
-	ut_pid     int       // Process ID of login process.
-	ut_line    [32]char  // Devicename.
-	ut_id      [4]char   // Inittab ID.
-	ut_user    [32]char  // Username.
-	ut_host    [256]char // Hostname for remote login.
-	ut_tv      C.timeval // TODO: Declare sub struct correctly
-	ut_addr_v6 [4]int    // Internet address of remote host.
+	ut_type       i16           // Type of login.
+	ut_pid        int           // Process ID of login process.
+	ut_line       [32]u8        // Devicename.
+	ut_id         [4]u8         // Inittab ID.
+	ut_user       [32]u8        // Username.
+	ut_host       [256]u8       // Hostname for remote login.
+	ut_exit       C.exit_status // Exit status of the process.
+	ut_session_id i32           // Session ID.
+	ut_tv         C.timeval     // Time entry.
+	ut_addr_v6    [4]i32        // Internet address of remote host.
+	__unused      [20]u8        // Reserved.
 }
 
 // sets the name of the utmp-format file for the other utmp functions to access.

common/testing/testrig.v

@@ -84,8 +84,7 @@ pub fn (rig TestRig) assert_platform_util() {
 		} else {
 			// uptime was moved to procps-ng and may not be available in coreutils
 
-			assert
-				ver == 'uptime (GNU coreut' || ver == 'uptime (coreutils)' || ver == 'uptime from procps'
+			assert ver == 'uptime (GNU coreut' || ver == 'uptime (coreutils)' || ver == 'uptime from procps'
 		}
 	}
 }

src/base64/base64.v

@@ -159,7 +159,7 @@ fn main() {
 		exit(1)
 	}
 	if wraping_opt < 0 {
-		eprintln('${application_name}: invalid wrap size: \'${wraping_opt}\'')
+		eprintln("${application_name}: invalid wrap size: '${wraping_opt}'")
 		exit(1)
 	}
 

src/basenc/basenc.v

@@ -1,5 +1,5 @@
 import os
-import v.mathutil
+import math
 import encoding.base64
 import encoding.base32
 
@@ -51,7 +51,7 @@ fn print_encoded(encoded string, options Options) {
 		return
 	}
 	for start := 0; start < encoded.len; start += options.wrap {
-		end := mathutil.min(start + options.wrap, encoded.len)
+		end := math.min(start + options.wrap, encoded.len)
 		// safe to use string slicing because all chars
 		// are in printable ascii
 		println(encoded[start..end])

src/cksum/cksum.v

@@ -70,8 +70,9 @@ fn calc_sums(args Args) {
 		}
 
 		mut len_counter := total_length
-		for ; len_counter; len_counter >>= 8 {
+		for len_counter > 0 {
 			crc = (crc << 8) ^ crctab[0][((crc >> 24) ^ len_counter) & 0xFF]
+			len_counter >>= 8
 		}
 		crc = ~crc & 0xffff_ffff
 

src/cp/helper.v

@@ -69,7 +69,7 @@ fn success_exit(messages ...string) {
 	exit(0)
 }
 
-fn setup_cp_command(args []string) ?(CpCommand, []string, string) {
+fn setup_cp_command(args []string) (CpCommand, []string, string) {
 	mut fp := common.flag_parser(args)
 	fp.application('cp')
 	fp.limit_free_args_to_at_least(1) or { common.exit_with_error_message(name, err.msg()) }
@@ -143,9 +143,7 @@ fn setup_cp_command(args []string) ?(CpCommand, []string, string) {
 }
 
 pub fn run_cp(args []string) {
-	cp, sources, dest := setup_cp_command(args) or {
-		common.exit_with_error_message(name, err.msg())
-	}
+	cp, sources, dest := setup_cp_command(args)
 	if sources.len > 1 && !os.is_dir(dest) {
 		common.exit_with_error_message(name, target_not_dir(dest))
 	}

src/cut/cut.v

@@ -3,8 +3,8 @@ import arrays
 import common
 import flag
 import io
+import math
 import os
-import v.mathutil
 
 const app_name = 'cut'
 const space_comma = ' ,'
@@ -124,13 +124,13 @@ fn combine_ranges_and_zero_index(ranges []Range, max int, complement bool) []Ran
 
 	outer: for range in ranges.sorted(a.start < b.start) {
 		start := range.start - 1
-		end := if range.end == -1 { max } else { mathutil.min(max, range.end) }
+		end := if range.end == -1 { max } else { math.min(max, range.end) }
 
 		for mut combined_range in combined_ranges {
 			if range_overlaps_range(start, end, combined_range.start, combined_range.end) {
 				combined_range = Range{
-					start: mathutil.min(start, combined_range.start)
-					end:   mathutil.max(end, combined_range.end)
+					start: math.min(start, combined_range.start)
+					end:   math.max(end, combined_range.end)
 				}
 				continue outer
 			}
@@ -189,7 +189,7 @@ fn get_args(args []string) Args {
 	delimiter := fp.string('delimter', `d`, '', 'use <string> instead of TAB for field delimter')
 	fields := fp.string('fields', `f`, '',
 		'select only <string> fields; also print any line${wrap}' +
-		'that contains no delimiter character, unless the${wrap}-s option is specified')
+			'that contains no delimiter character, unless the${wrap}-s option is specified')
 	fp.bool('', `n`, false, '(ignored)')
 	complement := fp.bool('complement', ` `, false,
 		'complement the set of selected bytes, characters${wrap}or fields')
@@ -207,9 +207,9 @@ fn get_args(args []string) Args {
 		'range, or many ranges separated by commas. Selected input is written${eol}' +
 		'in the same order that it is read, and is written exactly once.${eol}${eol}' +
 		'Each range is one of:${eol}${eol}' +
-		'  N     N\'th byte, character or field, counted from 1${eol}' +
-		'  N-    from N\'th byte, character or field, to end of line${eol}' +
-		'  N-M   from N\'th to M\'th (included) byte, character or field${eol}' + "  -M    from first to M'th (included) byte, character or field")
+		"  N     N'th byte, character or field, counted from 1${eol}" +
+		"  N-    from N'th byte, character or field, to end of line${eol}" +
+		"  N-M   from N'th to M'th (included) byte, character or field${eol}" + "  -M    from first to M'th (included) byte, character or field")
 	fp.footer(common.coreutils_footer())
 
 	file_args := fp.finalize() or { exit_error(err.msg()) }

src/expand/expand.v

@@ -8,7 +8,7 @@ const nl = '\n'
 fn process_line(line string, initial bool, tabs int) {
 	mut sp := ''
 
-	for i := tabs; i; i-- {
+	for _ in 0 .. tabs {
 		sp += ' '
 	}
 

src/expr/expr_test.v

@@ -161,7 +161,7 @@ const mb_tests = [
 	// fail: multi; broken UTF-8 is treated in different way
 	//	"substr \u03B1bc\xB4ef 3 3",
 	'match abcdef ab',
-	'match abcdef "\\(ab\\)"'
+	'match abcdef "\\(ab\\)"',
 	// fail: single; this is a good news, regex in vlib supports UTF-8
 	//	"match \u03B1bc\u03B4ef .bc",
 	// fail: both; broken regex of vlib, see #10885

src/fmt/fmt.v

@@ -241,11 +241,11 @@ fn process_args(args []string) App {
 
 	crown_marg := fp.bool('crown-margin', `c`, false,
 		'preserve the indentation of the first two lines within' +
-		'${pad}a paragraph, and align the left margin of each' +
-		'${pad}subsequent line with that of the second line')
+			'${pad}a paragraph, and align the left margin of each' +
+			'${pad}subsequent line with that of the second line')
 	prefix_str := fp.string('prefix', `p`, '',
 		'reformat only lines beginning with STRING, reattaching ' +
-		'${pad}the prefix to reformatted lines')
+			'${pad}the prefix to reformatted lines')
 	split_only := fp.bool('split-only', `s`, false, 'split long lines, but do not refill')
 	tagged_par := fp.bool('tagged-paragraph', `t`, false,
 		'indentation of first line different from second')

src/head/head.v

@@ -294,7 +294,7 @@ fn wrap_long_command_description(description string, max_cols int) string {
 	return buf.str()
 }
 
-fn setup_command(args []string) ?(HeadCommand, []InputFile) {
+fn setup_command(args []string) (HeadCommand, []InputFile) {
 	mut fp := common.flag_parser(args)
 	fp.application(name)
 	fp.usage_example('[OPTION]... [FILE]...')
@@ -330,7 +330,7 @@ fn setup_command(args []string) ?(HeadCommand, []InputFile) {
 }
 
 fn run_head(args []string) {
-	head, mut files := setup_command(args) or { common.exit_with_error_message(name, err.msg()) }
+	head, mut files := setup_command(args)
 
 	head.run(mut files)
 }

src/mv/helper.v

@@ -48,9 +48,7 @@ fn int_yes(prompt string) bool {
 }
 
 pub fn run_mv(args []string) {
-	mv, sources, dest := setup_mv_command(args) or {
-		common.exit_with_error_message(name, err.msg())
-	}
+	mv, sources, dest := setup_mv_command(args)
 	if sources.len > 1 && !os.is_dir(dest) {
 		common.exit_with_error_message(name, target_not_dir(dest))
 	}
@@ -59,7 +57,7 @@ pub fn run_mv(args []string) {
 	}
 }
 
-fn setup_mv_command(args []string) ?(MvCommand, []string, string) {
+fn setup_mv_command(args []string) (MvCommand, []string, string) {
 	mut fp := common.flag_parser(args)
 	fp.application('mv')
 	fp.limit_free_args_to_at_least(1) or { common.exit_with_error_message(name, err.msg()) }

src/nproc/nproc.v

@@ -25,7 +25,7 @@ fn main() {
 
 	// Check if ignored CPUs is > 0
 	if ignored_cpus < 0 {
-		println('nproc: invalid number: \'${ignored_cpus}\'')
+		println("nproc: invalid number: '${ignored_cpus}'")
 		exit(1)
 	}
 

src/numfmt/options.v

@@ -45,21 +45,21 @@ fn get_options() Options {
 		'use locale-defined grouping of digits, e.g. 1,000,000')
 	header := fp.int('header', 0, 1,
 		'print (without converting) the first N header lines; <int>\n${flag.space}' +
-		'defaults to 1 if not specified')
+			'defaults to 1 if not specified')
 	invalid := fp.string('invalid', 0, 'abort',
 		'failure mode for invalid numbers: MODE can be:\n${flag.space}' +
-		'abort (default), fail, warn, ignore')
+			'abort (default), fail, warn, ignore')
 	padding := fp.int('padding', 0, 0,
 		'pad the output to N characters; positive N will\n${flag.space}' +
-		'right-align; negative N will left-align; padding is\n${flag.space}' +
-		'ignored if the output is wider than N; the default is to\n${flag.space}' +
-		'automatically pad if a whitespace is found')
+			'right-align; negative N will left-align; padding is\n${flag.space}' +
+			'ignored if the output is wider than N; the default is to\n${flag.space}' +
+			'automatically pad if a whitespace is found')
 	round := fp.string('round', 0, 'from-zero',
 		'use METHOD for rounding when scaling; METHOD can be:\n${flag.space}' +
-		'up, down, from-zero (default), towards-zero, nearest')
+			'up, down, from-zero (default), towards-zero, nearest')
 	suffix := fp.string('suffix', 0, '',
 		'add SUFFIX to output numbers, and accept optional SUFFIX\n${flag.space}' +
-		'in input numbers')
+			'in input numbers')
 	to := fp.string('to', 0, 'none', 'auto-scale output numbers to UNIT\n${flag.space}' +
 		'none, si, iec, iec-i')
 	to_unit := fp.int('to-unit', 0, 1, 'the output unit size (instead of the default 1)')

src/printenv/printenv.v

@@ -1,7 +1,9 @@
 import os
 import common
 
-const zero_byte = byte(0).ascii_str()
+fn zero_byte() string {
+	return u8(0).ascii_str()
+}
 
 // Exit status:
 // 0 if all variables specified were found
@@ -34,7 +36,7 @@ fn main() {
 			mut s := '${k}=${v}'
 			if opt_nul_terminate {
 				print(s)
-				print(zero_byte)
+				print(zero_byte())
 			} else {
 				println(s)
 			}
@@ -49,7 +51,7 @@ fn main() {
 			}
 			if opt_nul_terminate {
 				print(v)
-				print(zero_byte)
+				print(zero_byte())
 			} else {
 				println(v)
 			}

src/printf/printf.v

@@ -242,7 +242,10 @@ fn apply_posix_escape(s string) string {
 			}
 		}
 	}
-	return if has_unprintable { '\$\'${upout}\'' } else { s.replace_each([
+	return if has_unprintable {
+		"\$'${upout}'"
+	} else {
+		s.replace_each([
 			'|',
 			'\\|',
 			'&',
@@ -269,7 +272,8 @@ fn apply_posix_escape(s string) string {
 			'\\"',
 			' ',
 			'\\ ',
-		]) }
+		])
+	}
 }
 
 // A code below is modded version of vlib/strconv/vprintf.v whose parameter to be an array of string

src/shred/config.v

@@ -6,7 +6,7 @@ import os
 @[version: '0.1']
 struct Config {
 	force         bool   @[short: f; xdoc: 'change permissions to allow writing if necessary']
-	iterations    int = 3    @[short: n; xdoc: 'overwrite N times instead of the default (3)']
+	iterations    int = 3     @[short: n; xdoc: 'overwrite N times instead of the default (3)']
 	random_source string @[xdoc: 'get random bytes from <string>']
 	size          string @[short: s; xdoc: 'shred this many bytes (suffixes like K, M, G accepted)\n']
 	rm            bool   @[only: u; xdoc: 'deallocate and remove file after overwriting']
@@ -26,8 +26,7 @@ fn get_args() (Config, []string) {
 			description: 'Usage: shred [OPTION]... FILE...\n' +
 				'Overwrite the specified FILE(s) repeatedly, in order to make it harder\n' +
 				'for even very expensive hardware probing to recover the data.'
-			footer:
-				'\nDelete FILE(s) if --remove (-u) is specified. The default is not to remove\n' + 'the files because it is common to operate on device files like /dev/hda,\n' + 'and those files usually should not be removed.\n\n' + 'The --remove <string> parameter indicates how to remove a directory entry:\n' + "  'unlink'   => use a standard unlink call.\n" + "  'wipe'     => also first obfuscate bytes in the name.\n" + "  'wipesync' => also sync each obfuscated byte to the device.\n" + "The default mode is 'wipesync', but note it can be expensive.\n\n" + 'CAUTION: shred assumes the file system and hardware overwrite data in place.\n' + 'Although this is common, many platforms operate otherwise. Also, backups\n' + 'and mirrors may contain unremovable copies that will let a shredded file\n' + 'be recovered later.\n' + common.coreutils_footer()
+			footer:      '\nDelete FILE(s) if --remove (-u) is specified. The default is not to remove\n' + 'the files because it is common to operate on device files like /dev/hda,\n' + 'and those files usually should not be removed.\n\n' + 'The --remove <string> parameter indicates how to remove a directory entry:\n' + "  'unlink'   => use a standard unlink call.\n" + "  'wipe'     => also first obfuscate bytes in the name.\n" + "  'wipesync' => also sync each obfuscated byte to the device.\n" + "The default mode is 'wipesync', but note it can be expensive.\n\n" + 'CAUTION: shred assumes the file system and hardware overwrite data in place.\n' + 'Although this is common, many platforms operate otherwise. Also, backups\n' + 'and mirrors may contain unremovable copies that will let a shredded file\n' + 'be recovered later.\n' + common.coreutils_footer()
 		) or { panic(err) }
 		println(doc)
 		exit(0)

src/shuf/shuf.v

@@ -88,7 +88,7 @@ fn shuffle_lines(lines []string, settings Settings) []string {
 			exit(1)
 		}
 		mut bytes := io.read_all(io.ReadAllConfig{ reader: file, read_to_end_of_stream: true }) or {
-			eprintln('${app_name}: ${settings.random_source}: Can\'t read file')
+			eprintln("${app_name}: ${settings.random_source}: Can't read file")
 			exit(1)
 		}
 		mut seed := u32(0)
@@ -159,7 +159,7 @@ fn register_lines_by_file(lines []string, fname string, zero_terminated bool) []
 
 	if zero_terminated {
 		mut bytes := io.read_all(io.ReadAllConfig{ reader: file, read_to_end_of_stream: true }) or {
-			eprintln('${app_name}: ${fname}: Can\'t read file')
+			eprintln("${app_name}: ${fname}: Can't read file")
 			exit(1)
 		}