March 2009 - darwinbuild-changes - lists.macosforge.org

[483] branches/PR-6688645/darwinup/Depot.cpp
by source_changes＠macosforge.org 18 Mar '09

18 Mar '09

Revision: 483 http://trac.macosforge.org/projects/darwinbuild/changeset/483 Author: wsiegrist(a)apple.com Date: 2009-03-18 14:34:32 -0700 (Wed, 18 Mar 2009) Log Message: ----------- Replace overly paranoid lock checking with simple result testing Modified Paths: -------------- branches/PR-6688645/darwinup/Depot.cpp Modified: branches/PR-6688645/darwinup/Depot.cpp =================================================================== --- branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 21:25:33 UTC (rev 482) +++ branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 21:34:32 UTC (rev 483) @@ -62,10 +62,16 @@ mkdir(m_depot_path, m_depot_mode); mkdir(m_archives_path, m_depot_mode); - (void)this->lock(LOCK_SH); + int res = 0; + + res = this->lock(LOCK_SH); + if (res == 0) { + m_is_locked = 1; + } + int exists = is_regular_file(m_database_path); - int res = sqlite3_open(m_database_path, &m_db); + res = sqlite3_open(m_database_path, &m_db); if (res != 0) { sqlite3_close(m_db); m_db = NULL; @@ -982,9 +988,6 @@ int Depot::lock(int operation) { int res = 0; - if (m_is_locked) { - fprintf(stderr, "Warning: attempt to over lock the depot\n"); - } if (m_lock_fd == -1) { m_lock_fd = open(m_depot_path, O_RDONLY); if (m_lock_fd == -1) { @@ -995,22 +998,15 @@ res = flock(m_lock_fd, operation); if (res == -1) { perror(m_depot_path); - } else { - m_is_locked = 1; } return res; } int Depot::unlock(void) { int res = 0; - if (!m_is_locked) { - fprintf(stderr, "Warning: attempt to over unlock the depot\n"); - } res = flock(m_lock_fd, LOCK_UN); if (res == -1) { perror(m_depot_path); - } else { - m_is_locked = 0; } close(m_lock_fd); m_lock_fd = -1;

1 0

[482] branches/PR-6688645/darwinup/main.cpp
by source_changes＠macosforge.org 18 Mar '09

18 Mar '09

Revision: 482 http://trac.macosforge.org/projects/darwinbuild/changeset/482 Author: wsiegrist(a)apple.com Date: 2009-03-18 14:25:33 -0700 (Wed, 18 Mar 2009) Log Message: ----------- Rename partition to path to be more clear. Do not make an unnecessary copy of the arg since Depot copies it later. Modified Paths: -------------- branches/PR-6688645/darwinup/main.cpp Modified: branches/PR-6688645/darwinup/main.cpp =================================================================== --- branches/PR-6688645/darwinup/main.cpp 2009-03-18 20:32:05 UTC (rev 481) +++ branches/PR-6688645/darwinup/main.cpp 2009-03-18 21:25:33 UTC (rev 482) @@ -33,18 +33,18 @@ #include <limits.h> void usage(char* progname) { - fprintf(stderr, "usage: %s [-v] [-p DIR] [command] [args] \n", progname); - fprintf(stderr, " \n"); - fprintf(stderr, "options: \n"); - fprintf(stderr, " -p DIR install roots under DIR (default: /) \n"); - fprintf(stderr, " -v verbose (use -vv for extra verbosity) \n"); - fprintf(stderr, " \n"); - fprintf(stderr, "commands: \n"); - fprintf(stderr, " install <path> \n"); - fprintf(stderr, " list \n"); - fprintf(stderr, " files <uuid> \n"); - fprintf(stderr, " uninstall <uuid> \n"); - fprintf(stderr, " verify <uuid> \n"); + fprintf(stderr, "usage: %s [-v] [-p DIR] [command] [args] \n", progname); + fprintf(stderr, " \n"); + fprintf(stderr, "options: \n"); + fprintf(stderr, " -p DIR operate on roots under DIR (default: /) \n"); + fprintf(stderr, " -v verbose (use -vv for extra verbosity) \n"); + fprintf(stderr, " \n"); + fprintf(stderr, "commands: \n"); + fprintf(stderr, " install <path> \n"); + fprintf(stderr, " list \n"); + fprintf(stderr, " files <uuid> \n"); + fprintf(stderr, " uninstall <uuid> \n"); + fprintf(stderr, " verify <uuid> \n"); exit(1); } @@ -52,11 +52,8 @@ uint32_t verbosity; int main(int argc, char* argv[]) { - char* progname = strdup(basename(argv[0])); - - // the partition we are working on - char partition[PATH_MAX] = "/"; - + char* progname = strdup(basename(argv[0])); + char* path; int ch; while ((ch = getopt(argc, argv, "p:v")) != -1) { switch (ch) { @@ -65,9 +62,11 @@ verbosity |= VERBOSE; break; case 'p': - int optlen = strlen(optarg); - int limitlen = (optlen < PATH_MAX ? optlen : PATH_MAX); - strncpy(partition, optarg, limitlen); + if (strlen(optarg) > (PATH_MAX - 1)) { + fprintf(stderr, "Error: -p option value is too long \n"); + exit(3); + } + path = optarg; break; case '?': default: @@ -78,7 +77,7 @@ argv += optind; int res = 0; - Depot* depot = new Depot(partition); + Depot* depot = new Depot(path); if (!depot->is_locked()) { fprintf(stderr, "Error: unable to access and lock %s. " \

1 0

[481] branches/PR-6688645/darwinup
by source_changes＠macosforge.org 18 Mar '09

18 Mar '09

Revision: 481 http://trac.macosforge.org/projects/darwinbuild/changeset/481 Author: wsiegrist(a)apple.com Date: 2009-03-18 13:32:05 -0700 (Wed, 18 Mar 2009) Log Message: ----------- Add a flag to the Depot so we can test for a successful lock and exit earlier when we cannot access the path Modified Paths: -------------- branches/PR-6688645/darwinup/Depot.cpp branches/PR-6688645/darwinup/Depot.h branches/PR-6688645/darwinup/main.cpp Modified: branches/PR-6688645/darwinup/Depot.cpp =================================================================== --- branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 19:31:35 UTC (rev 480) +++ branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 20:32:05 UTC (rev 481) @@ -48,11 +48,12 @@ m_archives_path = NULL; m_db = NULL; m_lock_fd = -1; + m_is_locked = 0; } Depot::Depot(const char* prefix) { m_lock_fd = -1; - + m_is_locked = 0; asprintf(&m_prefix, "%s", prefix); asprintf(&m_depot_path, "%s/.DarwinDepot", m_prefix); asprintf(&m_database_path, "%s/Database-V100", m_depot_path); @@ -62,7 +63,6 @@ mkdir(m_archives_path, m_depot_mode); (void)this->lock(LOCK_SH); - int exists = is_regular_file(m_database_path); int res = sqlite3_open(m_database_path, &m_db); @@ -978,8 +978,13 @@ return this->SQL("COMMIT TRANSACTION"); } +int Depot::is_locked() { return m_is_locked; } + int Depot::lock(int operation) { int res = 0; + if (m_is_locked) { + fprintf(stderr, "Warning: attempt to over lock the depot\n"); + } if (m_lock_fd == -1) { m_lock_fd = open(m_depot_path, O_RDONLY); if (m_lock_fd == -1) { @@ -990,15 +995,22 @@ res = flock(m_lock_fd, operation); if (res == -1) { perror(m_depot_path); + } else { + m_is_locked = 1; } return res; } int Depot::unlock(void) { int res = 0; + if (!m_is_locked) { + fprintf(stderr, "Warning: attempt to over unlock the depot\n"); + } res = flock(m_lock_fd, LOCK_UN); if (res == -1) { perror(m_depot_path); + } else { + m_is_locked = 0; } close(m_lock_fd); m_lock_fd = -1; Modified: branches/PR-6688645/darwinup/Depot.h =================================================================== --- branches/PR-6688645/darwinup/Depot.h 2009-03-18 19:31:35 UTC (rev 480) +++ branches/PR-6688645/darwinup/Depot.h 2009-03-18 20:32:05 UTC (rev 481) @@ -71,6 +71,9 @@ int iterate_files(Archive* archive, FileIteratorFunc func, void* context); int iterate_archives(ArchiveIteratorFunc func, void* context); + // test if the depot is currently locked + int is_locked(); + protected: // Serialize access to the Depot via flock(2). @@ -116,4 +119,5 @@ char* m_database_path; char* m_archives_path; int m_lock_fd; + int m_is_locked; }; Modified: branches/PR-6688645/darwinup/main.cpp =================================================================== --- branches/PR-6688645/darwinup/main.cpp 2009-03-18 19:31:35 UTC (rev 480) +++ branches/PR-6688645/darwinup/main.cpp 2009-03-18 20:32:05 UTC (rev 481) @@ -33,10 +33,10 @@ #include <limits.h> void usage(char* progname) { - fprintf(stderr, "usage: %s [-v] [-p PATH] [command] [args] \n", progname); + fprintf(stderr, "usage: %s [-v] [-p DIR] [command] [args] \n", progname); fprintf(stderr, " \n"); fprintf(stderr, "options: \n"); - fprintf(stderr, " -p PATH install roots to partition (default: /) \n"); + fprintf(stderr, " -p DIR install roots under DIR (default: /) \n"); fprintf(stderr, " -v verbose (use -vv for extra verbosity) \n"); fprintf(stderr, " \n"); fprintf(stderr, "commands: \n"); @@ -79,7 +79,14 @@ int res = 0; Depot* depot = new Depot(partition); + if (!depot->is_locked()) { + fprintf(stderr, + "Error: unable to access and lock %s. " \ + "The directory must exist and be writable.\n", depot->prefix()); + exit(2); + } + if (argc == 2 && strcmp(argv[0], "install") == 0) { char uuid[37]; Archive* archive = ArchiveFactory(argv[1]);

1 0

[480] branches/PR-6688645/darwinup
by source_changes＠macosforge.org 18 Mar '09

18 Mar '09

Revision: 480 http://trac.macosforge.org/projects/darwinbuild/changeset/480 Author: wsiegrist(a)apple.com Date: 2009-03-18 12:31:35 -0700 (Wed, 18 Mar 2009) Log Message: ----------- Remove dest (path) argument from remove() api since the -p PATH value is already applied to file objects by the time we need to remove them Modified Paths: -------------- branches/PR-6688645/darwinup/Depot.cpp branches/PR-6688645/darwinup/File.cpp branches/PR-6688645/darwinup/File.h Modified: branches/PR-6688645/darwinup/Depot.cpp =================================================================== --- branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 02:24:14 UTC (rev 479) +++ branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 19:31:35 UTC (rev 480) @@ -654,7 +654,7 @@ if (INFO_TEST(preceding->info(), FILE_INFO_NO_ENTRY)) { state = 'R'; IF_DEBUG("[uninstall] removing file\n"); - if (actual && res == 0) res = actual->remove(context->depot->m_prefix); + if (actual && res == 0) res = actual->remove(); } else { // copy the preceding file back out to the system // if it's different from what's already there Modified: branches/PR-6688645/darwinup/File.cpp =================================================================== --- branches/PR-6688645/darwinup/File.cpp 2009-03-18 02:24:14 UTC (rev 479) +++ branches/PR-6688645/darwinup/File.cpp 2009-03-18 19:31:35 UTC (rev 480) @@ -185,7 +185,7 @@ return res; } -int File::remove(const char* dest) { +int File::remove() { // not implemented fprintf(stderr, "%s:%d: call to abstract function File::remove\n", __FILE__, __LINE__); return -1; @@ -224,11 +224,10 @@ } } -int Regular::remove(const char* dest) { +int Regular::remove() { int res = 0; - char* path; - asprintf(&path, "%s/%s", dest, this->path()); - res = unlink(path); + res = unlink(this->path()); + IF_DEBUG("[remove] unlink %s\n", this->path()); if (res == -1 && errno == ENOENT) { // We can safely ignore this because we were going to // remove the file anyway @@ -236,8 +235,6 @@ } else if (res != 0) { fprintf(stderr, "%s:%d: %s: %s (%d)\n", __FILE__, __LINE__, m_path, strerror(errno), errno); } - - free(path); return res; } @@ -251,11 +248,10 @@ } } -int Symlink::remove(const char* dest) { +int Symlink::remove() { int res = 0; - char* path; - asprintf(&path, "%s/%s", dest, this->path()); - res = unlink(path); + res = unlink(this->path()); + IF_DEBUG("[remove] unlink %s", this->path()); if (res == -1 && errno == ENOENT) { // We can safely ignore this because we were going to // remove the file anyway @@ -263,8 +259,6 @@ } else if (res == -1) { fprintf(stderr, "%s:%d: %s (%d)\n", __FILE__, __LINE__, strerror(errno), errno); } - - free(path); return res; } @@ -308,22 +302,19 @@ return res; } -int Directory::remove(const char* dest) { +int Directory::remove() { int res = 0; - char* path; - asprintf(&path, "%s/%s", dest, this->path()); - res = rmdir(path); + res = rmdir(this->path()); + IF_DEBUG("[remove] rmdir %s\n", this->path()); if (res == -1 && errno == ENOENT) { // We can safely ignore this because we were going to // remove the directory anyway res = 0; } else if (res == -1 && errno == ENOTEMPTY) { - res = remove_directory(path); + res = remove_directory(this->path()); } else if (res == -1) { fprintf(stderr, "%s:%d: %s (%d)\n", __FILE__, __LINE__, strerror(errno), errno); } - - free(path); return res; } Modified: branches/PR-6688645/darwinup/File.h =================================================================== --- branches/PR-6688645/darwinup/File.h 2009-03-18 02:24:14 UTC (rev 479) +++ branches/PR-6688645/darwinup/File.h 2009-03-18 19:31:35 UTC (rev 480) @@ -139,8 +139,8 @@ // XXX: rename as repair()? virtual int install_info(const char* dest); - // Removes the file from the dest path - virtual int remove(const char* dest); + // Removes the file + virtual int remove(); // Prints one line to the output stream indicating // the file mode, ownership, digest and name. @@ -181,7 +181,7 @@ struct Regular : File { Regular(Archive* archive, FTSENT* ent); Regular(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest); - virtual int remove(const char* dest); + virtual int remove(); }; //// @@ -192,7 +192,7 @@ Symlink(Archive* archive, FTSENT* ent); Symlink(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest); virtual int install_info(const char* dest); - virtual int remove(const char* dest); + virtual int remove(); }; //// @@ -203,5 +203,5 @@ Directory(Archive* archive, FTSENT* ent); Directory(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest); virtual int install(const char* prefix, const char* dest); - virtual int remove(const char* dest); + virtual int remove(); };

1 0

[479] branches/PR-6688645/darwinup
by source_changes＠macosforge.org 18 Mar '09

18 Mar '09

Revision: 479 http://trac.macosforge.org/projects/darwinbuild/changeset/479 Author: wsiegrist(a)apple.com Date: 2009-03-17 19:24:14 -0700 (Tue, 17 Mar 2009) Log Message: ----------- Partial work towards adding a -p option to install roots onto arbitrary paths/partitions. We have to add the destination path to the Depot object in order to keep passing it to our File objects since they assume the path in the Archive is relative to the root partition. I also improved the usage statement and found 1 missing free() after an asprintf(). Modified Paths: -------------- branches/PR-6688645/darwinup/Archive.cpp branches/PR-6688645/darwinup/Depot.cpp branches/PR-6688645/darwinup/Depot.h branches/PR-6688645/darwinup/File.cpp branches/PR-6688645/darwinup/File.h branches/PR-6688645/darwinup/main.cpp Modified: branches/PR-6688645/darwinup/Archive.cpp =================================================================== --- branches/PR-6688645/darwinup/Archive.cpp 2009-03-17 19:50:36 UTC (rev 478) +++ branches/PR-6688645/darwinup/Archive.cpp 2009-03-18 02:24:14 UTC (rev 479) @@ -80,6 +80,7 @@ char* Archive::create_directory(const char* prefix) { int res = 0; char* path = this->directory_name(prefix); + IF_DEBUG("creating directory: %s\n", path); if (path && res == 0) res = mkdir(path, 0777); if (res != 0) { fprintf(stderr, "%s:%d: could not create directory: %s: %s (%d)\n", __FILE__, __LINE__, path, strerror(errno), errno); @@ -96,6 +97,7 @@ char uuidstr[37]; uuid_unparse_upper(m_uuid, uuidstr); asprintf(&tarpath, "%s/%s.tar.bz2", prefix, uuidstr); + IF_DEBUG("compacting %s/%s to %s\n", prefix, uuidstr, tarpath); if (tarpath) { const char* args[] = { "/usr/bin/tar", @@ -119,6 +121,7 @@ char uuidstr[37]; uuid_unparse_upper(m_uuid, uuidstr); asprintf(&tarpath, "%s/%s.tar.bz2", prefix, uuidstr); + IF_DEBUG("expanding %s to %s\n", tarpath, prefix); if (tarpath) { const char* args[] = { "/usr/bin/tar", @@ -223,4 +226,4 @@ fprintf(stderr, "Error: unknown archive type: %s\n", path); } return archive; -} \ No newline at end of file +} Modified: branches/PR-6688645/darwinup/Depot.cpp =================================================================== --- branches/PR-6688645/darwinup/Depot.cpp 2009-03-17 19:50:36 UTC (rev 478) +++ branches/PR-6688645/darwinup/Depot.cpp 2009-03-18 02:24:14 UTC (rev 479) @@ -42,6 +42,7 @@ #include <sqlite3.h> Depot::Depot() { + m_prefix = NULL; m_depot_path = NULL; m_database_path = NULL; m_archives_path = NULL; @@ -52,7 +53,8 @@ Depot::Depot(const char* prefix) { m_lock_fd = -1; - asprintf(&m_depot_path, "%s/.DarwinDepot", prefix); + asprintf(&m_prefix, "%s", prefix); + asprintf(&m_depot_path, "%s/.DarwinDepot", m_prefix); asprintf(&m_database_path, "%s/Database-V100", m_depot_path); asprintf(&m_archives_path, "%s/Archives", m_depot_path); @@ -81,12 +83,14 @@ 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; } // Unserialize an archive from the database. // Find the archive by UUID. @@ -266,6 +270,8 @@ const char* path_argv[] = { path, NULL }; + IF_DEBUG("[analyze] analyzing path: %s\n", path); + FTS* fts = fts_open((char**)path_argv, FTS_PHYSICAL | FTS_COMFOLLOW | FTS_XDEV, fts_compare); FTSENT* ent = fts_read(fts); // throw away the entry for path itself while (res != -1 && (ent = fts_read(fts)) != NULL) { @@ -279,7 +285,10 @@ // the file we last installed in this location (preceding), // and the file that actually exists in this location (actual). - File* actual = FileFactory(file->path()); + char* actpath; + asprintf(&actpath, "%s/%s", this->prefix(), file->path()); + File* actual = FileFactory(actpath); + File* preceding = this->file_preceded_by(file); if (actual == NULL) { @@ -363,6 +372,7 @@ } else { res = 0; } + free(backup_dirpath); } @@ -379,6 +389,7 @@ assert(res == 0); if (preceding && preceding != actual) delete preceding; if (actual) delete actual; + free(actpath); delete file; } } @@ -467,9 +478,9 @@ if (INFO_TEST(file->info(), FILE_INFO_INSTALL_DATA)) { ++context->files_modified; - res = file->install(context->depot->m_archives_path); + res = file->install(context->depot->m_archives_path, context->depot->m_prefix); } else { - res = file->install_info(); + res = file->install_info(context->depot->m_prefix); } if (res != 0) fprintf(stderr, "%s:%d: install failed: %s: %s (%d)\n", __FILE__, __LINE__, file->path(), strerror(errno), errno); return res; @@ -626,7 +637,9 @@ return 0; } - File* actual = FileFactory(file->path()); + char* actpath; + asprintf(&actpath, "%s/%s", context->depot->m_prefix, file->path()); + File* actual = FileFactory(actpath); uint32_t flags = File::compare(file, actual); if (actual != NULL && flags != FILE_INFO_IDENTICAL) { @@ -641,7 +654,7 @@ if (INFO_TEST(preceding->info(), FILE_INFO_NO_ENTRY)) { state = 'R'; IF_DEBUG("[uninstall] removing file\n"); - if (actual && res == 0) res = actual->remove(); + if (actual && res == 0) res = actual->remove(context->depot->m_prefix); } else { // copy the preceding file back out to the system // if it's different from what's already there @@ -649,11 +662,11 @@ if (INFO_TEST(flags, FILE_INFO_DATA_DIFFERS)) { state = 'U'; IF_DEBUG("[uninstall] restoring\n"); - if (res == 0) res = preceding->install(context->depot->m_archives_path); + if (res == 0) res = preceding->install(context->depot->m_archives_path, context->depot->m_prefix); } else if (INFO_TEST(flags, FILE_INFO_MODE_DIFFERS) || INFO_TEST(flags, FILE_INFO_GID_DIFFERS) || INFO_TEST(flags, FILE_INFO_UID_DIFFERS)) { - if (res == 0) res = preceding->install_info(); + if (res == 0) res = preceding->install_info(context->depot->m_prefix); } else { IF_DEBUG("[uninstall] no changes; leaving in place\n"); } @@ -673,6 +686,8 @@ fprintf(stderr, "%c %s\n", state, file->path()); if (res != 0) fprintf(stderr, "%s:%d: uninstall failed: %s\n", __FILE__, __LINE__, file->path()); + + free(actpath); return res; } Modified: branches/PR-6688645/darwinup/Depot.h =================================================================== --- branches/PR-6688645/darwinup/Depot.h 2009-03-17 19:50:36 UTC (rev 478) +++ branches/PR-6688645/darwinup/Depot.h 2009-03-18 02:24:14 UTC (rev 479) @@ -37,6 +37,7 @@ virtual ~Depot(); + const char* prefix(); const char* database_path(); const char* archives_path(); @@ -110,6 +111,7 @@ sqlite3* m_db; mode_t m_depot_mode; + char* m_prefix; char* m_depot_path; char* m_database_path; char* m_archives_path; Modified: branches/PR-6688645/darwinup/File.cpp =================================================================== --- branches/PR-6688645/darwinup/File.cpp 2009-03-17 19:50:36 UTC (rev 478) +++ branches/PR-6688645/darwinup/File.cpp 2009-03-18 02:24:14 UTC (rev 479) @@ -132,20 +132,25 @@ free(dig); } -int File::install(const char* prefix) { +int File::install(const char* prefix, const char* dest) { int res = 0; Archive* archive = this->archive(); assert(archive != NULL); char* dirpath = archive->directory_name(prefix); + IF_DEBUG("[install] dirpath is %s\n", dirpath); char srcpath[PATH_MAX]; - const char* dstpath = this->path(); + const char* path = this->path(); + char* dstpath; + asprintf(&dstpath, "%s/%s", dest, path); + if (dirpath) { - ssize_t len = snprintf(srcpath, sizeof(srcpath), "%s/%s", dirpath, dstpath); + ssize_t len = snprintf(srcpath, sizeof(srcpath), "%s/%s", dirpath, path); if ((size_t)len > sizeof(srcpath)) { - fprintf(stderr, "ERROR: [install] path too long: %s/%s\n", dirpath, dstpath); + fprintf(stderr, "ERROR: [install] path too long: %s/%s\n", dirpath, path); return -1; } + IF_DEBUG("[install] about to rename %s to %s\n", srcpath, dstpath); res = rename(srcpath, dstpath); if (res == -1) { if (errno == ENOENT) { @@ -153,7 +158,7 @@ // expansion of the archive that contains it. if (is_directory(dirpath) == 0) { res = archive->expand_directory(prefix); - if (res == 0) res = this->install(prefix); + if (res == 0) res = this->install(prefix, dest); } else { // archive was already expanded, so // the file is truly missing (worry). @@ -176,18 +181,20 @@ } else { res = -1; } + free(dstpath); return res; } -int File::remove() { +int File::remove(const char* dest) { // not implemented fprintf(stderr, "%s:%d: call to abstract function File::remove\n", __FILE__, __LINE__); return -1; } -int File::install_info() { +int File::install_info(const char* dest) { int res = 0; - const char* path = this->path(); + char* path; + asprintf(&path, "%s/%s", dest, this->path()); uid_t uid = this->uid(); gid_t gid = this->gid(); mode_t mode = this->mode() & ALLPERMS; @@ -197,6 +204,7 @@ IF_DEBUG("[install] chmod(%s, %04o)\n", path, mode); if (res == 0) res = chmod(path, mode); + free(path); return res; } @@ -216,9 +224,10 @@ } } -int Regular::remove() { +int Regular::remove(const char* dest) { int res = 0; - const char* path = this->path(); + char* path; + asprintf(&path, "%s/%s", dest, this->path()); res = unlink(path); if (res == -1 && errno == ENOENT) { // We can safely ignore this because we were going to @@ -227,6 +236,8 @@ } else if (res != 0) { fprintf(stderr, "%s:%d: %s: %s (%d)\n", __FILE__, __LINE__, m_path, strerror(errno), errno); } + + free(path); return res; } @@ -240,9 +251,10 @@ } } -int Symlink::remove() { +int Symlink::remove(const char* dest) { int res = 0; - const char* path = this->path(); + char* path; + asprintf(&path, "%s/%s", dest, this->path()); res = unlink(path); if (res == -1 && errno == ENOENT) { // We can safely ignore this because we were going to @@ -251,10 +263,12 @@ } else if (res == -1) { fprintf(stderr, "%s:%d: %s (%d)\n", __FILE__, __LINE__, strerror(errno), errno); } + + free(path); return res; } -int Symlink::install_info() { +int Symlink::install_info(const char* dest) { int res = 0; const char* path = this->path(); //mode_t mode = this->mode() & ALLPERMS; @@ -271,13 +285,15 @@ Directory::Directory(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest) : File(serial, archive, info, path, mode, uid, gid, size, digest) {}; -int Directory::install(const char* prefix) { +int Directory::install(const char* prefix, const char* dest) { // We create a new directory instead of renaming the // existing one, since that would move the entire // sub-tree, and lead to a lot of ENOENT errors. int res = 0; - const char* dstpath = this->path(); + char* dstpath; + asprintf(&dstpath, "%s/%s", dest, this->path()); + mode_t mode = this->mode() & ALLPERMS; uid_t uid = this->uid(); gid_t gid = this->gid(); @@ -287,12 +303,15 @@ if (res != 0) fprintf(stderr, "ERROR: %s:%d: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno); if (res == 0) res = chown(dstpath, uid, gid); if (res != 0) fprintf(stderr, "ERROR: %s:%d: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno); + + free(dstpath); return res; } -int Directory::remove() { +int Directory::remove(const char* dest) { int res = 0; - const char* path = this->path(); + char* path; + asprintf(&path, "%s/%s", dest, this->path()); res = rmdir(path); if (res == -1 && errno == ENOENT) { // We can safely ignore this because we were going to @@ -303,6 +322,8 @@ } else if (res == -1) { fprintf(stderr, "%s:%d: %s (%d)\n", __FILE__, __LINE__, strerror(errno), errno); } + + free(path); return res; } Modified: branches/PR-6688645/darwinup/File.h =================================================================== --- branches/PR-6688645/darwinup/File.h 2009-03-17 19:50:36 UTC (rev 478) +++ branches/PR-6688645/darwinup/File.h 2009-03-18 02:24:14 UTC (rev 479) @@ -130,18 +130,17 @@ // Member functions //// - // Installs the file at the given prefix onto the - // root volume. i.e., for regular files: - // rename(prefix + this->archive()->uuid() + this->path(), this->path()); - virtual int install(const char* prefix); + // Installs the file from the archive into the prefix + // i.e., for regular files: + // rename(prefix + this->archive()->uuid() + this->path(), dest + this->path()); + virtual int install(const char* prefix, const char* dest); - // Sets the mode, uid, and gid of the file on the - // root volume. + // Sets the mode, uid, and gid of the file in the dest path // XXX: rename as repair()? - virtual int install_info(); + virtual int install_info(const char* dest); - // Removes the file from the root volume. - virtual int remove(); + // Removes the file from the dest path + virtual int remove(const char* dest); // Prints one line to the output stream indicating // the file mode, ownership, digest and name. @@ -182,7 +181,7 @@ struct Regular : File { Regular(Archive* archive, FTSENT* ent); Regular(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest); - virtual int remove(); + virtual int remove(const char* dest); }; //// @@ -192,8 +191,8 @@ struct Symlink : File { Symlink(Archive* archive, FTSENT* ent); Symlink(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest); - virtual int install_info(); - virtual int remove(); + virtual int install_info(const char* dest); + virtual int remove(const char* dest); }; //// @@ -203,6 +202,6 @@ struct Directory : File { Directory(Archive* archive, FTSENT* ent); Directory(uint64_t serial, Archive* archive, uint32_t info, const char* path, mode_t mode, uid_t uid, gid_t gid, off_t size, Digest* digest); - virtual int install(const char* prefix); - virtual int remove(); + virtual int install(const char* prefix, const char* dest); + virtual int remove(const char* dest); }; Modified: branches/PR-6688645/darwinup/main.cpp =================================================================== --- branches/PR-6688645/darwinup/main.cpp 2009-03-17 19:50:36 UTC (rev 478) +++ branches/PR-6688645/darwinup/main.cpp 2009-03-18 02:24:14 UTC (rev 479) @@ -30,17 +30,21 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> void usage(char* progname) { - char* pad = strdup(progname); - size_t i; - for (i = 0; i < strlen(pad); ++i) pad[i] = ' '; - - fprintf(stderr, "usage: %s install <path>\n", progname); - fprintf(stderr, " %s list\n", pad); - fprintf(stderr, " %s files <uuid>\n", pad); - fprintf(stderr, " %s uninstall <uuid>\n", pad); - fprintf(stderr, " %s verify <uuid>\n", pad); + fprintf(stderr, "usage: %s [-v] [-p PATH] [command] [args] \n", progname); + fprintf(stderr, " \n"); + fprintf(stderr, "options: \n"); + fprintf(stderr, " -p PATH install roots to partition (default: /) \n"); + fprintf(stderr, " -v verbose (use -vv for extra verbosity) \n"); + fprintf(stderr, " \n"); + fprintf(stderr, "commands: \n"); + fprintf(stderr, " install <path> \n"); + fprintf(stderr, " list \n"); + fprintf(stderr, " files <uuid> \n"); + fprintf(stderr, " uninstall <uuid> \n"); + fprintf(stderr, " verify <uuid> \n"); exit(1); } @@ -48,18 +52,23 @@ uint32_t verbosity; int main(int argc, char* argv[]) { - int res = 0; - Depot* depot = new Depot("/"); - char* progname = strdup(basename(argv[0])); + // the partition we are working on + char partition[PATH_MAX] = "/"; + int ch; - while ((ch = getopt(argc, argv, "v")) != -1) { + while ((ch = getopt(argc, argv, "p:v")) != -1) { switch (ch) { case 'v': verbosity <<= 1; verbosity |= VERBOSE; break; + case 'p': + int optlen = strlen(optarg); + int limitlen = (optlen < PATH_MAX ? optlen : PATH_MAX); + strncpy(partition, optarg, limitlen); + break; case '?': default: usage(progname); @@ -68,6 +77,9 @@ argc -= optind; argv += optind; + int res = 0; + Depot* depot = new Depot(partition); + if (argc == 2 && strcmp(argv[0], "install") == 0) { char uuid[37]; Archive* archive = ArchiveFactory(argv[1]);

1 0

[478] branches/PR-6688645/
by source_changes＠macosforge.org 17 Mar '09

17 Mar '09

Revision: 478 http://trac.macosforge.org/projects/darwinbuild/changeset/478 Author: wsiegrist(a)apple.com Date: 2009-03-17 12:50:36 -0700 (Tue, 17 Mar 2009) Log Message: ----------- Branching for PR-6688645 Added Paths: ----------- branches/PR-6688645/ Property changes on: branches/PR-6688645 ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /trunk:432-434

1 0