From 94884475947ca8c44dda51d83f3c1fbfeff5ccc0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 7 Feb 2014 14:07:31 -0500
Subject: nix-store --serve: Don't loop forever

nix-store --export takes a tmproot, which can only release by exiting.
Substituters don't currently work in a way that could take advantage of
the looping, anyway.

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 src/libstore/store-api.cc | 51 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'src/libstore')

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 1a13e7ca32eb..d4d53e9daf16 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -260,32 +260,31 @@ string StoreAPI::makeValidityRegistration(const PathSet & paths,
 
 void StoreAPI::serve(Source & in, Sink & out, bool sign)
 {
-    for (string cmd = readString(in); !cmd.empty(); cmd = readString(in)) {
-        if (cmd == "query") {
-            for (cmd = readString(in); !cmd.empty(); cmd = readString(in)) {
-                PathSet paths = readStrings<PathSet>(in);
-                if (cmd == "have") {
-                    writeStrings(queryValidPaths(paths), out);
-                } else if (cmd == "info") {
-                    // !!! Maybe we want a queryPathInfos?
-                    foreach (PathSet::iterator, i, paths) {
-                        ValidPathInfo info = queryPathInfo(*i);
-                        writeString(info.path, out);
-                        writeString(info.deriver, out);
-                        writeStrings(info.references, out);
-                        // !!! Maybe we want compression?
-                        writeLongLong(info.narSize, out); // downloadSize
-                        writeLongLong(info.narSize, out);
-                    }
-                    writeString("", out);
-                } else
-                    throw Error(format("Unknown serve query `%1%'") % cmd);
-            }
-        } else if (cmd == "substitute")
-            exportPath(readString(in), sign, out);
-        else
-            throw Error(format("Unknown serve command `%1%'") % cmd);
-    }
+    string cmd = readString(in);
+    if (cmd == "query") {
+        for (cmd = readString(in); !cmd.empty(); cmd = readString(in)) {
+            PathSet paths = readStrings<PathSet>(in);
+            if (cmd == "have") {
+                writeStrings(queryValidPaths(paths), out);
+            } else if (cmd == "info") {
+                // !!! Maybe we want a queryPathInfos?
+                foreach (PathSet::iterator, i, paths) {
+                    ValidPathInfo info = queryPathInfo(*i);
+                    writeString(info.path, out);
+                    writeString(info.deriver, out);
+                    writeStrings(info.references, out);
+                    // !!! Maybe we want compression?
+                    writeLongLong(info.narSize, out); // downloadSize
+                    writeLongLong(info.narSize, out);
+                }
+                writeString("", out);
+            } else
+                throw Error(format("Unknown serve query `%1%'") % cmd);
+        }
+    } else if (cmd == "substitute")
+        exportPath(readString(in), sign, out);
+    else
+        throw Error(format("Unknown serve command `%1%'") % cmd);
 }
 
 
-- 
cgit 1.4.1