diff --git a/Makefile b/Makefile index 8f33f345f..6d2f08a8e 100644 --- a/Makefile +++ b/Makefile @@ -324,7 +324,7 @@ $(BUILDDIR)/libstdbuf.$(DYLIB_EXT): $(SRCDIR)/stdbuf/libstdbuf.rs $(SRCDIR)/stdb $(CC) -c -Wall -Werror -fPIC libstdbuf.c && \ $(CC) $(DYLIB_FLAGS) -o libstdbuf.$(DYLIB_EXT) liblibstdbuf.a libstdbuf.o && \ mv *.$(DYLIB_EXT) $(BUILDDIR) && $(RM) *.o && $(RM) *.a - + $(BUILDDIR)/stdbuf: $(BUILDDIR)/libstdbuf.$(DYLIB_EXT) deps: $(BUILDDIR) $(SRCDIR)/cksum/crc_table.rs $(addprefix DEP_,$(DEPLIBS) $(DEPPLUGS)) diff --git a/src/base64/Cargo.toml b/src/base64/Cargo.toml index 5b18730e4..6e0c8ec1f 100644 --- a/src/base64/Cargo.toml +++ b/src/base64/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "base64" version = "0.0.1" diff --git a/src/basename/Cargo.toml b/src/basename/Cargo.toml index b845ec37f..ade2a3236 100644 --- a/src/basename/Cargo.toml +++ b/src/basename/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "basename" version = "0.0.1" diff --git a/src/cat/Cargo.toml b/src/cat/Cargo.toml index b2f072590..36066a55f 100644 --- a/src/cat/Cargo.toml +++ b/src/cat/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "cat" version = "0.0.1" diff --git a/src/chmod/Cargo.toml b/src/chmod/Cargo.toml index 78c61b8a7..5d1508101 100644 --- a/src/chmod/Cargo.toml +++ b/src/chmod/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "chmod" version = "0.0.1" diff --git a/src/chroot/Cargo.toml b/src/chroot/Cargo.toml index 696124493..25c36d15f 100644 --- a/src/chroot/Cargo.toml +++ b/src/chroot/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "chroot" version = "0.0.1" diff --git a/src/cksum/Cargo.toml b/src/cksum/Cargo.toml index 726e79c25..a76fd6dc4 100644 --- a/src/cksum/Cargo.toml +++ b/src/cksum/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "cksum" version = "0.0.1" diff --git a/src/comm/Cargo.toml b/src/comm/Cargo.toml index 00d0b1197..214a0ea22 100644 --- a/src/comm/Cargo.toml +++ b/src/comm/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "comm" version = "0.0.1" diff --git a/src/cp/Cargo.toml b/src/cp/Cargo.toml index e6f027529..b443112d6 100644 --- a/src/cp/Cargo.toml +++ b/src/cp/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "cp" version = "0.0.1" diff --git a/src/cut/Cargo.toml b/src/cut/Cargo.toml index 54390a9de..dc3d30ca9 100644 --- a/src/cut/Cargo.toml +++ b/src/cut/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "cut" version = "0.0.1" diff --git a/src/dirname/Cargo.toml b/src/dirname/Cargo.toml index 205db8532..8c4e65c75 100644 --- a/src/dirname/Cargo.toml +++ b/src/dirname/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "dirname" version = "0.0.1" diff --git a/src/du/Cargo.toml b/src/du/Cargo.toml index 201c33b40..dd6851c34 100644 --- a/src/du/Cargo.toml +++ b/src/du/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "du" version = "0.0.1" diff --git a/src/echo/Cargo.toml b/src/echo/Cargo.toml index 7609072bb..1e56ce491 100644 --- a/src/echo/Cargo.toml +++ b/src/echo/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "echo" version = "0.0.1" diff --git a/src/env/Cargo.toml b/src/env/Cargo.toml index efcdba81d..69d049a76 100644 --- a/src/env/Cargo.toml +++ b/src/env/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "env" version = "0.0.1" diff --git a/src/expand/Cargo.toml b/src/expand/Cargo.toml index 304f595ba..75176539a 100644 --- a/src/expand/Cargo.toml +++ b/src/expand/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "expand" version = "0.0.1" diff --git a/src/factor/Cargo.toml b/src/factor/Cargo.toml index 702471b9d..ab32fae68 100644 --- a/src/factor/Cargo.toml +++ b/src/factor/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "factor" version = "0.0.1" diff --git a/src/false/Cargo.toml b/src/false/Cargo.toml index 6134c67d8..e101245ec 100644 --- a/src/false/Cargo.toml +++ b/src/false/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "false" version = "0.0.1" diff --git a/src/fmt/Cargo.toml b/src/fmt/Cargo.toml index ecbdbf576..3c3f3fa93 100644 --- a/src/fmt/Cargo.toml +++ b/src/fmt/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "fmt" version = "0.0.1" diff --git a/src/fold/Cargo.toml b/src/fold/Cargo.toml index b31109f33..54bb67150 100644 --- a/src/fold/Cargo.toml +++ b/src/fold/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "fold" version = "0.0.1" diff --git a/src/groups/Cargo.toml b/src/groups/Cargo.toml index 9f3f15e2c..ad8f0c86d 100644 --- a/src/groups/Cargo.toml +++ b/src/groups/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "groups" version = "0.0.1" diff --git a/src/hashsum/Cargo.toml b/src/hashsum/Cargo.toml index ecc256292..78111a679 100644 --- a/src/hashsum/Cargo.toml +++ b/src/hashsum/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "hashsum" version = "0.0.1" diff --git a/src/head/Cargo.toml b/src/head/Cargo.toml index e9e161a83..42341acc1 100644 --- a/src/head/Cargo.toml +++ b/src/head/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "head" version = "0.0.1" diff --git a/src/hostid/Cargo.toml b/src/hostid/Cargo.toml index 60e235fcb..146c0879e 100644 --- a/src/hostid/Cargo.toml +++ b/src/hostid/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "hostid" version = "0.0.1" diff --git a/src/hostid/hostid.rs b/src/hostid/hostid.rs index 132596115..9cca3d7c5 100644 --- a/src/hostid/hostid.rs +++ b/src/hostid/hostid.rs @@ -84,7 +84,7 @@ fn hostid() { unsafe { result = gethostid(); } - + result &= 0xffffffff; println!("{:0>8x}", result); } diff --git a/src/hostname/Cargo.toml b/src/hostname/Cargo.toml index 9a9ceb676..2d2db8ee1 100644 --- a/src/hostname/Cargo.toml +++ b/src/hostname/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "hostname" version = "0.0.1" diff --git a/src/id/Cargo.toml b/src/id/Cargo.toml index df2e51d25..39035c77a 100644 --- a/src/id/Cargo.toml +++ b/src/id/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "id" version = "0.0.1" diff --git a/src/kill/Cargo.toml b/src/kill/Cargo.toml index 0f10ff38d..7f36a1bd6 100644 --- a/src/kill/Cargo.toml +++ b/src/kill/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "kill" version = "0.0.1" diff --git a/src/link/Cargo.toml b/src/link/Cargo.toml index 6dfaf84b3..84044b784 100644 --- a/src/link/Cargo.toml +++ b/src/link/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "link" version = "0.0.1" diff --git a/src/link/link.rs b/src/link/link.rs index bde75f786..a762550b7 100644 --- a/src/link/link.rs +++ b/src/link/link.rs @@ -43,7 +43,7 @@ pub fn uumain(args: Vec) -> i32 { Usage: {0} [OPTIONS] FILE1 FILE2 - + Create a link named FILE2 to FILE1.", NAME, VERSION); println!("{}", opts.usage(&msg)); diff --git a/src/ln/Cargo.toml b/src/ln/Cargo.toml index d6a331c2c..8ec3cb1d7 100644 --- a/src/ln/Cargo.toml +++ b/src/ln/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "ln" version = "0.0.1" diff --git a/src/logname/Cargo.toml b/src/logname/Cargo.toml index 043cf2e47..b207e91bf 100644 --- a/src/logname/Cargo.toml +++ b/src/logname/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "logname" version = "0.0.1" diff --git a/src/mkdir/Cargo.toml b/src/mkdir/Cargo.toml index 4055ac343..11f916bb0 100644 --- a/src/mkdir/Cargo.toml +++ b/src/mkdir/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "mkdir" version = "0.0.1" diff --git a/src/mkfifo/Cargo.toml b/src/mkfifo/Cargo.toml index 44fea1c41..a8b347e2c 100644 --- a/src/mkfifo/Cargo.toml +++ b/src/mkfifo/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "mkfifo" version = "0.0.1" diff --git a/src/mv/Cargo.toml b/src/mv/Cargo.toml index 05371ac24..a9e89f11d 100644 --- a/src/mv/Cargo.toml +++ b/src/mv/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "mv" version = "0.0.1" diff --git a/src/nice/Cargo.toml b/src/nice/Cargo.toml index 01c4d0e9e..812e0f61b 100644 --- a/src/nice/Cargo.toml +++ b/src/nice/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "nice" version = "0.0.1" diff --git a/src/nl/Cargo.toml b/src/nl/Cargo.toml index ecb326f51..3ca33339e 100644 --- a/src/nl/Cargo.toml +++ b/src/nl/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "nl" version = "0.0.1" diff --git a/src/nl/nl.rs b/src/nl/nl.rs index 5a1eba46c..b6048d32d 100644 --- a/src/nl/nl.rs +++ b/src/nl/nl.rs @@ -209,7 +209,7 @@ fn nl (reader: &mut BufReader, settings: &Settings) { } odd = !odd; } - + // See how many groups we matched. That will tell us if this is // a line starting a new segment, and the number of groups // indicates what type of segment. @@ -301,7 +301,7 @@ fn nl (reader: &mut BufReader, settings: &Settings) { line_no_threshold *= 10; line_no_width += 1; } - + } } diff --git a/src/nohup/Cargo.toml b/src/nohup/Cargo.toml index 0e0af6a5a..e4d916481 100644 --- a/src/nohup/Cargo.toml +++ b/src/nohup/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "nohup" version = "0.0.1" diff --git a/src/nproc/Cargo.toml b/src/nproc/Cargo.toml index 271336b23..289086eb5 100644 --- a/src/nproc/Cargo.toml +++ b/src/nproc/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "nproc" version = "0.0.1" diff --git a/src/od/Cargo.toml b/src/od/Cargo.toml index 8826dc387..e6e1d7183 100644 --- a/src/od/Cargo.toml +++ b/src/od/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "od" version = "0.0.1" diff --git a/src/paste/Cargo.toml b/src/paste/Cargo.toml index 8b0ddaf15..9800ef127 100644 --- a/src/paste/Cargo.toml +++ b/src/paste/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "paste" version = "0.0.1" diff --git a/src/printenv/Cargo.toml b/src/printenv/Cargo.toml index 9151feabc..166816d5c 100644 --- a/src/printenv/Cargo.toml +++ b/src/printenv/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "printenv" version = "0.0.1" diff --git a/src/ptx/Cargo.toml b/src/ptx/Cargo.toml index aec8388e9..65f0cc7b7 100644 --- a/src/ptx/Cargo.toml +++ b/src/ptx/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "ptx" version = "0.0.1" diff --git a/src/pwd/Cargo.toml b/src/pwd/Cargo.toml index 4320fa55e..9b4c9afbd 100644 --- a/src/pwd/Cargo.toml +++ b/src/pwd/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "pwd" version = "0.0.1" diff --git a/src/readlink/Cargo.toml b/src/readlink/Cargo.toml index 074f3113d..42e5db253 100644 --- a/src/readlink/Cargo.toml +++ b/src/readlink/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "readlink" version = "0.0.1" diff --git a/src/realpath/Cargo.toml b/src/realpath/Cargo.toml index a8dc5595b..b481bf0a0 100644 --- a/src/realpath/Cargo.toml +++ b/src/realpath/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "realpath" version = "0.0.1" diff --git a/src/relpath/Cargo.toml b/src/relpath/Cargo.toml index f29a72c83..c45a18deb 100644 --- a/src/relpath/Cargo.toml +++ b/src/relpath/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "relpath" version = "0.0.1" diff --git a/src/rm/Cargo.toml b/src/rm/Cargo.toml index 24570662f..953e7caf0 100644 --- a/src/rm/Cargo.toml +++ b/src/rm/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "rm" version = "0.0.1" diff --git a/src/rmdir/Cargo.toml b/src/rmdir/Cargo.toml index 22b598018..ec6dc3639 100644 --- a/src/rmdir/Cargo.toml +++ b/src/rmdir/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "rmdir" version = "0.0.1" diff --git a/src/seq/Cargo.toml b/src/seq/Cargo.toml index 54fa1abf4..4b56530a8 100644 --- a/src/seq/Cargo.toml +++ b/src/seq/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "seq" version = "0.0.1" diff --git a/src/shuf/Cargo.toml b/src/shuf/Cargo.toml index 55535da03..81101d39f 100644 --- a/src/shuf/Cargo.toml +++ b/src/shuf/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "shuf" version = "0.0.1" diff --git a/src/sleep/Cargo.toml b/src/sleep/Cargo.toml index 6ceb4406f..6c29d728d 100644 --- a/src/sleep/Cargo.toml +++ b/src/sleep/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "sleep" version = "0.0.1" diff --git a/src/sort/Cargo.toml b/src/sort/Cargo.toml index b509a27fa..c88e0b7fb 100644 --- a/src/sort/Cargo.toml +++ b/src/sort/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "sort" version = "0.0.1" diff --git a/src/sort/sort.rs b/src/sort/sort.rs index 19595f378..03b830593 100644 --- a/src/sort/sort.rs +++ b/src/sort/sort.rs @@ -74,9 +74,9 @@ With no FILE, or when FILE is -, read standard input.", NAME, VERSION); /* if no file, default to stdin */ files.push("-".to_string()); } - + exec(files, numeric, human_readable, reverse); - + 0 } @@ -86,7 +86,7 @@ fn exec(files: Vec, numeric: bool, human_readable: bool, reverse: bool) Some(x) => x, None => continue, }; - + let buf_reader = BufReader::new(reader); let mut lines = Vec::new(); diff --git a/src/split/Cargo.toml b/src/split/Cargo.toml index 70b004516..3c0d0de3b 100644 --- a/src/split/Cargo.toml +++ b/src/split/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "split" version = "0.0.1" diff --git a/src/sum/Cargo.toml b/src/sum/Cargo.toml index 4c3910c9a..7655fd221 100644 --- a/src/sum/Cargo.toml +++ b/src/sum/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "sum" version = "0.0.1" diff --git a/src/sync/Cargo.toml b/src/sync/Cargo.toml index 3edfa9f63..2c17e5550 100644 --- a/src/sync/Cargo.toml +++ b/src/sync/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "sync" version = "0.0.1" diff --git a/src/tac/Cargo.toml b/src/tac/Cargo.toml index e79d00116..2a4dd498f 100644 --- a/src/tac/Cargo.toml +++ b/src/tac/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "tac" version = "0.0.1" diff --git a/src/tail/Cargo.toml b/src/tail/Cargo.toml index 65705be01..beac774b1 100644 --- a/src/tail/Cargo.toml +++ b/src/tail/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "tail" version = "0.0.1" diff --git a/src/tee/Cargo.toml b/src/tee/Cargo.toml index 2be762a3f..d91409f52 100644 --- a/src/tee/Cargo.toml +++ b/src/tee/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "tee" version = "0.0.1" diff --git a/src/test/Cargo.toml b/src/test/Cargo.toml index 006086879..38acc688a 100644 --- a/src/test/Cargo.toml +++ b/src/test/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "test" version = "0.0.1" diff --git a/src/timeout/Cargo.toml b/src/timeout/Cargo.toml index 16b29bb3a..18d3c3ba2 100644 --- a/src/timeout/Cargo.toml +++ b/src/timeout/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "timeout" version = "0.0.1" diff --git a/src/touch/Cargo.toml b/src/touch/Cargo.toml index 797961f5c..4c2c7c509 100644 --- a/src/touch/Cargo.toml +++ b/src/touch/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "touch" version = "0.0.1" diff --git a/src/tr/Cargo.toml b/src/tr/Cargo.toml index 9f60d0381..0c47ab424 100644 --- a/src/tr/Cargo.toml +++ b/src/tr/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "tr" version = "0.0.1" diff --git a/src/true/Cargo.toml b/src/true/Cargo.toml index 27401a3e9..d5b7fe5cc 100644 --- a/src/true/Cargo.toml +++ b/src/true/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "true" version = "0.0.1" diff --git a/src/truncate/Cargo.toml b/src/truncate/Cargo.toml index 4773c2512..2795af9fb 100644 --- a/src/truncate/Cargo.toml +++ b/src/truncate/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "truncate" version = "0.0.1" diff --git a/src/tsort/Cargo.toml b/src/tsort/Cargo.toml index 2fabb28ae..877cf9707 100644 --- a/src/tsort/Cargo.toml +++ b/src/tsort/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "tsort" version = "0.0.1" diff --git a/src/tty/Cargo.toml b/src/tty/Cargo.toml index 5272bc490..40e4f8a82 100644 --- a/src/tty/Cargo.toml +++ b/src/tty/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "tty" version = "0.0.1" diff --git a/src/uname/Cargo.toml b/src/uname/Cargo.toml index 43e05de1d..4f10bc75a 100644 --- a/src/uname/Cargo.toml +++ b/src/uname/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "uname" version = "0.0.1" diff --git a/src/unexpand/Cargo.toml b/src/unexpand/Cargo.toml index 6141e3ab4..4e631f138 100644 --- a/src/unexpand/Cargo.toml +++ b/src/unexpand/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "unexpand" version = "0.0.1" diff --git a/src/uniq/Cargo.toml b/src/uniq/Cargo.toml index beacfa4bd..81245beb1 100644 --- a/src/uniq/Cargo.toml +++ b/src/uniq/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "uniq" version = "0.0.1" diff --git a/src/unlink/Cargo.toml b/src/unlink/Cargo.toml index af07fe4bd..11c4a5a33 100644 --- a/src/unlink/Cargo.toml +++ b/src/unlink/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "unlink" version = "0.0.1" diff --git a/src/uptime/Cargo.toml b/src/uptime/Cargo.toml index e6a24a1da..9572f295f 100644 --- a/src/uptime/Cargo.toml +++ b/src/uptime/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "uptime" version = "0.0.1" diff --git a/src/users/Cargo.toml b/src/users/Cargo.toml index 02d35ebfd..ce7cea1f5 100644 --- a/src/users/Cargo.toml +++ b/src/users/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "users" version = "0.0.1" diff --git a/src/wc/Cargo.toml b/src/wc/Cargo.toml index d3db82de2..cb46772b6 100644 --- a/src/wc/Cargo.toml +++ b/src/wc/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "wc" version = "0.0.1" diff --git a/src/whoami/Cargo.toml b/src/whoami/Cargo.toml index 56a6e464a..91ee10c24 100644 --- a/src/whoami/Cargo.toml +++ b/src/whoami/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "whoami" version = "0.0.1" diff --git a/src/yes/Cargo.toml b/src/yes/Cargo.toml index 40b1312cc..e5280f83e 100644 --- a/src/yes/Cargo.toml +++ b/src/yes/Cargo.toml @@ -1,4 +1,3 @@ - [package] name = "yes" version = "0.0.1"