X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvutil.h;h=276858fd4a33eb36153e5fd7998b9f0cdf1da7d1;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=d334df3475eae6cef71e3b948bc93c27624a2420;hpb=da691fd4bad5e187b307b7fd86bf5fd61e47c3fc;p=util-vserver.git diff --git a/util-vserver/src/vutil.h b/util-vserver/src/vutil.h index d334df3..276858f 100644 --- a/util-vserver/src/vutil.h +++ b/util-vserver/src/vutil.h @@ -21,6 +21,8 @@ #ifndef VUTIL_H #define VUTIL_H +#include "vserver.hh" + #include #include #include @@ -42,28 +44,28 @@ extern bool testmode; #endif -FILE *vutil_execdistcmd (const char *, const string &, const char *); +FILE *vutil_execdistcmd (const char *, Vserver const &, const char *); extern const char K_DUMPFILES[]; extern const char K_UNIFILES[]; extern const char K_PKGVERSION[]; -class PACKAGE{ +class Package{ public: string name; string version; // version + release - PACKAGE(string &_name, string &_version) + Package(string &_name, string &_version) : name (_name), version(_version) { } - PACKAGE(const char *_name, const char *_version) + Package(const char *_name, const char *_version) : name (_name), version(_version) { } - PACKAGE(const string &line) + Package(const string &line) { *this = line; } - PACKAGE & operator = (const string &_line) + Package & operator = (const string &_line) { string line (_line); string::iterator pos = find (line.begin(),line.end(),'='); @@ -73,16 +75,16 @@ public: } return *this; } - PACKAGE (const PACKAGE &pkg) + Package (const Package &pkg) { name = pkg.name; version = pkg.version; } - bool operator == (const PACKAGE &v) const + bool operator == (const Package &v) const { return name == v.name && version == v.version; } - bool operator < (const PACKAGE &v) const + bool operator < (const Package &v) const { bool ret = false; if (name < v.name){ @@ -93,7 +95,7 @@ public: return ret; } // Load the file member of the package, but exclude configuration file - void loadfiles(const string &ref, set &files) + void loadfiles(Vserver const &ref, set &files) { if (debug > 2) cout << "Loading files for package " << name << endl; string namever = name + '-' + version; @@ -118,10 +120,10 @@ public: // Check if two package have the same name (but potentially different version) class same_name{ - const PACKAGE &pkg; + const Package &pkg; public: - same_name(const PACKAGE &_pkg) : pkg(_pkg) {} - bool operator()(const PACKAGE &p) + same_name(const Package &_pkg) : pkg(_pkg) {} + bool operator()(const Package &p) { return pkg.name == p.name; }