From 4738d4efcd0887de4a55365aed38d534207a2d64 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Fri, 20 Jun 2014 01:00:13 +0200
Subject: [PATCH 1/2] sync: rename crate to uusync due to name clash with rusts
 libsync

---
 sync/sync.rs     | 2 +-
 uutils/uutils.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sync/sync.rs b/sync/sync.rs
index 53f91dc63..6b71538a9 100644
--- a/sync/sync.rs
+++ b/sync/sync.rs
@@ -1,4 +1,4 @@
-#![crate_id(name="sync", vers="1.0.0", author="Alexander Fomin")]
+#![crate_id = "uusync#1.0.0"]
 /*
  * This file is part of the uutils coreutils package.
  *
diff --git a/uutils/uutils.rs b/uutils/uutils.rs
index b94aae27d..903ba2866 100644
--- a/uutils/uutils.rs
+++ b/uutils/uutils.rs
@@ -42,7 +42,7 @@ extern crate rmdir;
 extern crate seq;
 extern crate sleep;
 extern crate sum;
-extern crate sync;
+extern crate uusync;
 extern crate tac;
 extern crate tail;
 extern crate tee;
@@ -101,7 +101,7 @@ fn util_map() -> HashMap<&str, fn(Vec<String>) -> int> {
     map.insert("seq", seq::uumain);
     map.insert("sleep", sleep::uumain);
     map.insert("sum", sum::uumain);
-    map.insert("sync", sync::uumain);
+    map.insert("sync", uusync::uumain);
     map.insert("tac", tac::uumain);
     map.insert("tail", tail::uumain);
     map.insert("tee", tee::uumain);

From f6a6305690fc3c4d05d7b8d7492ca2ec49fff7ca Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Fri, 20 Jun 2014 01:03:04 +0200
Subject: [PATCH 2/2] fmt: make uumain public

---
 fmt/fmt.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fmt/fmt.rs b/fmt/fmt.rs
index 206b89f26..b8e308101 100644
--- a/fmt/fmt.rs
+++ b/fmt/fmt.rs
@@ -59,7 +59,7 @@ struct FmtOptions {
 #[allow(dead_code)]
 fn main() { os::set_exit_status(uumain(os::args())) }
 
-fn uumain(args: Vec<String>) -> int {
+pub fn uumain(args: Vec<String>) -> int {
 
     let opts = [
         getopts::optflag("c", "crown-margin", "First and second line of paragraph may have different indentations, in which case the first line's indentation is preserved, and each subsequent line's indentation matches the second line."),