Changeset 3857

Timestamp:

03/01/06 19:43:47 (3 years ago)

Author:

morris

Message:

Write extra flags to etc/wired.flags, and only touch etc/wired.startup for launch at boot

Files:

• WiredServer/trunk/PreferencePane/WPWired.m (modified) (1 diff)
• WiredServer/trunk/WCAuthorization.h (modified) (1 diff)
• WiredServer/trunk/WCAuthorization.m (modified) (1 diff)
• WiredServer/trunk/WCConfigController.m (modified) (3 diffs)
• WiredServer/trunk/WCDashboardController.m (modified) (2 diffs)

WiredServer/trunk/PreferencePane/WPWired.m

@@ -147 +147 @@
-                        [NSArray arrayWithObjects:
-                                WCExpandWiredPath(@"wiredctl"),
+                                @"/usr/bin/touch",
-                                @"/bin/mv",
-                                @"/bin/rm",

WiredServer/trunk/WCAuthorization.h

@@ -44 +44 @@
-- (BOOL)launchTaskWithPath:(NSString *)path arguments:(NSArray *)arguments;
-
+- (BOOL)createFileAtPath:(NSString *)path;
-- (BOOL)movePath:(NSString *)fromPath toPath:(NSString *)toPath;
-- (BOOL)removeFileAtPath:(NSString *)path;

WiredServer/trunk/WCAuthorization.m

@@ -206 +206 @@
-#pragma mark -
-
+- (BOOL)createFileAtPath:(NSString *)path {
+        return [self launchTaskWithPath:@"/usr/bin/touch" arguments:[NSArray arrayWithObject:path]];
+}
+
+
+
-- (BOOL)movePath:(NSString *)fromPath toPath:(NSString *)toPath {
-        NSArray         *arguments;

WiredServer/trunk/WCConfigController.m

@@ -47 +47 @@
-- (void)_readFromFile:(NSString *)path;
-- (BOOL)_writeToFile:(NSString *)path;
+- (BOOL)_writeFlagsToFile:(NSString *)path;
-
-- (void)_setLaunchesAtBoot:(BOOL)value;
@@ -357 +358 @@
-
-
+- (BOOL)_writeFlagsToFile:(NSString *)path {
+        WCAuthorization         *authorization;
+        NSString                        *string, *owner, *temp;
+        BOOL                            status = YES;
+        
+        string = [[_dashboardController launchArguments] componentsJoinedByString:@" "];
+
+        owner = [[NSFileManager defaultManager] ownerAtPath:path];
+        
+        if(!owner)
+                owner = [[NSFileManager defaultManager] ownerAtPath:[path stringByDeletingLastPathComponent]];
+
+        if([[[NSFileManager defaultManager] ownerAtPath:path] isEqualToString:NSUserName()]) {
+                status = [string writeToFile:path atomically:YES];
+        } else {
+                authorization = [WCAuthorization authorization];
+
+                if(status) {
+                        temp = [NSFileManager temporaryPathWithPrefix:@"wired" suffix:@"flags"];
+                        status = [string writeToFile:temp atomically:YES];
+                }
+                
+                if(status)
+                        status = [authorization movePath:temp toPath:path];
+                
+                if(status) {
+                        status = [authorization changeOwnerOfPath:path
+                                                                                          toOwner:[_config stringForKey:@"user"]
+                                                                                                group:[_config stringForKey:@"group"]];
+                }
+        }
+        
+        return status;
+}
+
+
+
-#pragma mark -
-
-- (void)_setLaunchesAtBoot:(BOOL)value {
-        NSFileManager           *fileManager;
-        NSString                        *path, *owner, *temp, *string;
-        WCAuthorization         *authorization;
-
-
-
-
-
+
+
-        path = WCExpandWiredPath(@"etc/wired.startup");
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                else if([authorization isAuthorized]) {
-                        temp = [NSFileManager temporaryPathWithPrefix:@"wired" suffix:@"startup"];
-                        status = [string writeToFile:temp atomically:YES];
-                        
-                        if(status)
-                                status = [authorization movePath:temp toPath:path];
-                        
-                        if(status) {
-                                config = [self config];
-                                status = [authorization changeOwnerOfPath:path
-                                                                                                  toOwner:[config stringForKey:@"user"]
-                                                                                                        group:[config stringForKey:@"group"]];
-                        }
-                }
-        } else {
-                if([[fileManager ownerAtPath:path] isEqualToString:NSUserName()])
-                        [fileManager removeFileAtPath:path];
-                else if([authorization isAuthorized])
-                        [authorization removeFileAtPath:path];
-        }
-}
@@ -524 +549 @@
-                                _logTouched = YES;
-                        }
+                        
+                        [self _writeFlagsToFile:WCExpandWiredPath(@"etc/wired.flags")];
+                        [self _setLaunchesAtBoot:[_launchAtBootButton state]];
-                }
-                
-                [self _setLaunchesAtBoot:[_launchAtBootButton state]];
-        }
-        

WiredServer/trunk/WCDashboardController.m

@@ -192 +192 @@
-        arguments = [NSMutableArray array];
-        
- {
+
-                [arguments addObject:@"stop"];
-} else {
+else
-                [arguments addObject:@"start"];
-                [arguments addObjectsFromArray:[self launchArguments]];
-        }
-        
-        [[WCAuthorization authorization] launchTaskWithPath:WCExpandWiredPath(@"wiredctl")
@@ -210 +208 @@
-        arguments = [NSMutableArray array];
-        [arguments addObject:@"restart"];
-        [arguments addObjectsFromArray:[self launchArguments]];
-        
-        [[WCAuthorization authorization] launchTaskWithPath:WCExpandWiredPath(@"wiredctl")