Kernel arch

crizzo · Mar 14, 2011 · b847297 · b847297
1 parent f72f1b2
commit b847297
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 7 deletions.
diff --git a/Classes/Headers/NSStringHelper.h b/Classes/Headers/NSStringHelper.h
@@ -11,6 +11,7 @@
 
 @interface NSString (NSStringHelper)
 + (id)stringWithBytes:(const void *)bytes length:(NSUInteger)length encoding:(NSStringEncoding)encoding;
++ (id)stringWithData:(NSData *)data encoding:(NSStringEncoding)encoding;
 
 - (NSString *)safeSubstringAfterIndex:(NSInteger)anIndex;
 - (NSString *)safeSubstringBeforeIndex:(NSInteger)anIndex;
@@ -108,4 +109,4 @@
 - (id)safeAttribute:(NSString *)attrName atIndex:(NSUInteger)location longestEffectiveRange:(NSRangePointer)range inRange:(NSRange)rangeLimit;
 
 - (NSDictionary *)safeAttributesAtIndex:(NSUInteger)location longestEffectiveRange:(NSRangePointer)range inRange:(NSRange)rangeLimit;
-@end
+@end
diff --git a/Classes/Helpers/NSStringHelper.m b/Classes/Helpers/NSStringHelper.m
@@ -12,6 +12,11 @@ + (id)stringWithBytes:(const void *)bytes length:(NSUInteger)length encoding:(NS
 	return [[[NSString alloc] initWithBytes:bytes length:length encoding:encoding] autodrain];
 }
 
++ (id)stringWithData:(NSData *)data encoding:(NSStringEncoding)encoding
+{
+	return [[[NSString alloc] initWithData:data encoding:encoding] autodrain];
+}
+
 - (NSString *)safeSubstringWithRange:(NSRange)range;
 {
 	if (range.location == NSNotFound) return nil;
@@ -54,7 +59,7 @@ - (NSString *)fastChopEndWithChars:(NSArray *)chars
 	NSString *strChopper = self;
 
 	for (NSInteger i = 1; i < slnt; i++) {
-		slchar = [strChopper safeSubstringFromIndex:([strChopper length] - 1)];
+		slchar     = [strChopper safeSubstringFromIndex:([strChopper length] - 1)];
 		strChopper = [strChopper safeSubstringToIndex:([strChopper length] - 1)];
 
 		if ([chars containsObject:slchar] == NO) {

diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
@@ -4868,15 +4868,17 @@ - (void)ircConnectionDidError:(NSString *)error
 
 - (void)ircConnectionDidReceive:(NSData *)data
 {
-	NSString *s = [[[NSString alloc] initWithData:data encoding:encoding] autodrain];
+	NSString *s = [NSString stringWithData:data encoding:encoding];
 
 	if (PointerIsEmpty(s)) {
-		s = [[[NSString alloc] initWithData:data encoding:config.fallbackEncoding] autodrain];
+		s = [NSString stringWithData:data encoding:config.fallbackEncoding];
 
 		if (PointerIsEmpty(s)) {
-			s = [[[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding] autodrain];
+			s = [NSString stringWithData:data encoding:NSUTF8StringEncoding];
 
 			if (PointerIsEmpty(s)) {
+				NSLog(@"NSData decode failure. (%@)", data);
+
 				return;
 			}
 		}

diff --git a/Classes/Others/ValidateReceipt.m b/Classes/Others/ValidateReceipt.m
@@ -62,8 +62,9 @@
 		list.attr = attributes;
 
 		SecKeychainItemCopyContent(itemRef, nil, &list, nil, nil);
-		NSData *nameData = [NSData dataWithBytesNoCopy:attributes[0].data length:attributes[0].length freeWhenDone:NO];
-		NSString *name = [[NSString alloc] initWithData:nameData encoding:NSUTF8StringEncoding];
+
+		NSData   *nameData = [NSData dataWithBytesNoCopy:attributes[0].data length:attributes[0].length freeWhenDone:NO];
+		NSString *name     = [NSString stringWithData:nameData encoding:NSUTF8StringEncoding];
 
 		if ([name isEqualToString:@"Apple Root CA"]) {
 			CSSM_DATA certData;

diff --git a/Resources/Plugins/SystemProfiler/SystemProfiler.pch b/Resources/Plugins/SystemProfiler/SystemProfiler.pch
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/socket.h>
+#include <sys/utsname.h>
 
 #include <ifaddrs.h>
 #include <net/if.h>

diff --git a/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.h b/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.h
@@ -9,6 +9,7 @@
 + (NSString *)processorL2CacheSize;
 + (NSString *)processorL3CacheSize;
 + (NSString *)processorClockSpeed;
++ (NSString *)kernelArchitecture;
 + (NSString *)physicalMemorySize;
 + (NSString *)loadAveragesWithCores:(NSInteger)cores;
 + (NSString *)systemUptime;

diff --git a/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.m b/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.m
@@ -83,6 +83,12 @@ + (NSString *)compiledOutput
 			   [[Preferences systemInfoPlist] objectForKey:@"ProductVersion"], 
 			   [[Preferences systemInfoPlist] objectForKey:@"ProductBuildVersion"]];
 
+	NSString *arch = [self kernelArchitecture];
+
+	if (NSObjectIsNotEmpty(arch)) {
+		sysinfo = [sysinfo stringByAppendingFormat:@" (%@ kernel)", arch];
+	}
+
 	return sysinfo;
 }
 
@@ -474,6 +480,23 @@ + (NSString *)processorClockSpeed
 	}
 }
 
++ (NSString *)kernelArchitecture
+{
+	struct utsname name;
+
+    if (uname(&name) >= 0) {
+		NSString *machine = [NSString stringWithFormat:@"%s", name.machine];
+
+		if ([machine isEqualToString:@"x86_64"]) {
+			return @"64-bit";
+		} else {
+			return @"32-bit";
+		}
+	}
+
+	return nil;
+}
+
 + (NSString *)physicalMemorySize
 {
 	uint64_t linesize = 0L;