#
#
# patch "cmd.hh"
#  from [ba16e077901c1aafb55d306f3173bfaf95c0ffa9]
#    to [71f33193fdfa54bdc1f9b89ed8b290c8e6eff9cf]
# 
# patch "cmd_files.cc"
#  from [0dfcce69efa1db3806309191c49c427428ca5eeb]
#    to [4011824d9e255a6045bfcabe318bf5e1face7053]
# 
# patch "cmd_key_cert.cc"
#  from [61d7c1ea826e6be73b4ca78aa619ebfd330f9dff]
#    to [63c424ed1af113eb67be7295462111011a648f9d]
# 
# patch "commands.cc"
#  from [6a8a053c6c687de7aeb91bb53f5beba7a7358c33]
#    to [9454002d33c19c074f9ec98d9bb9df61727e7370]
# 
# patch "file_io.cc"
#  from [f785dc0f7613d3c396174769028ad0f4ff6c1143]
#    to [7d1a38d3b91641d18ed693e95a17cebf1a16d657]
# 
# patch "file_io.hh"
#  from [0853be25c7f81131940cc798a35c28f58acefcdf]
#    to [8f941a533383f855723343c352dc6aba3f0c9542]
#
============================================================
--- cmd.hh	ba16e077901c1aafb55d306f3173bfaf95c0ffa9
+++ cmd.hh	71f33193fdfa54bdc1f9b89ed8b290c8e6eff9cf
@@ -73,9 +73,6 @@ std::string
 }
 
 std::string
-get_stdin();
-
-std::string
 describe_revision(app_state & app,
                   revision_id const & id);
 
============================================================
--- cmd_files.cc	0dfcce69efa1db3806309191c49c427428ca5eeb
+++ cmd_files.cc	4011824d9e255a6045bfcabe318bf5e1face7053
@@ -27,10 +27,11 @@ CMD(fload, N_("debug"), "", N_("load fil
 
 CMD(fload, N_("debug"), "", N_("load file contents into db"), options::opts::none)
 {
-  string s = get_stdin();
+  data dat;
+  read_data_stdin(dat);
 
   file_id f_id;
-  file_data f_data(s);
+  file_data f_data(dat);
 
   calculate_ident (f_data, f_id);
 
@@ -190,11 +191,11 @@ CMD(identify, N_("debug"), N_("[PATH]"),
 
   if (args.size() == 1)
     {
-      read_data(file_path_external(idx(args, 0)), dat);
+      read_data_for_command_line(idx(args, 0), dat);
     }
   else
     {
-      dat = data(get_stdin());
+      read_data_stdin(dat);
     }
 
   hexenc<id> ident;
============================================================
--- cmd_key_cert.cc	61d7c1ea826e6be73b4ca78aa619ebfd330f9dff
+++ cmd_key_cert.cc	63c424ed1af113eb67be7295462111011a648f9d
@@ -192,7 +192,11 @@ CMD(cert, N_("key and cert"), N_("REVISI
   if (args.size() == 3)
     val = cert_value(idx(args, 2)());
   else
-    val = cert_value(get_stdin());
+    {
+      data dat;
+      read_data_stdin(dat);
+      val = cert_value(dat());
+    }
 
   packet_db_writer dbw(app);
   app.get_project().put_cert(rid, name, val, dbw);
============================================================
--- commands.cc	6a8a053c6c687de7aeb91bb53f5beba7a7358c33
+++ commands.cc	9454002d33c19c074f9ec98d9bb9df61727e7370
@@ -344,19 +344,6 @@ string
 }
 
 string
-get_stdin()
-{
-  char buf[constants::bufsz];
-  string tmp;
-  while(cin)
-    {
-      cin.read(buf, constants::bufsz);
-      tmp.append(buf, cin.gcount());
-    }
-  return tmp;
-}
-
-string
 describe_revision(app_state & app,
                   revision_id const & id)
 {
============================================================
--- file_io.cc	f785dc0f7613d3c396174769028ad0f4ff6c1143
+++ file_io.cc	7d1a38d3b91641d18ed693e95a17cebf1a16d657
@@ -364,7 +364,7 @@ void read_directory(any_path const & pat
 
 
 // This function can only be called once per run.
-static void
+void
 read_data_stdin(data & dat)
 {
   static bool have_consumed_stdin = false;
============================================================
--- file_io.hh	0853be25c7f81131940cc798a35c28f58acefcdf
+++ file_io.hh	8f941a533383f855723343c352dc6aba3f0c9542
@@ -73,6 +73,8 @@ void read_directory(any_path const & pat
                     std::vector<utf8> & files,
                     std::vector<utf8> & dirs);
 
+void read_data_stdin(data & dat);
+
 // This function knows that "-" means "stdin".
 void read_data_for_command_line(utf8 const & path, data & dat);