about summary refs log tree commit diff
path: root/src/util.hh
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-05-26T13·45+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-05-26T13·45+0000
commit8b930a0c94ba9013d015c735cfc38c40b151f491 (patch)
tree8282adb5a10d18b696ba9c5f81230fc5b5831c94 /src/util.hh
parentf8d91f20e6c88510282263715a1b87c99afad5a1 (diff)
* Some refactoring.
Diffstat (limited to 'src/util.hh')
-rw-r--r--src/util.hh100
1 files changed, 9 insertions, 91 deletions
diff --git a/src/util.hh b/src/util.hh
index 9b3f212de359..2c09efc4d88f 100644
--- a/src/util.hh
+++ b/src/util.hh
@@ -39,104 +39,22 @@ public:
 typedef vector<string> Strings;
 
 
-/* !!! the following shouldn't be here; abuse of the preprocessor */
-
-
 /* The canonical system name, as returned by config.guess. */ 
-static string thisSystem = SYSTEM;
+extern string thisSystem;
 
 
 /* The prefix of the Nix installation, and the environment variable
    that can be used to override the default. */
-static string nixHomeDir = "/nix";
-static string nixHomeDirEnvVar = "NIX";
-
-
-string absPath(string filename, string dir = "")
-{
-    if (filename[0] != '/') {
-        if (dir == "") {
-            char buf[PATH_MAX];
-            if (!getcwd(buf, sizeof(buf)))
-                throw Error("cannot get cwd");
-            dir = buf;
-        }
-        filename = dir + "/" + filename;
-        /* !!! canonicalise */
-        char resolved[PATH_MAX];
-        if (!realpath(filename.c_str(), resolved))
-            throw Error("cannot canonicalise path " + filename);
-        filename = resolved;
-    }
-    return filename;
-}
-
-
-string printHash(unsigned char * buf)
-{
-    ostringstream str;
-    for (int i = 0; i < 16; i++) {
-        str.fill('0');
-        str.width(2);
-        str << hex << (int) buf[i];
-    }
-    return str.str();
-}
-
-    
-/* Verify that a reference is valid (that is, is a MD5 hash code). */
-bool isHash(const string & s)
-{
-    if (s.length() != 32) return false;
-    for (int i = 0; i < 32; i++) {
-        char c = s[i];
-        if (!((c >= '0' && c <= '9') ||
-              (c >= 'a' && c <= 'f')))
-            return false;
-    }
-    return true;
-}
-
-
-void checkHash(const string & s)
-{
-    if (!isHash(s)) throw BadRefError("invalid reference: " + s);
-}
-
-
-/* Compute the MD5 hash of a file. */
-string hashFile(string filename)
-{
-    unsigned char hash[16];
-    FILE * file = fopen(filename.c_str(), "rb");
-    if (!file)
-        throw BadRefError("file `" + filename + "' does not exist");
-    int err = md5_stream(file, hash);
-    fclose(file);
-    if (err) throw BadRefError("cannot hash file");
-    return printHash(hash);
-}
+extern string nixHomeDir;
+extern string nixHomeDirEnvVar;
 
 
-
-/* Return the directory part of the given path, i.e., everything
-   before the final `/'. */
-string dirOf(string s)
-{
-    unsigned int pos = s.rfind('/');
-    if (pos == string::npos) throw Error("invalid file name");
-    return string(s, 0, pos);
-}
-
-
-/* Return the base name of the given path, i.e., everything following
-   the final `/'. */
-string baseNameOf(string s)
-{
-    unsigned int pos = s.rfind('/');
-    if (pos == string::npos) throw Error("invalid file name");
-    return string(s, pos + 1);
-}
+string absPath(string filename, string dir = "");
+bool isHash(const string & s);
+void checkHash(const string & s);
+string hashFile(string filename);
+string dirOf(string s);
+string baseNameOf(string s);
 
 
 #endif /* !__UTIL_H */