X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/ffb4fe6a8c3660e649b6fd38829f92d29200f70c..e3799a2e08946d914e75ae16d8286868660ba862:/MobileCydia.mm diff --git a/MobileCydia.mm b/MobileCydia.mm index 7b1cff09..ac7f0b9a 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -239,12 +239,43 @@ union SplitHash { }; // }}} +static void setreugid(uid_t uid, gid_t gid) { + _assert(setreuid(uid, uid) != -1); + _assert(setregid(gid, gid) != -1); +} + +static void setreguid(gid_t gid, uid_t uid) { + _assert(setregid(gid, gid) != -1); + _assert(setreuid(uid, uid) != -1); +} + +struct Root { + Root() { + _trace(); + setreugid(0, 0); + _assert(pthread_setugid_np(0, 0) != -1); + setreguid(501, 501); + } + + ~Root() { + _trace(); + setreugid(0, 0); + _assert(pthread_setugid_np(KAUTH_UID_NONE, KAUTH_GID_NONE) != -1); + setreguid(501, 501); + } +}; + +#define _root(code) \ + ({ Root _root; code; }) + static NSString *Colon_; NSString *Elision_; static NSString *Error_; static NSString *Warning_; static NSString *Cache_; +#define Cache(file) \ + [NSString stringWithFormat:@"%@/%s", Cache_, file] static void (*$SBSSetInterceptsMenuButtonForever)(bool); @@ -3016,7 +3047,7 @@ struct PackageNameOrdering : if ([dicon hasPrefix:@"file:///"]) icon = [UIImage imageAtPath:[[dicon substringFromIndex:7] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; if (icon == nil) - icon = [UIImage applicationImageNamed:@"unknown.png"]; + icon = [UIImage imageNamed:@"unknown.png"]; return icon; } @@ -3787,12 +3818,14 @@ class CydiaLogCleaner : } _end + _root(_system->Lock()); + _trace(); OpProgress progress; bool opened; open: _profile(reloadDataWithInvocation$pkgCacheFile) - opened = cache_.Open(progress, true); + opened = cache_.Open(progress, false); _end if (!opened) { // XXX: what if there are errors, but Open() == true? this should be merged with popError: @@ -3822,6 +3855,7 @@ class CydiaLogCleaner : } } + _system->UnLock(); return; } _trace(); @@ -3949,7 +3983,7 @@ class CydiaLogCleaner : - (void) configure { NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_]; _trace(); - system([dpkg UTF8String]); + _root(system([dpkg UTF8String])); _trace(); } @@ -4051,7 +4085,7 @@ class CydiaLogCleaner : RestartSubstrate_ = true; _system->UnLock(); - pkgPackageManager::OrderResult result = manager_->DoInstall(statusfd_); + pkgPackageManager::OrderResult result(_root(manager_->DoInstall(statusfd_))); if ([self popErrorWithTitle:title]) return; @@ -4699,7 +4733,7 @@ static _H Diversions_; _assert(close(fds[0]) != -1); _assert(close(fds[1]) != -1); /* XXX: this should probably not use du */ - execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL); + _root(execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL)); exit(1); } else { _assert(close(fds[1]) != -1); @@ -5080,7 +5114,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ([context isEqualToString:@"remove"]) { if (button == [alert cancelButtonIndex]) - [self dismissModalViewControllerAnimated:YES]; + [self _doContinue]; else if (button == [alert firstOtherButtonIndex]) { [self performSelector:@selector(complete) withObject:nil afterDelay:0]; } @@ -5548,7 +5582,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { pid_t pid(ExecFork()); if (pid == 0) { - execl("/usr/bin/sbreload", "sbreload", NULL); + _root(execl("/usr/bin/sbreload", "sbreload", NULL)); perror("sbreload"); exit(0); @@ -6004,7 +6038,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier { if ((self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) != nil) { - icon_ = [UIImage applicationImageNamed:@"folder.png"]; + icon_ = [UIImage imageNamed:@"folder.png"]; // XXX: this initial frame is wrong, but is fixed later switch_ = [[[UISwitch alloc] initWithFrame:CGRectMake(218, 9, 60, 25)] autorelease]; [switch_ addTarget:self action:@selector(onSwitch:) forEvents:UIControlEventValueChanged]; @@ -6232,7 +6266,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { _H package_; _H name_; bool commercial_; - _H buttons_; + std::vector, _H>> buttons_; _H button_; } @@ -6246,17 +6280,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { return [NSURL URLWithString:[NSString stringWithFormat:@"cydia://package/%@", (id) name_]]; } -/* XXX: this is not safe at all... localization of /fail/ */ - (void) _clickButtonWithName:(NSString *)name { - if ([name isEqualToString:UCLocalize("CLEAR")]) + if ([name isEqualToString:@"CLEAR"]) [delegate_ clearPackage:package_]; - else if ([name isEqualToString:UCLocalize("INSTALL")]) + else if ([name isEqualToString:@"INSTALL"]) [delegate_ installPackage:package_]; - else if ([name isEqualToString:UCLocalize("REINSTALL")]) + else if ([name isEqualToString:@"REINSTALL"]) [delegate_ installPackage:package_]; - else if ([name isEqualToString:UCLocalize("REMOVE")]) + else if ([name isEqualToString:@"REMOVE"]) [delegate_ removePackage:package_]; - else if ([name isEqualToString:UCLocalize("UPGRADE")]) + else if ([name isEqualToString:@"UPGRADE"]) [delegate_ installPackage:package_]; else _assert(false); } @@ -6266,8 +6299,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ([context isEqualToString:@"modify"]) { if (button != [sheet cancelButtonIndex]) { - NSString *buttonName = [buttons_ objectAtIndex:button]; - [self _clickButtonWithName:buttonName]; + [self performSelector:@selector(_clickButtonWithName:) withObject:buttons_[button].first afterDelay:0]; } [sheet dismissWithClickedButtonIndex:-1 animated:YES]; @@ -6280,15 +6312,16 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { #if !AlwaysReload - (void) _customButtonClicked { - int count([buttons_ count]); + size_t count(buttons_.size()); if (count == 0) return; if (count == 1) - [self _clickButtonWithName:[buttons_ objectAtIndex:0]]; + [self _clickButtonWithName:buttons_[0].first]; else { NSMutableArray *buttons = [NSMutableArray arrayWithCapacity:count]; - [buttons addObjectsFromArray:buttons_]; + for (const auto &button : buttons_) + [buttons addObject:button.second]; UIActionSheet *sheet = [[[UIActionSheet alloc] initWithTitle:nil @@ -6331,7 +6364,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { - (id) initWithDatabase:(Database *)database forPackage:(NSString *)name withReferrer:(NSString *)referrer { if ((self = [super init]) != nil) { database_ = database; - buttons_ = [NSMutableArray arrayWithCapacity:4]; name_ = name == nil ? @"" : [NSString stringWithString:name]; [self setURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/#!/package/%@", UI_, (id) name_]] withReferrer:referrer]; } return self; @@ -6342,7 +6374,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { package_ = [database_ packageWithName:name_]; - [buttons_ removeAllObjects]; + buttons_.clear(); if (package_ != nil) { [(Package *) package_ parse]; @@ -6350,22 +6382,22 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { commercial_ = [package_ isCommercial]; if ([package_ mode] != nil) - [buttons_ addObject:UCLocalize("CLEAR")]; + buttons_.push_back(std::make_pair(@"CLEAR", UCLocalize("CLEAR"))); if ([package_ source] == nil); else if ([package_ upgradableAndEssential:NO]) - [buttons_ addObject:UCLocalize("UPGRADE")]; + buttons_.push_back(std::make_pair(@"UPGRADE", UCLocalize("UPGRADE"))); else if ([package_ uninstalled]) - [buttons_ addObject:UCLocalize("INSTALL")]; + buttons_.push_back(std::make_pair(@"INSTALL", UCLocalize("INSTALL"))); else - [buttons_ addObject:UCLocalize("REINSTALL")]; + buttons_.push_back(std::make_pair(@"REINSTALL", UCLocalize("REINSTALL"))); if (![package_ uninstalled]) - [buttons_ addObject:UCLocalize("REMOVE")]; + buttons_.push_back(std::make_pair(@"REMOVE", UCLocalize("REMOVE"))); } NSString *title; - switch ([buttons_ count]) { + switch (buttons_.size()) { case 0: title = nil; break; - case 1: title = [buttons_ objectAtIndex:0]; break; + case 1: title = buttons_[0].second; break; default: title = UCLocalize("MODIFY"); break; } @@ -7180,7 +7212,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; UIImage *icon([UIImage imageAtPath:[NSString stringWithFormat:@"%@/Sections/%@.png", App_, [path stringByReplacingOccurrencesOfString:@" " withString:@"_"]]]); if (icon == nil) - icon = [UIImage applicationImageNamed:@"unknown.png"]; + icon = [UIImage imageNamed:@"unknown.png"]; [self _returnPNGWithImage:icon forRequest:request]; } else fail: { [client URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorResourceUnavailable userInfo:nil]]; @@ -7893,7 +7925,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi pid_t pid(ExecFork()); if (pid == 0) { - FILE *dpkg(popen("dpkg --set-selections", "w")); + FILE *dpkg(_root(popen("dpkg --set-selections", "w"))); fwrite(package, strlen(package), 1, dpkg); if (on) @@ -8182,7 +8214,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [self setFetch:[NSNumber numberWithBool:[source_ fetch]]]; - icon_ = [UIImage applicationImageNamed:@"unknown.png"]; + icon_ = [UIImage imageNamed:@"unknown.png"]; origin_ = [source name]; label_ = [source rooturi]; @@ -8197,7 +8229,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi source_ = nil; [indicator_ stopAnimating]; - icon_ = [UIImage applicationImageNamed:@"folder.png"]; + icon_ = [UIImage imageNamed:@"folder.png"]; origin_ = UCLocalize("ALL_SOURCES"); label_ = UCLocalize("ALL_SOURCES_EX"); [content_ setNeedsDisplay]; @@ -8883,6 +8915,11 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi [super storeCachedResponse:cached forRequest:request]; } +- (void) createDiskCachePath { + [super createDiskCachePath]; + _root(chown([[self diskCachePath] UTF8String], 501, 501)); +} + @end @interface Cydia : UIApplication < @@ -8893,6 +8930,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi _H window_; _H tabbar_; _H emulated_; + _H appcache_; _H essential_; _H broken_; @@ -9018,7 +9056,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi if (NSData *data = [NSPropertyListSerialization dataFromPropertyList:Metadata_ format:NSPropertyListBinaryFormat_v1_0 errorDescription:&error]) { _trace(); NSError *error(nil); - if (![data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error]) + if (!_root([data writeToFile:@"/var/lib/cydia/metadata.plist" options:NSAtomicWrite error:&error])) NSLog(@"failure to save metadata data: %@", error); _trace(); @@ -9028,7 +9066,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi } } - CydiaWriteSources(); + _root(CydiaWriteSources()); } // Navigation controller for the queuing badge. @@ -9061,7 +9099,7 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi bool recently = false; if (update != nil) { NSTimeInterval interval([update timeIntervalSinceNow]); - if (interval <= 0 && interval > -(15*60)) + if (interval > -(15*60)) recently = true; } @@ -9130,6 +9168,7 @@ _profile(reloadDataWithInvocation) [self setApplicationIconBadgeNumber:0]; } + Queuing_ = false; [self _updateData]; if (hud != nil) @@ -9320,7 +9359,7 @@ _end - (void) _uicache { _trace(); - system("su -c /usr/bin/uicache mobile"); + system("/usr/bin/uicache"); _trace(); } @@ -9393,12 +9432,14 @@ _end @synchronized (self) { for (Package *broken in (id) broken_) { [broken remove]; - NSString *id = [broken id]; - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]); - unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]); + + _root({ + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.prerm", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postrm", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.preinst", id] UTF8String]); + unlink([[NSString stringWithFormat:@"/var/lib/dpkg/info/%@.postinst", id] UTF8String]); + }); } [self resolve]; @@ -9433,7 +9474,7 @@ _end NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); _trace(); - system([command UTF8String]); + _root(system([command UTF8String])); _trace(); [pool release]; @@ -9478,6 +9519,21 @@ _end return true; } +- (void) suspendReturningToLastApp:(BOOL)returning { + if ([self isSafeToSuspend]) + [super suspendReturningToLastApp:returning]; +} + +- (void) suspend { + if ([self isSafeToSuspend]) + [super suspend]; +} + +- (void) applicationSuspend { + if ([self isSafeToSuspend]) + [super applicationSuspend]; +} + - (void) applicationSuspend:(__GSEvent *)event { if ([self isSafeToSuspend]) [super applicationSuspend:event]; @@ -9666,6 +9722,30 @@ _end [self saveState]; } +- (void) applicationDidEnterBackground:(UIApplication *)application { + [self saveState]; +} + +- (void) applicationWillEnterForeground:(UIApplication *)application { + NSDate *closed = [Metadata_ objectForKey:@"LastClosed"]; + if (closed == nil) + return; + + NSTimeInterval interval([closed timeIntervalSinceNow]); + + if (interval <= -(30)) { + [tabbar_ setSelectedIndex:0]; + [[[tabbar_ viewControllers] objectAtIndex:0] popToRootViewControllerAnimated:NO]; + } + + if (interval <= -(15)) { + if (IsReachable("cydia.saurik.com")) { + [tabbar_ beginUpdate]; + [appcache_ reloadURLWithCache:YES]; + } + } +} + - (void) setConfigurationData:(NSString *)data { static Pcre conffile_r("^'(.*)' '(.*)' ([01]) ([01])$"); @@ -9728,19 +9808,19 @@ _end NSMutableArray *items; if (kCFCoreFoundationVersionNumber < 800) { items = [NSMutableArray arrayWithObjects: - [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home.png"] tag:0] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install.png"] tag:0] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes.png"] tag:0] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage.png"] tag:0] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage imageNamed:@"home.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage imageNamed:@"install.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage imageNamed:@"changes.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage imageNamed:@"manage.png"] tag:0] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage imageNamed:@"search.png"] tag:0] autorelease], nil]; } else { items = [NSMutableArray arrayWithObjects: - [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage applicationImageNamed:@"home7.png"] selectedImage:[UIImage applicationImageNamed:@"home7s.png"]] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage applicationImageNamed:@"install7.png"] selectedImage:[UIImage applicationImageNamed:@"install7s.png"]] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage applicationImageNamed:@"changes7.png"] selectedImage:[UIImage applicationImageNamed:@"changes7s.png"]] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage applicationImageNamed:@"manage7.png"] selectedImage:[UIImage applicationImageNamed:@"manage7s.png"]] autorelease], - [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage applicationImageNamed:@"search7.png"] selectedImage:[UIImage applicationImageNamed:@"search7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:@"Cydia" image:[UIImage imageNamed:@"home7.png"] selectedImage:[UIImage imageNamed:@"home7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SOURCES") image:[UIImage imageNamed:@"install7.png"] selectedImage:[UIImage imageNamed:@"install7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("CHANGES") image:[UIImage imageNamed:@"changes7.png"] selectedImage:[UIImage imageNamed:@"changes7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("INSTALLED") image:[UIImage imageNamed:@"manage7.png"] selectedImage:[UIImage imageNamed:@"manage7s.png"]] autorelease], + [[[UITabBarItem alloc] initWithTitle:UCLocalize("SEARCH") image:[UIImage imageNamed:@"search7.png"] selectedImage:[UIImage imageNamed:@"search7s.png"]] autorelease], nil]; } @@ -9789,7 +9869,7 @@ _trace(); [NSURLCache setSharedURLCache:[[[CYURLCache alloc] initWithMemoryCapacity:524288 diskCapacity:10485760 - diskPath:[NSString stringWithFormat:@"%@/SDURLCache", Cache_] + diskPath:Cache("SDURLCache") ] autorelease]]; [CydiaWebViewController _initialize]; @@ -9810,7 +9890,8 @@ _trace(); broken_ = [NSMutableArray arrayWithCapacity:4]; // XXX: I really need this thing... like, seriously... I'm sorry - [[[AppCacheController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] reloadData]; + appcache_ = [[[AppCacheController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/appcache/", UI_]]] autorelease]; + [appcache_ reloadData]; window_ = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease]; [window_ orderFront:self]; @@ -9910,7 +9991,6 @@ _trace(); NSDate *closed = [Metadata_ objectForKey:@"LastClosed"]; if (valid && closed != nil) { NSTimeInterval interval([closed timeIntervalSinceNow]); - // XXX: Is 30 minutes the optimal time here? if (interval <= -(30*60)) valid = NO; } @@ -10002,54 +10082,6 @@ id Dealloc_(id self, SEL selector) { return object; }*/ -static NSSet *MobilizedFiles_; - -static NSURL *MobilizeURL(NSURL *url) { - NSString *path([url path]); - if ([path hasPrefix:@"/var/root/"]) { - NSString *file([path substringFromIndex:10]); - if ([MobilizedFiles_ containsObject:file]) - url = [NSURL fileURLWithPath:[@"/var/mobile/" stringByAppendingString:file] isDirectory:NO]; - } - - return url; -} - -Class $CFXPreferencesPropertyListSource; -@class CFXPreferencesPropertyListSource; - -MSHook(BOOL, CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync, CFXPreferencesPropertyListSource *self, SEL _cmd) { - NSURL *&url(MSHookIvar(self, "_url")), *old(url); - NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); - - url = MobilizeURL(url); - BOOL value; @try { - value = _CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(self, _cmd); - //NSLog(@"CFX %@ %s", [url absoluteString], value ? "YES" : "NO"); - } @finally { - url = old; - } - - [pool release]; - return value; -} - -MSHook(void *, CFXPreferencesPropertyListSource$createPlistFromDisk, CFXPreferencesPropertyListSource *self, SEL _cmd) { - NSURL *&url(MSHookIvar(self, "_url")), *old(url); - NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); - - url = MobilizeURL(url); - void *value; @try { - value = _CFXPreferencesPropertyListSource$createPlistFromDisk(self, _cmd); - //NSLog(@"CFX %@ %@", [url absoluteString], value); - } @finally { - url = old; - } - - [pool release]; - return value; -} - Class $NSURLConnection; MSHook(id, NSURLConnection$init$, NSURLConnection *self, SEL _cmd, NSURLRequest *request, id delegate, BOOL usesCache, int64_t maxContentLength, BOOL startImmediately, NSDictionary *connectionProperties) { @@ -10100,11 +10132,13 @@ Class $NSUserDefaults; MSHook(id, NSUserDefaults$objectForKey$, NSUserDefaults *self, SEL _cmd, NSString *key) { if ([key respondsToSelector:@selector(isEqualToString:)] && [key isEqualToString:@"WebKitLocalStorageDatabasePathPreferenceKey"]) - return [NSString stringWithFormat:@"%@/LocalStorage", Cache_]; + return Cache("LocalStorage"); return _NSUserDefaults$objectForKey$(self, _cmd, key); } int main(int argc, char *argv[]) { + setreugid(501, 501); + NSAutoreleasePool *pool([[NSAutoreleasePool alloc] init]); _trace(); @@ -10152,12 +10186,6 @@ int main(int argc, char *argv[]) { PackageName = reinterpret_cast(method_getImplementation(class_getInstanceMethod([Package class], @selector(cyname)))); - MobilizedFiles_ = [NSMutableSet setWithObjects: - @"Library/Preferences/.GlobalPreferences.plist", - @"Library/Preferences/com.apple.Accessibility.plist", - @"Library/Preferences/com.apple.preferences.sounds.plist", - nil]; - /* Library Hacks {{{ */ class_addMethod(objc_getClass("DOMNodeList"), @selector(countByEnumeratingWithState:objects:count:), (IMP) &DOMNodeList$countByEnumeratingWithState$objects$count$, "I20@0:4^{NSFastEnumerationState}8^@12I16"); @@ -10166,22 +10194,6 @@ int main(int argc, char *argv[]) { if (Method method = class_getInstanceMethod($WAKWindow, @selector(screenSize))) method_setImplementation(method, (IMP) &$WAKWindow$screenSize); - $CFXPreferencesPropertyListSource = objc_getClass("CFXPreferencesPropertyListSourceSynchronizer"); - if ($CFXPreferencesPropertyListSource == Nil) - $CFXPreferencesPropertyListSource = objc_getClass("CFXPreferencesPropertyListSource"); - - Method CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync(class_getInstanceMethod($CFXPreferencesPropertyListSource, @selector(_backingPlistChangedSinceLastSync))); - if (CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync != NULL) { - _CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync = reinterpret_cast(method_getImplementation(CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync)); - method_setImplementation(CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync, reinterpret_cast(&$CFXPreferencesPropertyListSource$_backingPlistChangedSinceLastSync)); - } - - Method CFXPreferencesPropertyListSource$createPlistFromDisk(class_getInstanceMethod($CFXPreferencesPropertyListSource, @selector(createPlistFromDisk))); - if (CFXPreferencesPropertyListSource$createPlistFromDisk != NULL) { - _CFXPreferencesPropertyListSource$createPlistFromDisk = reinterpret_cast(method_getImplementation(CFXPreferencesPropertyListSource$createPlistFromDisk)); - method_setImplementation(CFXPreferencesPropertyListSource$createPlistFromDisk, reinterpret_cast(&$CFXPreferencesPropertyListSource$createPlistFromDisk)); - } - $NSURLConnection = objc_getClass("NSURLConnection"); Method NSURLConnection$init$(class_getInstanceMethod($NSURLConnection, @selector(_initWithRequest:delegate:usesCache:maxContentLength:startImmediately:connectionProperties:))); if (NSURLConnection$init$ != NULL) { @@ -10225,7 +10237,7 @@ int main(int argc, char *argv[]) { } /* }}} */ /* Index Collation {{{ */ - if (Class $UILocalizedIndexedCollation = objc_getClass("UILocalizedIndexedCollation")) { + if (Class $UILocalizedIndexedCollation = objc_getClass("UILocalizedIndexedCollation")) { @try { NSBundle *bundle([NSBundle bundleForClass:$UILocalizedIndexedCollation]); NSString *path([bundle pathForResource:@"UITableViewLocalizedSectionIndex" ofType:@"plist"]); //path = @"/System/Library/Frameworks/UIKit.framework/.lproj/UITableViewLocalizedSectionIndex.plist"; @@ -10234,6 +10246,14 @@ int main(int argc, char *argv[]) { CollationLocale_ = MSHookIvar(collation, "_locale"); + if (kCFCoreFoundationVersionNumber >= 800 && [[CollationLocale_ localeIdentifier] isEqualToString:@"zh@collation=stroke"]) { + CollationThumbs_ = [NSArray arrayWithObjects:@"1",@"•",@"4",@"•",@"7",@"•",@"10",@"•",@"13",@"•",@"16",@"•",@"19",@"A",@"•",@"E",@"•",@"I",@"•",@"M",@"•",@"R",@"•",@"V",@"•",@"Z",@"#",nil]; + for (NSInteger offset : (NSInteger[]) {0,1,3,4,6,7,9,10,12,13,15,16,18,25,26,29,30,33,34,37,38,42,43,46,47,50,51}) + CollationOffset_.push_back(offset); + CollationTitles_ = [NSArray arrayWithObjects:@"1 畫",@"2 畫",@"3 畫",@"4 畫",@"5 畫",@"6 畫",@"7 畫",@"8 畫",@"9 畫",@"10 畫",@"11 畫",@"12 畫",@"13 畫",@"14 畫",@"15 畫",@"16 畫",@"17 畫",@"18 畫",@"19 畫",@"20 畫",@"21 畫",@"22 畫",@"23 畫",@"24 畫",@"25 畫以上",@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil]; + CollationStarts_ = [NSArray arrayWithObjects:@"一",@"丁",@"丈",@"不",@"且",@"丞",@"串",@"並",@"亭",@"乘",@"乾",@"傀",@"亂",@"僎",@"僵",@"儐",@"償",@"叢",@"儳",@"嚴",@"儷",@"儻",@"囌",@"囑",@"廳",@"a",@"b",@"c",@"d",@"e",@"f",@"g",@"h",@"i",@"j",@"k",@"l",@"m",@"n",@"o",@"p",@"q",@"r",@"s",@"t",@"u",@"v",@"w",@"x",@"y",@"z",@"ʒ",nil]; + } else { + CollationThumbs_ = [collation sectionIndexTitles]; for (size_t index(0), end([CollationThumbs_ count]); index != end; ++index) CollationOffset_.push_back([collation sectionForSectionIndexTitleAtIndex:index]); @@ -10251,7 +10271,12 @@ int main(int argc, char *argv[]) { if (!U_SUCCESS(code)) NSLog(@"%s", u_errorName(code)); } - } else { + + } + } @catch (NSException *e) { + NSLog(@"%@", e); + goto hard; + } } else hard: { CollationLocale_ = [[[NSLocale alloc] initWithLocaleIdentifier:@"en@collation=dictionary"] autorelease]; CollationThumbs_ = [NSArray arrayWithObjects:@"A",@"B",@"C",@"D",@"E",@"F",@"G",@"H",@"I",@"J",@"K",@"L",@"M",@"N",@"O",@"P",@"Q",@"R",@"S",@"T",@"U",@"V",@"W",@"X",@"Y",@"Z",@"#",nil]; @@ -10292,13 +10317,7 @@ int main(int argc, char *argv[]) { App_ = [[NSBundle mainBundle] bundlePath]; Advanced_ = YES; - setuid(0); - setgid(0); - - if (access("/var/mobile/Library/Keyboard/UserDictionary.sqlite", F_OK) == 0) - system("mkdir -p /var/root/Library/Keyboard; cp -af /var/mobile/Library/Keyboard/UserDictionary.sqlite /var/root/Library/Keyboard/"); - - Cache_ = [[NSString stringWithFormat:@"%@/Library/Caches/com.saurik.Cydia", @"/var/root"] retain]; + Cache_ = [[NSString stringWithFormat:@"%@/Library/Caches/com.saurik.Cydia", @"/var/mobile"] retain]; /*Method alloc = class_getClassMethod([NSObject class], @selector(alloc)); alloc_ = alloc->method_imp; @@ -10432,10 +10451,10 @@ int main(int argc, char *argv[]) { } broken = nil; /* }}} */ - CydiaWriteSources(); + _root(CydiaWriteSources()); _trace(); - MetaFile_.Open("/var/lib/cydia/metadata.cb0"); + _root(MetaFile_.Open("/var/lib/cydia/metadata.cb0")); _trace(); if (Packages_ != nil) { @@ -10471,21 +10490,14 @@ int main(int argc, char *argv[]) { if (access("/User", F_OK) != 0 || version != 6) { _trace(); - system("/usr/libexec/cydia/firmware.sh"); + _root(system("/usr/libexec/cydia/firmware.sh")); _trace(); } - _assert([[NSFileManager defaultManager] - createDirectoryAtPath:@"/var/cache/apt/archives/partial" - withIntermediateDirectories:YES - attributes:nil - error:NULL - ]); - if (access("/tmp/cydia.chk", F_OK) == 0) { - if (unlink("/var/cache/apt/pkgcache.bin") == -1) + if (unlink([Cache("pkgcache.bin") UTF8String]) == -1) _assert(errno == ENOENT); - if (unlink("/var/cache/apt/srcpkgcache.bin") == -1) + if (unlink([Cache("srcpkgcache.bin") UTF8String]) == -1) _assert(errno == ENOENT); } @@ -10500,6 +10512,16 @@ int main(int argc, char *argv[]) { //_config->Set("Acquire::http::Timeout", 15); _config->Set("Acquire::http::MaxParallel", usermem >= 384 * 1024 * 1024 ? 16 : 3); + + mkdir([Cache_ UTF8String], 0755); + mkdir([Cache("archives") UTF8String], 0755); + mkdir([Cache("archives/partial") UTF8String], 0755); + _config->Set("Dir::Cache", [Cache_ UTF8String]); + + mkdir([Cache("lists") UTF8String], 0755); + mkdir([Cache("lists/partial") UTF8String], 0755); + mkdir([Cache("periodic") UTF8String], 0755); + _config->Set("Dir::State::Lists", [Cache("lists") UTF8String]); /* }}} */ /* Color Choices {{{ */ space_ = CGColorSpaceCreateDeviceRGB(); @@ -10523,6 +10545,13 @@ int main(int argc, char *argv[]) { //UIKeyboardDisableAutomaticAppearance(); /* }}} */ + _root({ + chown([Cache("ApplicationCache.db") UTF8String], 501, 501); + chown([Cache("Cache.db") UTF8String], 501, 501); + chown([Cache("Cache.db-shm") UTF8String], 501, 501); + chown([Cache("Cache.db-wal") UTF8String], 501, 501); + }); + $SBSSetInterceptsMenuButtonForever = reinterpret_cast(dlsym(RTLD_DEFAULT, "SBSSetInterceptsMenuButtonForever")); const char *symbol(kCFCoreFoundationVersionNumber >= 800 ? "MGGetBoolAnswer" : "GSSystemHasCapability");