Revision: 633 http://trac.macosforge.org/projects/darwinbuild/changeset/633 Author: wsiegrist@apple.com Date: 2009-11-11 09:48:28 -0800 (Wed, 11 Nov 2009) Log Message: ----------- Add a -h option that prints usage. Require darwinup be run as root since many things darwinup does requires root anyway. Create backing store with mode 0750. Split out Depot constructions and initialization so failure is easier to detect and handle. Modified Paths: -------------- branches/PR-6634286/darwinup/Depot.cpp branches/PR-6634286/darwinup/Depot.h branches/PR-6634286/darwinup/main.cpp Modified: branches/PR-6634286/darwinup/Depot.cpp =================================================================== --- branches/PR-6634286/darwinup/Depot.cpp 2009-11-10 21:20:18 UTC (rev 632) +++ branches/PR-6634286/darwinup/Depot.cpp 2009-11-11 17:48:28 UTC (rev 633) @@ -42,62 +42,85 @@ #include <sqlite3.h> Depot::Depot() { - m_prefix = NULL; + m_prefix = NULL; m_depot_path = NULL; m_database_path = NULL; m_archives_path = NULL; m_db = NULL; m_lock_fd = -1; m_is_locked = 0; + m_depot_mode = 0750; } Depot::Depot(const char* prefix) { m_lock_fd = -1; m_is_locked = 0; + m_depot_mode = 0750; + asprintf(&m_prefix, "%s", prefix); join_path(&m_depot_path, m_prefix, "/.DarwinDepot"); join_path(&m_database_path, m_depot_path, "/Database-V100"); join_path(&m_archives_path, m_depot_path, "/Archives"); +} - mkdir(m_depot_path, m_depot_mode); - mkdir(m_archives_path, m_depot_mode); +Depot::~Depot() { + if (m_lock_fd != -1) this->unlock(); + if (m_db) sqlite3_close(m_db); + if (m_prefix) free(m_prefix); + if (m_depot_path) free(m_depot_path); + if (m_database_path) free(m_database_path); + if (m_archives_path) free(m_archives_path); +} +const char* Depot::archives_path() { return m_archives_path; } +const char* Depot::prefix() { return m_prefix; } + +// Initialize the depot storage on disk +int Depot::initialize() { int res = 0; - + + // initialization requires all these paths to be set + if (!(m_prefix && m_depot_path && m_database_path && m_archives_path)) { + return -1; + } + + res = mkdir(m_depot_path, m_depot_mode); + if (res && errno != EEXIST) { + perror(m_depot_path); + return res; + } + res = mkdir(m_archives_path, m_depot_mode); + if (res && errno != EEXIST) { + perror(m_archives_path); + return res; + } + res = this->lock(LOCK_SH); - if (res == 0) { - m_is_locked = 1; - } - + if (res) return res; + m_is_locked = 1; + int exists = is_regular_file(m_database_path); - + res = sqlite3_open(m_database_path, &m_db); - if (res != 0) { + if (res) { sqlite3_close(m_db); m_db = NULL; } - + if (m_db && !exists) { this->SQL("CREATE TABLE archives (serial INTEGER PRIMARY KEY AUTOINCREMENT, uuid BLOB UNIQUE, name TEXT, date_added INTEGER, active INTEGER, info INTEGER)"); this->SQL("CREATE TABLE files (serial INTEGER PRIMARY KEY AUTOINCREMENT, archive INTEGER, info INTEGER, mode INTEGER, uid INTEGER, gid INTEGER, size INTEGER, digest BLOB, path TEXT)"); - this->SQL("CREATE INDEX archives_uuid ON archives (uuid)"); this->SQL("CREATE INDEX files_path ON files (path)"); } + + return res; } -Depot::~Depot() { - if (m_lock_fd != -1) this->unlock(); - if (m_db) sqlite3_close(m_db); - if (m_prefix) free(m_prefix); - if (m_depot_path) free(m_depot_path); - if (m_database_path) free(m_database_path); - if (m_archives_path) free(m_archives_path); +int Depot::is_initialized() { + return (m_db != NULL); } -const char* Depot::archives_path() { return m_archives_path; } -const char* Depot::prefix() { return m_prefix; } - // Unserialize an archive from the database. // Find the archive by UUID. // XXX: should be memoized @@ -1022,9 +1045,10 @@ m_lock_fd = open(m_depot_path, O_RDONLY); if (m_lock_fd == -1) { perror(m_depot_path); - res = -1; + res = m_lock_fd; } } + if (res) return res; res = flock(m_lock_fd, operation); if (res == -1) { perror(m_depot_path); Modified: branches/PR-6634286/darwinup/Depot.h =================================================================== --- branches/PR-6634286/darwinup/Depot.h 2009-11-10 21:20:18 UTC (rev 632) +++ branches/PR-6634286/darwinup/Depot.h 2009-11-11 17:48:28 UTC (rev 633) @@ -37,6 +37,9 @@ virtual ~Depot(); + int initialize(); + int is_initialized(); + const char* prefix(); const char* database_path(); const char* archives_path(); Modified: branches/PR-6634286/darwinup/main.cpp =================================================================== --- branches/PR-6634286/darwinup/main.cpp 2009-11-10 21:20:18 UTC (rev 632) +++ branches/PR-6634286/darwinup/main.cpp 2009-11-11 17:48:28 UTC (rev 633) @@ -57,7 +57,7 @@ char* path = NULL; int ch; - while ((ch = getopt(argc, argv, "p:v")) != -1) { + while ((ch = getopt(argc, argv, "p:vh")) != -1) { switch (ch) { case 'v': verbosity <<= 1; @@ -71,6 +71,7 @@ join_path(&path, optarg, "/"); break; case '?': + case 'h': default: usage(progname); } @@ -78,20 +79,26 @@ argc -= optind; argv += optind; + // you must be root + uid_t uid = getuid(); + if (uid) { + fprintf(stderr, "You must be root to run this tool.\n"); + exit(3); + } + int res = 0; if (!path) { asprintf(&path, "/"); } + Depot* depot = new Depot(path); - if (!depot->is_locked()) { - fprintf(stderr, - "Error: unable to access and lock %s. " \ - "The directory must exist and be writable.\n", depot->prefix()); + res = depot->initialize(); + if (res) { + fprintf(stderr, "Error: unable to initialize storage.\n"); exit(2); } - - + if (argc == 2 && strcmp(argv[0], "install") == 0) { char uuid[37]; Archive* archive = ArchiveFactory(argv[1]);